Revision: 15472
Author: [email protected]
Date: Wed Nov 24 05:50:15 2010
Log: Update Issue 1875
Testing failover on 180 with EarlyDialog replication startegy on
http://code.google.com/p/mobicents/source/detail?r=15472
Modified:
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUADialogRecoveryTest.java
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTest.java
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn2xxTest.java
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/SimpleB2BUA.java
=======================================
---
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUADialogRecoveryTest.java
Mon Nov 22 09:02:59 2010
+++
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUADialogRecoveryTest.java
Wed Nov 24 05:50:15 2010
@@ -1177,9 +1177,9 @@
shootist = new Shootist("shootist_subsnotify", true);
shootme = new Shootme("shootme_subsnotify", 5070, true);
- b2buaNode1 = new SimpleB2BUA("b2buaNode1_subsnotify", 5080,
IP_ADDRESS);
+ b2buaNode1 = new SimpleB2BUA("b2buaNode1_subsnotify", 5080,
IP_ADDRESS, ReplicationStrategy.ConfirmedDialogNoApplicationData);
Thread.sleep(5000);
- b2buaNode2 = new SimpleB2BUA("b2buaNode2_subsnotify", 5081,
IP_ADDRESS);
+ b2buaNode2 = new SimpleB2BUA("b2buaNode2_subsnotify", 5081,
IP_ADDRESS, ReplicationStrategy.ConfirmedDialogNoApplicationData);
shootme.init();
shootist.setSendSubscribe(true);
@@ -1230,9 +1230,9 @@
shootist = new Shootist("shootist_reinvite", true);
shootme = new Shootme("shootme_reinvite", 5070, true);
- b2buaNode1 = new SimpleB2BUA("b2buaNode1_reinvite", 5080,
IP_ADDRESS);
+ b2buaNode1 = new SimpleB2BUA("b2buaNode1_reinvite", 5080,
IP_ADDRESS, ReplicationStrategy.ConfirmedDialogNoApplicationData);
Thread.sleep(5000);
- b2buaNode2 = new SimpleB2BUA("b2buaNode2_reinvite", 5081,
IP_ADDRESS);
+ b2buaNode2 = new SimpleB2BUA("b2buaNode2_reinvite", 5081,
IP_ADDRESS, ReplicationStrategy.ConfirmedDialogNoApplicationData);
shootme.init();
shootist.init("ReInvite");
=======================================
---
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTest.java
Tue Nov 23 12:40:05 2010
+++
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTest.java
Wed Nov 24 05:50:15 2010
@@ -316,7 +316,7 @@
st.sendResponse(response);
- Thread.sleep(1000);
+ Thread.sleep(2000);
this.okResponse =
messageFactory.createResponse(Response.OK,
request);
@@ -862,7 +862,8 @@
if(failoverOn1xx && response.getStatusCode() ==
Response.RINGING) {
// stop the sip stack w/o stopping the cache
- b2buaNode1.stop(false);
+ b2buaNode1.stop(false);
+ b2buaNode1.stopPingBalancer();
}
if (response.getStatusCode() == Response.OK) {
@@ -874,6 +875,7 @@
if (failoverOn2xx) {
// stop the sip stack w/o stopping the cache
b2buaNode1.stop(false);
+ b2buaNode1.stopPingBalancer();
((SipURI)ackRequest.getRequestURI()).setPort(5081);
}
System.out.println("Sending " + ackRequest);
@@ -1246,9 +1248,9 @@
shootist = new Shootist("shootist_reinvite", true);
shootme = new Shootme("shootme_reinvite", 5070, true);
- b2buaNode1 = new SimpleB2BUA("b2buaNode1_reinvite", 5080,
IP_ADDRESS);
+ b2buaNode1 = new SimpleB2BUA("b2buaNode1_reinvite", 5080,
IP_ADDRESS, ReplicationStrategy.ConfirmedDialogNoApplicationData);
Thread.sleep(5000);
- b2buaNode2 = new SimpleB2BUA("b2buaNode2_reinvite", 5081,
IP_ADDRESS);
+ b2buaNode2 = new SimpleB2BUA("b2buaNode2_reinvite", 5081,
IP_ADDRESS, ReplicationStrategy.ConfirmedDialogNoApplicationData);
b2buaNode1.getB2buaHandler().setSendAckOn2xx(true);
b2buaNode2.getB2buaHandler().setSendAckOn2xx(true);
b2buaNode1.pingBalancer();
@@ -1326,11 +1328,11 @@
shootist = new Shootist("shootist_reinvite", true);
shootme = new Shootme("shootme_reinvite", 5070, true);
- b2buaNode1 = new SimpleB2BUA("b2buaNode1_reinvite", 5080,
IP_ADDRESS);
+ b2buaNode1 = new SimpleB2BUA("b2buaNode1_reinvite", 5080,
IP_ADDRESS, ReplicationStrategy.EarlyDialog);
Thread.sleep(5000);
- b2buaNode2 = new SimpleB2BUA("b2buaNode2_reinvite", 5081,
IP_ADDRESS);
- b2buaNode1.getB2buaHandler().setSendAckOn2xx(true);
- b2buaNode2.getB2buaHandler().setSendAckOn2xx(true);
+ b2buaNode2 = new SimpleB2BUA("b2buaNode2_reinvite", 5081,
IP_ADDRESS, ReplicationStrategy.EarlyDialog);
+// b2buaNode1.getB2buaHandler().setSendAckOn2xx(true);
+// b2buaNode2.getB2buaHandler().setSendAckOn2xx(true);
b2buaNode1.pingBalancer();
Thread.sleep(1000);
b2buaNode2.pingBalancer();
=======================================
---
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn2xxTest.java
Tue Nov 23 12:11:48 2010
+++
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn2xxTest.java
Wed Nov 24 05:50:15 2010
@@ -1193,9 +1193,9 @@
shootist = new Shootist("shootist_reinvite", true);
shootme = new Shootme("shootme_reinvite", 5070, true);
- b2buaNode1 = new SimpleB2BUA("b2buaNode1_reinvite", 5080,
IP_ADDRESS);
+ b2buaNode1 = new SimpleB2BUA("b2buaNode1_reinvite", 5080,
IP_ADDRESS, ReplicationStrategy.ConfirmedDialogNoApplicationData);
Thread.sleep(5000);
- b2buaNode2 = new SimpleB2BUA("b2buaNode2_reinvite", 5081,
IP_ADDRESS);
+ b2buaNode2 = new SimpleB2BUA("b2buaNode2_reinvite", 5081,
IP_ADDRESS, ReplicationStrategy.ConfirmedDialogNoApplicationData);
b2buaNode1.getB2buaHandler().setSendAckOn2xx(false);
b2buaNode2.getB2buaHandler().setSendAckOn2xx(false);
shootist.setFailoverOn2xx(true);
=======================================
---
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/SimpleB2BUA.java
Tue Nov 23 12:24:47 2010
+++
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/SimpleB2BUA.java
Wed Nov 24 05:50:15 2010
@@ -50,7 +50,7 @@
private SimpleB2BUAHandler b2buaHandler;
private TimerTask keepaliveTask;
- public SimpleB2BUA(String stackName, int myPort, String ipAddress) throws
NumberFormatException, SipException, TooManyListenersException,
InvalidArgumentException, ParseException {
+ public SimpleB2BUA(String stackName, int myPort, String ipAddress,
ReplicationStrategy replicationStrategy) throws NumberFormatException,
SipException, TooManyListenersException, InvalidArgumentException,
ParseException {
properties = new Properties();
properties.setProperty("javax.sip.STACK_NAME", stackName);
properties.setProperty(SIP_PORT_BIND, String.valueOf(myPort));
@@ -64,7 +64,7 @@
stackName + "log.xml");
properties.setProperty("javax.sip.AUTOMATIC_DIALOG_SUPPORT", "off");
properties.setProperty("gov.nist.javax.sip.REENTRANT_LISTENER", "true");
-
properties.setProperty("org.mobicents.ha.javax.sip.REPLICATION_STRATEGY", "ConfirmedDialogNoApplicationData");
+
properties.setProperty("org.mobicents.ha.javax.sip.REPLICATION_STRATEGY",
replicationStrategy.toString());
properties.setProperty(ManagedMobicentsSipCache.STANDALONE, "true");
System.setProperty("jgroups.bind_addr", ipAddress);
System.setProperty("jgroups.udp.mcast_addr", "FFFF::232.5.5.5");
@@ -267,4 +267,20 @@
}
}
-}
+
+ public void stopPingBalancer() {
+ keepaliveTask.cancel();
+
Thread.currentThread().setContextClassLoader(NodeRegisterRMIStub.class.getClassLoader());
+ try {
+ Registry registry =
LocateRegistry.getRegistry(properties.getProperty(SIP_BIND_ADDRESS), 2000);
+ NodeRegisterRMIStub reg=(NodeRegisterRMIStub)
registry.lookup("SIPBalancer");
+ final SIPNode appServerNode = new SIPNode(sipStack.getStackName(),
properties.getProperty(SIP_BIND_ADDRESS));
+ appServerNode.getProperties().put("udpPort",
Integer.parseInt(properties.getProperty(SIP_PORT_BIND)));
+ ArrayList<SIPNode> nodes = new ArrayList<SIPNode>();
+ nodes.add(appServerNode);
+ reg.forceRemoval(nodes);
+ } catch (Exception e) {
+
+ }
+ }
+}