Revision: 6b00623474e9
Author:   [email protected] <[email protected]>
Date:     Mon Aug 13 04:52:26 2012
Log:      Issue 15:     Make ASP Id configurable in M3UA
http://code.google.com/p/jss7/source/detail?r=6b00623474e9

Modified:
/m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/AspFactory.java /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/M3UAManagement.java /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAOAMMessages.java /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAShellExecutor.java /m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAShellExecutorTest.java

=======================================
--- /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/AspFactory.java Sat Jun 9 06:56:21 2012 +++ /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/AspFactory.java Mon Aug 13 04:52:26 2012
@@ -76,13 +76,15 @@

        private static final Logger logger = Logger.getLogger(AspFactory.class);

-       private static long ASP_ID = 1l;
+       private static long ASP_ID_COUNT = 1l;
+
        private static final int SCTP_PAYLOAD_PROT_ID_M3UA = 3;

        private static final String NAME = "name";
        private static final String STARTED = "started";
        private static final String ASSOCIATION_NAME = "assocName";
        private static final String MAX_SEQUENCE_NUMBER = "maxseqnumber";
+       private static final String ASP_ID = "aspid";

        protected String name;

@@ -96,7 +98,7 @@
        private ByteBuffer txBuffer = ByteBuffer.allocateDirect(8192);

        protected Management transportManagement = null;
-
+
        protected M3UAManagement m3UAManagement = null;

        private ASPIdentifier aspid;
@@ -105,8 +107,7 @@
        protected MessageFactory messageFactory = new MessageFactoryImpl();

private TransferMessageHandler transferMessageHandler = new TransferMessageHandler(this); - private SignalingNetworkManagementHandler signalingNetworkManagementHandler = new SignalingNetworkManagementHandler(
-                       this);
+ private SignalingNetworkManagementHandler signalingNetworkManagementHandler = new SignalingNetworkManagementHandler(this); private ManagementMessageHandler managementMessageHandler = new ManagementMessageHandler(this); private AspStateMaintenanceHandler aspStateMaintenanceHandler = new AspStateMaintenanceHandler(this); private AspTrafficMaintenanceHandler aspTrafficMaintenanceHandler = new AspTrafficMaintenanceHandler(this);
@@ -117,30 +118,35 @@
        protected ExchangeType exchangeType = null;

        private long aspupSentTime = 0l;
-
+
        private int maxSequenceNumber = M3UAManagement.MAX_SEQUENCE_NUMBER;
        private int[] slsTable = null;
        private int maxOutboundStreams;
-
+
        protected AspFactoryStopTimer aspFactoryStopTimer = null;

        public AspFactory() {
-
-               this.aspid = 
parameterFactory.createASPIdentifier(this.generateId());
-
                // clean transmission buffer
                txBuffer.clear();
                txBuffer.rewind();
                txBuffer.flip();
        }

-       public AspFactory(String name, int maxSequenceNumber) {
+       public AspFactory(String name, int maxSequenceNumber, long aspId) {
                this();
                this.name = name;
                this.maxSequenceNumber = maxSequenceNumber;
                this.slsTable = new int[this.maxSequenceNumber];
+               this.aspid = parameterFactory.createASPIdentifier(aspId);
        }
-
+
+       /**
+        * @return the aspid
+        */
+       protected ASPIdentifier getAspid() {
+               return aspid;
+       }
+
        public void setM3UAManagement(M3UAManagement m3uaManagement) {
                m3UAManagement = m3uaManagement;
        }
@@ -160,14 +166,12 @@
                if (this.association == null)
                        return;

-               if (this.functionality == Functionality.AS
- || (this.functionality == Functionality.SGW && this.exchangeType == ExchangeType.DE) + if (this.functionality == Functionality.AS || (this.functionality == Functionality.SGW && this.exchangeType == ExchangeType.DE) || (this.functionality == Functionality.IPSP && this.exchangeType == ExchangeType.DE) || (this.functionality == Functionality.IPSP && this.exchangeType == ExchangeType.SE && this.ipspType == IPSPType.CLIENT)) {

                        if (this.association.isConnected()) {
- ASPDown aspDown = (ASPDown) this.messageFactory.createMessage(MessageClass.ASP_STATE_MAINTENANCE,
-                                               MessageType.ASP_DOWN);
+ ASPDown aspDown = (ASPDown) this.messageFactory.createMessage(MessageClass.ASP_STATE_MAINTENANCE, MessageType.ASP_DOWN);
                                this.write(aspDown);
for (FastList.Node<Asp> n = aspList.head(), end = aspList.tail(); (n = n.getNext()) != end;) {
                                        Asp asp = n.getValue();
@@ -186,8 +190,8 @@
                                                logger.error(e.getMessage(), e);
                                        }
                                }
-
-                               //Start the timer to kill the underlying 
transport Association
+
+                               // Start the timer to kill the underlying 
transport Association
                                aspFactoryStopTimer = new 
AspFactoryStopTimer(this);
                                
this.m3UAManagement.m3uaScheduler.execute(aspFactoryStopTimer);
                        } else {
@@ -209,9 +213,10 @@
                        }

                } else {
-//                     if (this.association.isConnected()) {
-// throw new Exception("Still few ASP's are connected. Bring down the ASP's first");
-//                     }
+                       // if (this.association.isConnected()) {
+                       // throw new
+ // Exception("Still few ASP's are connected. Bring down the ASP's first");
+                       // }

                        
this.transportManagement.stopAssociation(this.association.getName());
                }
@@ -221,9 +226,9 @@
                return this.started;
        }

-//     public boolean isConnected() {
-//             return started && up;
-//     }
+       // public boolean isConnected() {
+       // return started && up;
+       // }

        public Functionality getFunctionality() {
                return functionality;
@@ -271,8 +276,7 @@
        public void unsetAssociation() throws Exception {
                if (this.association != null) {
                        if (this.association.isStarted()) {
- throw new Exception(String.format("Association=%s is still started. Stop first",
-                                               this.association.getName()));
+ throw new Exception(String.format("Association=%s is still started. Stop first", this.association.getName()));
                        }
                        this.association.setAssociationListener(null);
                        this.association = null;
@@ -288,16 +292,14 @@
                case MessageClass.MANAGEMENT:
                        switch (message.getMessageType()) {
                        case MessageType.ERROR:
-                               this.managementMessageHandler
- .handleError((org.mobicents.protocols.ss7.m3ua.message.mgmt.Error) message); + this.managementMessageHandler.handleError((org.mobicents.protocols.ss7.m3ua.message.mgmt.Error) message);
                                break;
                        case MessageType.NOTIFY:
                                Notify notify = (Notify) message;
                                
this.managementMessageHandler.handleNotify(notify);
                                break;
                        default:
- logger.error(String.format("Rx : MGMT with invalid MessageType=%d message=%s",
-                                               message.getMessageType(), 
message));
+ logger.error(String.format("Rx : MGMT with invalid MessageType=%d message=%s", message.getMessageType(), message));
                                break;
                        }
                        break;
@@ -309,8 +311,7 @@
                                
this.transferMessageHandler.handlePayload(payload);
                                break;
                        default:
- logger.error(String.format("Rx : Transfer message with invalid MessageType=%d message=%s",
-                                               message.getMessageType(), 
message));
+ logger.error(String.format("Rx : Transfer message with invalid MessageType=%d message=%s", message.getMessageType(), message));
                                break;
                        }
                        break;
@@ -342,8 +343,7 @@
this.signalingNetworkManagementHandler.handleDestinationRestricted(drst);
                                break;
                        default:
- logger.error(String.format("Received SSNM with invalid MessageType=%d message=%s",
-                                               message.getMessageType(), 
message));
+ logger.error(String.format("Received SSNM with invalid MessageType=%d message=%s", message.getMessageType(), message));
                                break;
                        }
                        break;
@@ -371,8 +371,7 @@
                                
this.aspStateMaintenanceHandler.handleHeartbeat(hrtBeat);
                                break;
                        default:
- logger.error(String.format("Received ASPSM with invalid MessageType=%d message=%s",
-                                               message.getMessageType(), 
message));
+ logger.error(String.format("Received ASPSM with invalid MessageType=%d message=%s", message.getMessageType(), message));
                                break;
                        }

@@ -397,8 +396,7 @@
                                
this.aspTrafficMaintenanceHandler.handleAspInactiveAck(aspInaciveAck);
                                break;
                        default:
- logger.error(String.format("Received ASPTM with invalid MessageType=%d message=%s",
-                                               message.getMessageType(), 
message));
+ logger.error(String.format("Received ASPTM with invalid MessageType=%d message=%s", message.getMessageType(), message));
                                break;
                        }
                        break;
@@ -406,8 +404,7 @@
                case MessageClass.ROUTING_KEY_MANAGEMENT:
                        break;
                default:
- logger.error(String.format("Received message with invalid MessageClass=%d message=%s",
-                                       message.getMessageClass(), message));
+ logger.error(String.format("Received message with invalid MessageClass=%d message=%s", message.getMessageClass(), message));
                        break;
                }
        }
@@ -433,7 +430,7 @@
                                        break;
                                case MessageClass.TRANSFER_MESSAGES:
                                        PayloadData payload = (PayloadData) 
message;
-                                        int seqControl = 
payload.getData().getSLS();
+                                       int seqControl = 
payload.getData().getSLS();
payloadData = new org.mobicents.protocols.api.PayloadData(data.length, data, true, false, SCTP_PAYLOAD_PROT_ID_M3UA,
                                                        
this.slsTable[seqControl]);
                                        break;
@@ -453,8 +450,7 @@
                Asp remAsp = new Asp(this.name, this);

                // We set ASP IP only if its AS or IPSP Client side
-               if (this.getFunctionality() == Functionality.AS
- || (this.getFunctionality() == Functionality.IPSP && this.getIpspType() == IPSPType.CLIENT)) { + if (this.getFunctionality() == Functionality.AS || (this.getFunctionality() == Functionality.IPSP && this.getIpspType() == IPSPType.CLIENT)) {
                        remAsp.setASPIdentifier(aspid);
                }

@@ -482,19 +478,18 @@
        }

        protected void sendAspActive(As as) {
- ASPActive aspActive = (ASPActive) this.messageFactory.createMessage(MessageClass.ASP_TRAFFIC_MAINTENANCE,
-                               MessageType.ASP_ACTIVE);
+ ASPActive aspActive = (ASPActive) this.messageFactory.createMessage(MessageClass.ASP_TRAFFIC_MAINTENANCE, MessageType.ASP_ACTIVE);
                aspActive.setRoutingContext(as.getRoutingContext());
                aspActive.setTrafficModeType(as.getTrafficModeType());
                this.write(aspActive);
        }

-       private long generateId() {
-               ASP_ID++;
-               if (ASP_ID == 4294967295l) {
-                       ASP_ID = 1l;
+       protected static long generateId() {
+               ASP_ID_COUNT++;
+               if (ASP_ID_COUNT == 4294967295l) {
+                       ASP_ID_COUNT = 1l;
                }
-               return ASP_ID;
+               return ASP_ID_COUNT;
        }

        private void handleCommDown() {
@@ -534,8 +529,7 @@
                // TODO : Possibility of race condition?
                long now = System.currentTimeMillis();
                if ((now - aspupSentTime) > 2000) {
- ASPUp aspUp = (ASPUp) this.messageFactory.createMessage(MessageClass.ASP_STATE_MAINTENANCE,
-                                       MessageType.ASP_UP);
+ ASPUp aspUp = (ASPUp) this.messageFactory.createMessage(MessageClass.ASP_STATE_MAINTENANCE, MessageType.ASP_UP);
                        aspUp.setASPIdentifier(this.aspid);
                        this.write(aspUp);
                        aspupSentTime = now;
@@ -543,8 +537,7 @@
        }

        private void handleCommUp() {
-               if (this.functionality == Functionality.AS
- || (this.functionality == Functionality.SGW && this.exchangeType == ExchangeType.DE) + if (this.functionality == Functionality.AS || (this.functionality == Functionality.SGW && this.exchangeType == ExchangeType.DE) || (this.functionality == Functionality.IPSP && this.exchangeType == ExchangeType.DE) || (this.functionality == Functionality.IPSP && this.exchangeType == ExchangeType.SE && this.ipspType == IPSPType.CLIENT)) {
                        this.aspupSentTime = 0l;
@@ -582,6 +575,11 @@
                        aspFactory.started = 
xml.getAttribute(STARTED).toBoolean();
aspFactory.maxSequenceNumber = xml.getAttribute(MAX_SEQUENCE_NUMBER, M3UAManagement.MAX_SEQUENCE_NUMBER);
                        aspFactory.slsTable = new 
int[aspFactory.maxSequenceNumber];
+
+                       // For backward compatible
+                       long aspIdTemp = xml.getAttribute(ASP_ID, 
aspFactory.generateId());
+
+ aspFactory.aspid = aspFactory.parameterFactory.createASPIdentifier(aspIdTemp);
                }

                @Override
@@ -590,6 +588,7 @@
                        xml.setAttribute(ASSOCIATION_NAME, 
aspFactory.associationName);
                        xml.setAttribute(STARTED, aspFactory.started);
                        xml.setAttribute(MAX_SEQUENCE_NUMBER, 
aspFactory.maxSequenceNumber);
+                       xml.setAttribute(ASP_ID, aspFactory.aspid.getAspId());
                }
        };

@@ -599,8 +598,7 @@

        @Override
        public void onCommunicationLost(Association association) {
- logger.warn(String.format("Communication channel lost for AspFactroy=%s Association=%s", this.name,
-                               association.getName()));
+ logger.warn(String.format("Communication channel lost for AspFactroy=%s Association=%s", this.name, association.getName()));
                this.handleCommDown();
        }

@@ -612,8 +610,7 @@

        @Override
        public void onCommunicationShutdown(Association association) {
- logger.warn(String.format("Communication channel shutdown for AspFactroy=%s Association=%s", this.name,
-                               association.getName()));
+ logger.warn(String.format("Communication channel shutdown for AspFactroy=%s Association=%s", this.name, association.getName()));
                this.handleCommDown();

        }
@@ -625,7 +622,7 @@
                this.createSLSTable(Math.min(maxInboundStreams, 
maxOutboundStreams) - 1);
                this.handleCommUp();
        }
-
+
        protected void createSLSTable(int minimumBoundStream) {

                if (minimumBoundStream == 1) { // special case - only 1 stream
@@ -663,28 +660,31 @@
                        }
                }
        }
-
-       /* (non-Javadoc)
- * @see org.mobicents.protocols.api.AssociationListener#inValidStreamId(org.mobicents.protocols.api.PayloadData)
+
+       /*
+        * (non-Javadoc)
+        *
+        * @see
+ * org.mobicents.protocols.api.AssociationListener#inValidStreamId(org.mobicents
+        * .protocols.api.PayloadData)
         */
        @Override
public void inValidStreamId(org.mobicents.protocols.api.PayloadData payloadData) { logger.error(String.format("Tx : PayloadData with streamNumber=%d which is greater than or equal to maxSequenceNumber=%d. Droping PayloadData=%s",
-                               payloadData.getStreamNumber(), 
this.maxOutboundStreams, payloadData));
+                               payloadData.getStreamNumber(), 
this.maxOutboundStreams, payloadData));
        }

        public void show(StringBuffer sb) {
- sb.append(M3UAOAMMessages.SHOW_ASP_NAME).append(this.name).append(M3UAOAMMessages.SHOW_SCTP_ASSOC) - .append(this.associationName).append(M3UAOAMMessages.SHOW_STARTED).append(this.started); + sb.append(M3UAOAMMessages.SHOW_ASP_NAME).append(this.name).append(M3UAOAMMessages.SHOW_ASPID).append(this.aspid.getAspId()) + .append(M3UAOAMMessages.SHOW_SCTP_ASSOC).append(this.associationName).append(M3UAOAMMessages.SHOW_STARTED).append(this.started);

                sb.append(M3UAOAMMessages.NEW_LINE);
                sb.append(M3UAOAMMessages.SHOW_ASSIGNED_TO);

for (FastList.Node<Asp> n = aspList.head(), end = aspList.tail(); (n = n.getNext()) != end;) {
                        Asp asp = n.getValue();
- sb.append(M3UAOAMMessages.TAB).append(M3UAOAMMessages.SHOW_AS_NAME).append(asp.getAs().getName())
-                                       
.append(M3UAOAMMessages.SHOW_FUNCTIONALITY).append(this.functionality)
-                                       
.append(M3UAOAMMessages.SHOW_MODE).append(this.exchangeType);
+ sb.append(M3UAOAMMessages.TAB).append(M3UAOAMMessages.SHOW_AS_NAME).append(asp.getAs().getName()).append(M3UAOAMMessages.SHOW_FUNCTIONALITY) + .append(this.functionality).append(M3UAOAMMessages.SHOW_MODE).append(this.exchangeType);

                        if (this.functionality == Functionality.IPSP) {
                                
sb.append(M3UAOAMMessages.SHOW_IPSP_TYPE).append(this.ipspType);
@@ -697,10 +697,9 @@
                        if (asp.getPeerFSM() != null) {
sb.append(M3UAOAMMessages.SHOW_PEER_FSM_STATE).append(asp.getPeerFSM().getState());
                        }
-
+
                        sb.append(M3UAOAMMessages.NEW_LINE);
                }
        }

 }
-
=======================================
--- /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/M3UAManagement.java Sat May 12 04:50:33 2012 +++ /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/M3UAManagement.java Mon Aug 13 04:52:26 2012
@@ -106,7 +106,7 @@
        protected int maxAsForRoute = 4;

        private M3UARouteManagement routeManagement = null;
-
+
        /**
         * Maximum sequence number received from SCCTP user. If SCCTP users 
sends
         * seq number greater than max, packet will be dropped and error message
@@ -337,13 +337,57 @@
        }

        /**
-        * Create new {@link AspFactory}
+        * Create new {@link AspFactory} without passing optional aspid
         *
-        * @param args
+        * @param aspName
+        * @param associationName
         * @return
         * @throws Exception
         */
public AspFactory createAspFactory(String aspName, String associationName) throws Exception {
+               long aspid = 0l;
+               boolean regenerateFlag = true;
+
+               while (regenerateFlag) {
+                       aspid = AspFactory.generateId();
+                       if (aspfactories.size() == 0) {
+                               // Special case where this is first Asp added
+                               break;
+                       }
+
+ for (FastList.Node<AspFactory> n = aspfactories.head(), end = aspfactories.tail(); (n = n.getNext()) != end;) {
+                               AspFactory aspFactory = n.getValue();
+                               if (aspid == aspFactory.getAspid().getAspId()) {
+                                       regenerateFlag = true;
+                                       break;
+                               } else {
+                                       regenerateFlag = false;
+                               }
+                       }// for
+               }// while
+
+               return this.createAspFactory(aspName, associationName, aspid);
+       }
+
+       /**
+        * <p>
+        * Create new {@link AspFactory}
+        * </p>
+        * <p>
+        * Command is m3ua asp create <asp-name> <sctp-association> aspid 
<aspid>
+        * </p>
+        * <p>
+ * asp-name and sctp-association is mandatory where as aspid is optional. If
+        * aspid is not passed, next available aspid wil be used
+        * </p>
+        *
+        * @param aspName
+        * @param associationName
+        * @param aspid
+        * @return
+        * @throws Exception
+        */
+ public AspFactory createAspFactory(String aspName, String associationName, long aspid) throws Exception {
                AspFactory factory = this.getAspFactory(aspName);

                if (factory != null) {
@@ -352,18 +396,25 @@

Association association = this.transportManagement.getAssociation(associationName);
                if (association == null) {
- throw new Exception(String.format("No Association found for name=%s", associationName)); + throw new Exception(String.format(M3UAOAMMessages.NO_ASSOCIATION_FOUND, associationName));
                }

                if (association.isStarted()) {
- throw new Exception(String.format("Association=%s is started", associationName)); + throw new Exception(String.format(M3UAOAMMessages.ASSOCIATION_IS_STARTED, associationName));
                }

                if (association.getAssociationListener() != null) {
- throw new Exception(String.format("Association=%s is already associated", associationName)); + throw new Exception(String.format(M3UAOAMMessages.ASSOCIATION_IS_ASSOCIATED, associationName));
                }

-               factory = new AspFactory(aspName, this.getMaxSequenceNumber());
+ for (FastList.Node<AspFactory> n = aspfactories.head(), end = aspfactories.tail(); (n = n.getNext()) != end;) {
+                       AspFactory aspFactory = n.getValue();
+                       if (aspid == aspFactory.getAspid().getAspId()) {
+ throw new Exception(String.format(M3UAOAMMessages.ASP_ID_TAKEN, aspid));
+                       }
+               }
+
+               factory = new AspFactory(aspName, this.getMaxSequenceNumber(), 
aspid);
                factory.setM3UAManagement(this);
                factory.setAssociation(association);
                factory.setTransportManagement(this.transportManagement);
@@ -436,8 +487,7 @@
                        // assigned to AS with null RC
                        Asp asp = asps.get(0);
                        if (asp != null && asp.getAs().getRoutingContext() == 
null) {
- throw new Exception(String.format(M3UAOAMMessages.ADD_ASP_TO_AS_FAIL_ALREADY_ASSIGNED_TO_OTHER_AS_WITH_NULL_RC,
-                                               aspName, asName));
+ throw new Exception(String.format(M3UAOAMMessages.ADD_ASP_TO_AS_FAIL_ALREADY_ASSIGNED_TO_OTHER_AS_WITH_NULL_RC, aspName, asName));
                        }
                }

@@ -452,8 +502,8 @@
                }

if (aspFactroy.getIpspType() != null && aspFactroy.getIpspType() != as.getIpspType()) { - throw new Exception(String.format(M3UAOAMMessages.ADD_ASP_TO_AS_FAIL_ALREADY_ASSIGNED_TO_OTHER_IPSP_TYPE, aspName,
-                                       asName, aspFactroy.getIpspType()));
+                       throw new Exception(
+ String.format(M3UAOAMMessages.ADD_ASP_TO_AS_FAIL_ALREADY_ASSIGNED_TO_OTHER_IPSP_TYPE, aspName, asName, aspFactroy.getIpspType()));
                }

                aspFactroy.setExchangeType(as.getExchangeType());
@@ -537,7 +587,7 @@
                }

                aspFactory.stop();
-
+
                if (needStore)
                        this.store();
        }
@@ -561,8 +611,7 @@
                        return;

                if (logger.isInfoEnabled()) {
- logger.info(String.format("Removing allocated resources: AppServers=%d, AspFactories=%d", this.appServers.size(),
-                                       this.aspfactories.size()));
+ logger.info(String.format("Removing allocated resources: AppServers=%d, AspFactories=%d", this.appServers.size(), this.aspfactories.size()));
                }

                this.stopFactories();
@@ -601,7 +650,7 @@
                for (String n : lst) {
                        this.destroyAs(n);
                }
-
+
                // We store the cleared state
                this.store();
        }
=======================================
--- /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAOAMMessages.java Wed May 9 11:27:48 2012 +++ /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAOAMMessages.java Mon Aug 13 04:52:26 2012
@@ -102,6 +102,14 @@

public static final String AS_USED_IN_ROUTE_ERROR = "As=%s used in route=%s. Remove from route";

+ public static final String NO_ASSOCIATION_FOUND = "No Association found for name=%s";
+
+ public static final String ASSOCIATION_IS_STARTED = "Association=%s is started";
+
+ public static final String ASSOCIATION_IS_ASSOCIATED = "Association=%s is already associated";
+
+ public static final String ASP_ID_TAKEN = "ASP Identifier=%d is already taken";
+
        /**
         * Generic constants
         */
@@ -122,6 +130,8 @@

        public static final String SHOW_SCTP_ASSOC = " sctpAssoc=";

+       public static final String SHOW_ASPID = " aspid=";
+
        public static final String SHOW_STARTED = " started=";

        public static final String SHOW_FUNCTIONALITY = " functionality=";
=======================================
--- /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAShellExecutor.java Thu Jul 5 06:40:31 2012 +++ /m3ua/impl/src/main/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAShellExecutor.java Mon Aug 13 04:52:26 2012
@@ -296,7 +296,7 @@
                                return M3UAOAMMessages.INVALID_COMMAND;
                        } else if (args[1].equals("asp")) {

-                               if (args.length > 5) {
+                               if (args.length < 3 || args.length > 7) {
                                        return M3UAOAMMessages.INVALID_COMMAND;
                                }

@@ -318,7 +318,26 @@
                                                return 
M3UAOAMMessages.INVALID_COMMAND;
                                        }

- AspFactory factory = this.m3uaManagement.createAspFactory(aspname, assocName);
+                                       AspFactory factory = null;
+                                       if (args.length == 5) {
+                                               factory = 
this.m3uaManagement.createAspFactory(aspname, assocName);
+                                       } else {
+                                               int count = 5;
+                                               while (count < args.length) {
+                                                       String key = 
args[count++];
+                                                       if (key == null) {
+                                                               return 
M3UAOAMMessages.INVALID_COMMAND;
+                                                       }
+
+                                                       if 
(key.equals("aspid")) {
+                                                               long aspid = 
Long.parseLong(args[count++]);
+ factory = this.m3uaManagement.createAspFactory(aspname, assocName, aspid);
+                                                       } else {
+                                                               return 
M3UAOAMMessages.INVALID_COMMAND;
+                                                       }
+                                               }
+
+                                       }
return String.format(M3UAOAMMessages.CREATE_ASP_SUCESSFULL, factory.getName());
                                } else if (raspCmd.equals("destroy")) {
                                        if (args.length < 4) {
=======================================
--- /m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAShellExecutorTest.java Wed May 9 11:27:48 2012 +++ /m3ua/impl/src/test/java/org/mobicents/protocols/ss7/m3ua/impl/oam/M3UAShellExecutorTest.java Mon Aug 13 04:52:26 2012
@@ -86,6 +86,8 @@
                m3uaExec.setM3uaManagement(clientM3UAMgmt);

Association sctpAssociation = this.transportManagement.addAssociation(null, 0, null, 0, "testAssoc1");
+
+ Association sctpAssociation2 = this.transportManagement.addAssociation(null, 0, null, 0, "testAssoc2");

                // Test creating new AS testas
String result = m3uaExec.execute("m3ua as create testas AS mode SE rc 100 traffic-mode loadshare".split(" "));
@@ -107,9 +109,17 @@
result = m3uaExec.execute("m3ua as create MTUAS IPSP mode DE ipspType server rc 1 traffic-mode loadshare".split(" ")); assertEquals(String.format(M3UAOAMMessages.CREATE_AS_SUCESSFULL, "MTUAS"), result);

-               // create ASP
+               // create ASP with only mandatory params
result = m3uaExec.execute("m3ua asp create testasp1 testAssoc1".split(" ")); assertEquals(String.format(M3UAOAMMessages.CREATE_ASP_SUCESSFULL, "testasp1"), result);
+
+               // create ASP with all params but with same aspid
+ result = m3uaExec.execute("m3ua asp create testasp2 testAssoc2 aspid 2".split(" "));
+               assertEquals(result, 
String.format(M3UAOAMMessages.ASP_ID_TAKEN, 2));
+
+               // create ASP with all params but with unique aspid
+ result = m3uaExec.execute("m3ua asp create testasp2 testAssoc2 aspid 3".split(" ")); + assertEquals(result, String.format(M3UAOAMMessages.CREATE_ASP_SUCESSFULL, "testasp2"));

                // Error for same name
result = m3uaExec.execute("m3ua asp create testasp1 testAssoc1".split(" "));

Reply via email to