[mobicents] r22150 committed - Fix for 3151 Modify SCTP commands to take multihome IP's

Thu, 08 Mar 2012 05:38:00 -0800 

Revision: 22150
Author:   [email protected]
Date:     Thu Mar  8 05:37:26 2012
Log:      Fix for 3151 Modify SCTP commands to take multihome IP's
http://code.google.com/p/mobicents/source/detail?r=22150

Modified:
/trunk/protocols/ss7/m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/oam/SCTPShellExecutor.java /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/IPSPClientFSMTest.java /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/IPSPServerFSMTest.java /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/M3UAManagementTest.java /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/RemSgFSMTest.java /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/SgFSMTest.java /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAShellExecutorTest.java 

=======================================
--- /trunk/protocols/ss7/m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/oam/SCTPShellExecutor.java Wed Feb 22 09:20:58 2012 +++ /trunk/protocols/ss7/m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/oam/SCTPShellExecutor.java Thu Mar 8 05:37:26 2012 
@@ -38,6 +38,16 @@
sb.append("SERVER ").append(server.getIpChannelType().getType()).append(" name=").append(server.getName()) .append(" started=").append(server.isStarted()).append(" hostIp=").append(server.getHostAddress()) 
                                        .append(" 
hostPort=").append(server.getHostport());
+
+                       String[] secondaryHostAdd = 
server.getExtraHostAddresses();
+
+                       if(secondaryHostAdd != null && secondaryHostAdd.length 
> 0){
+                               sb.append(" secondaryHost=");
+                               for(int i=0;i<secondaryHostAdd.length;i++){
+                                       sb.append(secondaryHostAdd[i]).append(" 
");
+                               }
+                       }
+
                        List<String> associations = server.getAssociations();
                        sb.append(M3UAOAMMessages.NEW_LINE);
                        sb.append("Associations:");
@@ -68,7 +78,18 @@
                        } else {
                                sb.append(" 
server=").append(asso.getServerName());
                        }
+
                        sb.append(" type=").append(asso.getAssociationType());
+
+                       String[] secondaryHostAdd = 
asso.getExtraHostAddresses();
+
+                       if(secondaryHostAdd != null && secondaryHostAdd.length 
> 0){
+                               sb.append(" secondaryHost=");
+                               for(int i=0;i<secondaryHostAdd.length;i++){
+                                       sb.append(secondaryHostAdd[i]).append(" 
");
+                               }
+                       }
+
                        sb.append(M3UAOAMMessages.NEW_LINE);
                }

@@ -107,6 +128,17 @@
                                        if (hostAddress == null) {
                                                return 
M3UAOAMMessages.INVALID_COMMAND;
                                        }
+
+                                       String[] hostAddresses = 
hostAddress.split(",");
+                                       String primaryAddress = 
hostAddresses[0];
+                                       String[] secondaryAddresses = null;
+
+                                       if (hostAddresses.length > 1) {
+                                               secondaryAddresses = new 
String[(hostAddresses.length - 1)];
+                                               for (int i = 0; i < 
secondaryAddresses.length; i++) {
+                                                       secondaryAddresses[i] = 
hostAddresses[(i + 1)];
+                                               }
+                                       }

                                        int hostPort = 
Integer.parseInt(args[5]);

@@ -120,7 +152,8 @@
                                                ipChnnelType = 
IpChannelType.SCTP;
                                        }
- this.sctpManagement.addServer(serverName, hostAddress, hostPort, ipChnnelType); + this.sctpManagement.addServer(serverName, primaryAddress, hostPort, ipChnnelType, 
+                                                       secondaryAddresses);

                                        return 
String.format(SCTPOAMMessages.ADD_SERVER_SUCCESS, serverName);

@@ -194,6 +227,18 @@
                                                int peerPort = 
Integer.parseInt(args[6]);

                                                String hostIp = args[7];
+
+                                               String[] hostAddresses = 
hostIp.split(",");
+                                               String primaryAddress = 
hostAddresses[0];
+                                               String[] secondaryAddresses = 
null;
+
+                                               if (hostAddresses.length > 1) {
+                                                       secondaryAddresses = 
new String[(hostAddresses.length - 1)];
+                                                       for (int i = 0; i < 
secondaryAddresses.length; i++) {
+                                                               
secondaryAddresses[i] = hostAddresses[(i + 1)];
+                                                       }
+                                               }
+
                                                int hostPort = 
Integer.parseInt(args[8]);

                                                IpChannelType ipChnnelType = 
null;
@@ -206,7 +251,8 @@
                                                        ipChnnelType = 
IpChannelType.SCTP;
                                                }
- this.sctpManagement.addAssociation(hostIp, hostPort, peerIp, peerPort, assocName, ipChnnelType); + this.sctpManagement.addAssociation(primaryAddress, hostPort, peerIp, peerPort, assocName, 
+                                                               ipChnnelType, 
secondaryAddresses);
return String.format(SCTPOAMMessages.ADD_CLIENT_ASSOCIATION_SUCCESS, assocName); 
                                        } else if (type.equals("SERVER")) {
=======================================
--- /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/IPSPClientFSMTest.java Thu Mar 1 06:17:15 2012 +++ /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/IPSPClientFSMTest.java Thu Mar 8 05:37:26 2012 
@@ -686,6 +686,12 @@
                        // TODO Auto-generated method stub
                        return null;
                }
+
+               @Override
+               public String[] getExtraHostAddresses() {
+                       // TODO Auto-generated method stub
+                       return null;
+               }

        }

@@ -825,14 +831,14 @@
                }

                @Override
- public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5) + public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5, String[] extraHostAddresses) 
                                throws Exception {
                        // TODO Auto-generated method stub
                        return null;
                }

                @Override
- public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3) throws Exception { + public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3, String[] extraHostAddresses) throws Exception { 
                        // TODO Auto-generated method stub
                        return null;
                }
=======================================
--- /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/IPSPServerFSMTest.java Thu Mar 1 06:17:15 2012 +++ /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/IPSPServerFSMTest.java Thu Mar 8 05:37:26 2012 
@@ -630,6 +630,12 @@
                        // TODO Auto-generated method stub
                        return null;
                }
+
+               @Override
+               public String[] getExtraHostAddresses() {
+                       // TODO Auto-generated method stub
+                       return null;
+               }

        }

@@ -769,14 +775,14 @@
                }

                @Override
- public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5) + public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5, String[] extraHostAddresses) 
                                throws Exception {
                        // TODO Auto-generated method stub
                        return null;
                }

                @Override
- public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3) throws Exception { + public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3, String[] extraHostAddresses) throws Exception { 
                        // TODO Auto-generated method stub
                        return null;
                }
=======================================
--- /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/M3UAManagementTest.java Thu Mar 1 06:17:15 2012 +++ /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/M3UAManagementTest.java Thu Mar 8 05:37:26 2012 
@@ -227,6 +227,12 @@
                        // TODO Auto-generated method stub
                        return null;
                }
+
+               @Override
+               public String[] getExtraHostAddresses() {
+                       // TODO Auto-generated method stub
+                       return null;
+               }

        }

@@ -366,14 +372,14 @@
                }

                @Override
- public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5) + public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5, String[] extraHostAddresses) 
                                throws Exception {
                        // TODO Auto-generated method stub
                        return null;
                }

                @Override
- public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3) throws Exception { + public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3, String[] extraHostAddresses) throws Exception { 
                        // TODO Auto-generated method stub
                        return null;
                }
=======================================
--- /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/RemSgFSMTest.java Thu Mar 1 06:17:15 2012 +++ /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/RemSgFSMTest.java Thu Mar 8 05:37:26 2012 
@@ -947,6 +947,15 @@
                        // TODO Auto-generated method stub
                        return null;
                }
+
+               /* (non-Javadoc)
+                * @see 
org.mobicents.protocols.api.Association#getExtraHostAddresses()
+                */
+               @Override
+               public String[] getExtraHostAddresses() {
+                       // TODO Auto-generated method stub
+                       return null;
+               }

        }

@@ -1086,14 +1095,14 @@
                }

                @Override
- public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5) + public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5, String[] extraHostAddresses) 
                                throws Exception {
                        // TODO Auto-generated method stub
                        return null;
                }

                @Override
- public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3) throws Exception { + public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3, String[] extraHostAddresses) throws Exception { 
                        // TODO Auto-generated method stub
                        return null;
                }
=======================================
--- /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/SgFSMTest.java Thu Mar 1 06:17:15 2012 +++ /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/SgFSMTest.java Thu Mar 8 05:37:26 2012 
@@ -1016,6 +1016,15 @@
                        // TODO Auto-generated method stub
                        return null;
                }
+
+               /* (non-Javadoc)
+                * @see 
org.mobicents.protocols.api.Association#getExtraHostAddresses()
+                */
+               @Override
+               public String[] getExtraHostAddresses() {
+                       // TODO Auto-generated method stub
+                       return null;
+               }

        }

@@ -1155,14 +1164,14 @@
                }

                @Override
- public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5) + public Association addAssociation(String arg0, int arg1, String arg2, int arg3, String arg4, IpChannelType arg5, String[] extraHostAddresses) 
                                throws Exception {
                        // TODO Auto-generated method stub
                        return null;
                }

                @Override
- public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3) throws Exception { + public Server addServer(String arg0, String arg1, int arg2, IpChannelType arg3, String[] extraHostAddresses) throws Exception { 
                        // TODO Auto-generated method stub
                        return null;
                }
=======================================
--- /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAShellExecutorTest.java Wed Feb 22 09:20:58 2012 +++ /trunk/protocols/ss7/m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAShellExecutorTest.java Thu Mar 8 05:37:26 2012 
@@ -212,6 +212,12 @@
                        // TODO Auto-generated method stub
                        return null;
                }
+
+               @Override
+               public String[] getExtraHostAddresses() {
+                       // TODO Auto-generated method stub
+                       return null;
+               }

        }

@@ -352,14 +358,14 @@

                @Override
                public Association addAssociation(String arg0, int arg1, String 
arg2,
-                               int arg3, String arg4, IpChannelType arg5) 
throws Exception {
+ int arg3, String arg4, IpChannelType arg5, String[] extraHostAddresses) throws Exception { 
                        // TODO Auto-generated method stub
                        return null;
                }

                @Override
                public Server addServer(String arg0, String arg1, int arg2,
-                               IpChannelType arg3) throws Exception {
+                               IpChannelType arg3, String[] 
extraHostAddresses) throws Exception {
                        // TODO Auto-generated method stub
                        return null;
                }

Reply via email to