[jss7] push by [email protected] - simulator & map loadTest update to follow sccp and "TCAP, MAP and CAP... on 2012-12-10 11:32 GMT

Mon, 10 Dec 2012 03:32:20 -0800 

Revision: a1d3796d9e8d
Author:   Sergey Vetyutnev <[email protected]>
Date:     Mon Dec 10 03:30:26 2012
Log: simulator & map loadTest update to follow sccp and "TCAP, MAP and CAP 
Dialog should expose remote txId"
http://code.google.com/p/jss7/source/detail?r=a1d3796d9e8d

Modified:
 /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Client.java
 /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Server.java
/map/load/src/main/java/org/mobicents/protocols/ss7/map/loadDialogic/ClientDialogic.java /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/common/TesterBase.java /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpMan.java /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsClientMan.java /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerMan.java /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdClientMan.java /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdServerMan.java 

=======================================
--- /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Client.java Wed Nov 14 05:09:09 2012 +++ /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Client.java Mon Dec 10 03:30:26 2012 
@@ -331,7 +331,7 @@
         */
        @Override
public void onErrorComponent(MAPDialog mapDialog, Long invokeId, MAPErrorMessage mapErrorMessage) { - logger.error(String.format("onErrorComponent for Dialog=%d and invokeId=%d MAPErrorMessage=%s", mapDialog.getDialogId(), invokeId, mapErrorMessage)); + logger.error(String.format("onErrorComponent for Dialog=%d and invokeId=%d MAPErrorMessage=%s", mapDialog.getLocalDialogId(), invokeId, mapErrorMessage)); 
        }

        /*
@@ -344,7 +344,7 @@
         */
        @Override
public void onProviderErrorComponent(MAPDialog mapDialog, Long invokeId, MAPProviderError providerError) { - logger.error(String.format("onProviderErrorComponent for Dialog=%d and invokeId=%d MAPProviderError=%s", mapDialog.getDialogId(), invokeId, + logger.error(String.format("onProviderErrorComponent for Dialog=%d and invokeId=%d MAPProviderError=%s", mapDialog.getLocalDialogId(), invokeId, 
                                providerError));
        }

@@ -358,7 +358,7 @@
         */
        @Override
public void onRejectComponent(MAPDialog mapDialog, Long invokeId, Problem problem) { - logger.error(String.format("onRejectComponent for Dialog=%d and invokeId=%d Problem=%s", mapDialog.getDialogId(), invokeId, problem)); + logger.error(String.format("onRejectComponent for Dialog=%d and invokeId=%d Problem=%s", mapDialog.getLocalDialogId(), invokeId, problem)); 
        }

        /*
@@ -370,7 +370,7 @@
         */
        @Override
        public void onInvokeTimeout(MAPDialog mapDialog, Long invokeId) {
- logger.error(String.format("onInvokeTimeout for Dialog=%d and invokeId=%d", mapDialog.getDialogId(), invokeId)); + logger.error(String.format("onInvokeTimeout for Dialog=%d and invokeId=%d", mapDialog.getLocalDialogId(), invokeId)); 

        }

@@ -387,7 +387,7 @@
public void onProcessUnstructuredSSRequest(ProcessUnstructuredSSRequest procUnstrReqInd) { 
                // This error condition. Client should never receive the
                // ProcessUnstructuredSSRequestIndication
- logger.error(String.format("onProcessUnstructuredSSRequestIndication for Dialog=%d and invokeId=%d", procUnstrReqInd.getMAPDialog().getDialogId(), + logger.error(String.format("onProcessUnstructuredSSRequestIndication for Dialog=%d and invokeId=%d", procUnstrReqInd.getMAPDialog().getLocalDialogId(), 
                                procUnstrReqInd.getInvokeId()));
        }

@@ -437,7 +437,7 @@
                        mapDialog.send();

                } catch (MAPException e) {
- logger.error(String.format("Error while sending UnstructuredSSResponse for Dialog=%d", mapDialog.getDialogId())); + logger.error(String.format("Error while sending UnstructuredSSResponse for Dialog=%d", mapDialog.getLocalDialogId())); 
                }
        }

@@ -454,7 +454,7 @@
        public void onUnstructuredSSResponse(UnstructuredSSResponse 
unstrResInd) {
                // This error condition. Client should never receive the
                // UnstructuredSSResponseIndication
- logger.error(String.format("onUnstructuredSSResponseIndication for Dialog=%d and invokeId=%d", unstrResInd.getMAPDialog().getDialogId(), + logger.error(String.format("onUnstructuredSSResponseIndication for Dialog=%d and invokeId=%d", unstrResInd.getMAPDialog().getLocalDialogId(), 
                                unstrResInd.getInvokeId()));
        }

@@ -471,14 +471,14 @@
public void onUnstructuredSSNotifyRequest(UnstructuredSSNotifyRequest unstrNotifyInd) { 
                // This error condition. Client should never receive the
                // UnstructuredSSNotifyRequestIndication
- logger.error(String.format("onUnstructuredSSNotifyRequestIndication for Dialog=%d and invokeId=%d", unstrNotifyInd.getMAPDialog().getDialogId(), + logger.error(String.format("onUnstructuredSSNotifyRequestIndication for Dialog=%d and invokeId=%d", unstrNotifyInd.getMAPDialog().getLocalDialogId(), 
                                unstrNotifyInd.getInvokeId()));
        }
public void onUnstructuredSSNotifyResponseIndication(UnstructuredSSNotifyResponse unstrNotifyInd) { 
                // This error condition. Client should never receive the
                // UnstructuredSSNotifyRequestIndication
- logger.error(String.format("onUnstructuredSSNotifyResponseIndication for Dialog=%d and invokeId=%d", unstrNotifyInd.getMAPDialog().getDialogId(), + logger.error(String.format("onUnstructuredSSNotifyResponseIndication for Dialog=%d and invokeId=%d", unstrNotifyInd.getMAPDialog().getLocalDialogId(), 
                                unstrNotifyInd.getInvokeId()));
        }

@@ -492,7 +492,7 @@
        @Override
        public void onDialogDelimiter(MAPDialog mapDialog) {
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onDialogDelimiter for DialogId=%d", mapDialog.getDialogId())); + logger.debug(String.format("onDialogDelimiter for DialogId=%d", mapDialog.getLocalDialogId())); 
                }
        }

@@ -510,7 +510,7 @@
public void onDialogRequest(MAPDialog mapDialog, AddressString destReference, AddressString origReference, MAPExtensionContainer extensionContainer) { 
                if (logger.isDebugEnabled()) {
logger.debug(String.format("onDialogRequest for DialogId=%d DestinationReference=%s OriginReference=%s MAPExtensionContainer=%s", - mapDialog.getDialogId(), destReference, origReference, extensionContainer)); + mapDialog.getLocalDialogId(), destReference, origReference, extensionContainer)); 
                }
        }

@@ -528,7 +528,7 @@
        @Override
public void onDialogRequestEricsson(MAPDialog mapDialog, AddressString destReference, AddressString origReference, IMSI arg3, AddressString arg4) { 
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onDialogRequest for DialogId=%d DestinationReference=%s OriginReference=%s ", mapDialog.getDialogId(), destReference, + logger.debug(String.format("onDialogRequest for DialogId=%d DestinationReference=%s OriginReference=%s ", mapDialog.getLocalDialogId(), destReference, 
                                        origReference));
                }
        }
@@ -544,7 +544,7 @@
        @Override
public void onDialogAccept(MAPDialog mapDialog, MAPExtensionContainer extensionContainer) { 
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onDialogAccept for DialogId=%d MAPExtensionContainer=%s", mapDialog.getDialogId(), extensionContainer)); + logger.debug(String.format("onDialogAccept for DialogId=%d MAPExtensionContainer=%s", mapDialog.getLocalDialogId(), extensionContainer)); 
                }
        }

@@ -563,7 +563,7 @@
public void onDialogReject(MAPDialog mapDialog, MAPRefuseReason refuseReason, MAPProviderError providerError, ApplicationContextName alternativeApplicationContext, MAPExtensionContainer extensionContainer) { logger.error(String.format("onDialogReject for DialogId=%d MAPRefuseReason=%s MAPProviderError=%s ApplicationContextName=%s MAPExtensionContainer=%s", - mapDialog.getDialogId(), refuseReason, providerError, alternativeApplicationContext, extensionContainer)); + mapDialog.getLocalDialogId(), refuseReason, providerError, alternativeApplicationContext, extensionContainer)); 
        }

        /*
@@ -577,7 +577,7 @@
         */
        @Override
public void onDialogUserAbort(MAPDialog mapDialog, MAPUserAbortChoice userReason, MAPExtensionContainer extensionContainer) { - logger.error(String.format("onDialogUserAbort for DialogId=%d MAPUserAbortChoice=%s MAPExtensionContainer=%s", mapDialog.getDialogId(), userReason, + logger.error(String.format("onDialogUserAbort for DialogId=%d MAPUserAbortChoice=%s MAPExtensionContainer=%s", mapDialog.getLocalDialogId(), userReason, 
                                extensionContainer));
        }

@@ -595,7 +595,7 @@
public void onDialogProviderAbort(MAPDialog mapDialog, MAPAbortProviderReason abortProviderReason, MAPAbortSource abortSource, 
                        MAPExtensionContainer extensionContainer) {
logger.error(String.format("onDialogProviderAbort for DialogId=%d MAPAbortProviderReason=%s MAPAbortSource=%s MAPExtensionContainer=%s", - mapDialog.getDialogId(), abortProviderReason, abortSource, extensionContainer)); + mapDialog.getLocalDialogId(), abortProviderReason, abortSource, extensionContainer)); 
        }

        /*
@@ -608,7 +608,7 @@
        @Override
        public void onDialogClose(MAPDialog mapDialog) {
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("DialogClose for Dialog=%d", mapDialog.getDialogId())); + logger.debug(String.format("DialogClose for Dialog=%d", mapDialog.getLocalDialogId())); 
                }

        }
@@ -623,7 +623,7 @@
         */
        @Override
public void onDialogNotice(MAPDialog mapDialog, MAPNoticeProblemDiagnostic noticeProblemDiagnostic) { - logger.error(String.format("onDialogNotice for DialogId=%d MAPNoticeProblemDiagnostic=%s ", mapDialog.getDialogId(), noticeProblemDiagnostic)); + logger.error(String.format("onDialogNotice for DialogId=%d MAPNoticeProblemDiagnostic=%s ", mapDialog.getLocalDialogId(), noticeProblemDiagnostic)); 
        }

        /*
@@ -636,7 +636,7 @@
        @Override
        public void onDialogRelease(MAPDialog mapDialog) {
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onDialogResease for DialogId=%d", mapDialog.getDialogId())); + logger.debug(String.format("onDialogResease for DialogId=%d", mapDialog.getLocalDialogId())); 
                }

                int ndialogs = nbConcurrentDialogs.decrementAndGet();
@@ -673,7 +673,7 @@
         */
        @Override
        public void onDialogTimeout(MAPDialog mapDialog) {
- logger.error(String.format("onDialogTimeout for DialogId=%d", mapDialog.getDialogId())); + logger.error(String.format("onDialogTimeout for DialogId=%d", mapDialog.getLocalDialogId())); 
        }

        @Override
=======================================
--- /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Server.java Wed Nov 14 05:09:09 2012 +++ /map/load/src/main/java/org/mobicents/protocols/ss7/map/load/Server.java Mon Dec 10 03:30:26 2012 
@@ -180,7 +180,7 @@
        @Override
        public void onDialogDelimiter(MAPDialog mapDialog) {
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onDialogDelimiter for DialogId=%d", mapDialog.getDialogId())); + logger.debug(String.format("onDialogDelimiter for DialogId=%d", mapDialog.getLocalDialogId())); 
                }
        }

@@ -198,14 +198,14 @@
public void onDialogRequest(MAPDialog mapDialog, AddressString destReference, AddressString origReference, MAPExtensionContainer extensionContainer) { 
                if (logger.isDebugEnabled()) {
logger.debug(String.format("onDialogRequest for DialogId=%d DestinationReference=%s OriginReference=%s MAPExtensionContainer=%s", - mapDialog.getDialogId(), destReference, origReference, extensionContainer)); + mapDialog.getLocalDialogId(), destReference, origReference, extensionContainer)); 
                }
        }

        @Override
public void onDialogRequestEricsson(MAPDialog mapDialog, AddressString destReference, AddressString origReference, IMSI imsi, AddressString vlr) { 
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onDialogRequest for DialogId=%d DestinationReference=%s OriginReference=%s ", mapDialog.getDialogId(), destReference, + logger.debug(String.format("onDialogRequest for DialogId=%d DestinationReference=%s OriginReference=%s ", mapDialog.getLocalDialogId(), destReference, 
                                        origReference));
                }
        }
@@ -221,7 +221,7 @@
        @Override
public void onDialogAccept(MAPDialog mapDialog, MAPExtensionContainer extensionContainer) { 
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onDialogAccept for DialogId=%d MAPExtensionContainer=%s", mapDialog.getDialogId(), extensionContainer)); + logger.debug(String.format("onDialogAccept for DialogId=%d MAPExtensionContainer=%s", mapDialog.getLocalDialogId(), extensionContainer)); 
                }
        }

@@ -240,7 +240,7 @@
public void onDialogReject(MAPDialog mapDialog, MAPRefuseReason refuseReason, MAPProviderError providerError, ApplicationContextName alternativeApplicationContext, MAPExtensionContainer extensionContainer) { logger.error(String.format("onDialogReject for DialogId=%d MAPRefuseReason=%s MAPProviderError=%s ApplicationContextName=%s MAPExtensionContainer=%s", - mapDialog.getDialogId(), refuseReason, providerError, alternativeApplicationContext, extensionContainer)); + mapDialog.getLocalDialogId(), refuseReason, providerError, alternativeApplicationContext, extensionContainer)); 
        }

        /*
@@ -254,7 +254,7 @@
         */
        @Override
public void onDialogUserAbort(MAPDialog mapDialog, MAPUserAbortChoice userReason, MAPExtensionContainer extensionContainer) { - logger.error(String.format("onDialogUserAbort for DialogId=%d MAPUserAbortChoice=%s MAPExtensionContainer=%s", mapDialog.getDialogId(), userReason, + logger.error(String.format("onDialogUserAbort for DialogId=%d MAPUserAbortChoice=%s MAPExtensionContainer=%s", mapDialog.getLocalDialogId(), userReason, 
                                extensionContainer));
        }

@@ -272,7 +272,7 @@
public void onDialogProviderAbort(MAPDialog mapDialog, MAPAbortProviderReason abortProviderReason, MAPAbortSource abortSource, 
                        MAPExtensionContainer extensionContainer) {
logger.error(String.format("onDialogProviderAbort for DialogId=%d MAPAbortProviderReason=%s MAPAbortSource=%s MAPExtensionContainer=%s", - mapDialog.getDialogId(), abortProviderReason, abortSource, extensionContainer)); + mapDialog.getLocalDialogId(), abortProviderReason, abortSource, extensionContainer)); 
        }

        /*
@@ -285,7 +285,7 @@
        @Override
        public void onDialogClose(MAPDialog mapDialog) {
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("DialogClose for Dialog=%d", mapDialog.getDialogId())); + logger.debug(String.format("DialogClose for Dialog=%d", mapDialog.getLocalDialogId())); 
                }
        }

@@ -299,7 +299,7 @@
         */
        @Override
public void onDialogNotice(MAPDialog mapDialog, MAPNoticeProblemDiagnostic noticeProblemDiagnostic) { - logger.error(String.format("onDialogNotice for DialogId=%d MAPNoticeProblemDiagnostic=%s ", mapDialog.getDialogId(), noticeProblemDiagnostic)); + logger.error(String.format("onDialogNotice for DialogId=%d MAPNoticeProblemDiagnostic=%s ", mapDialog.getLocalDialogId(), noticeProblemDiagnostic)); 
        }

        /*
@@ -312,7 +312,7 @@
        @Override
        public void onDialogRelease(MAPDialog mapDialog) {
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onDialogResease for DialogId=%d", mapDialog.getDialogId())); + logger.debug(String.format("onDialogResease for DialogId=%d", mapDialog.getLocalDialogId())); 
                }
        }

@@ -325,7 +325,7 @@
         */
        @Override
        public void onDialogTimeout(MAPDialog mapDialog) {
- logger.error(String.format("onDialogTimeout for DialogId=%d", mapDialog.getDialogId())); + logger.error(String.format("onDialogTimeout for DialogId=%d", mapDialog.getLocalDialogId())); 
        }

        /*
@@ -340,7 +340,7 @@
        @Override
public void onProcessUnstructuredSSRequest(ProcessUnstructuredSSRequest procUnstrReqInd) { 
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onProcessUnstructuredSSRequestIndication for DialogId=%d", procUnstrReqInd.getMAPDialog().getDialogId())); + logger.debug(String.format("onProcessUnstructuredSSRequestIndication for DialogId=%d", procUnstrReqInd.getMAPDialog().getLocalDialogId())); 
                }
                try {
                        long invokeId = procUnstrReqInd.getInvokeId();
@@ -374,7 +374,7 @@
        @Override
public void onProcessUnstructuredSSResponse(ProcessUnstructuredSSResponse procUnstrResInd) { 
                // Server shouldn't be getting 
ProcessUnstructuredSSResponseIndication
- logger.error(String.format("onProcessUnstructuredSSResponseIndication for Dialog=%d and invokeId=%d", procUnstrResInd.getMAPDialog().getDialogId(), + logger.error(String.format("onProcessUnstructuredSSResponseIndication for Dialog=%d and invokeId=%d", procUnstrResInd.getMAPDialog().getLocalDialogId(), 
                                procUnstrResInd.getInvokeId()));
        }

@@ -390,7 +390,7 @@
        @Override
        public void onUnstructuredSSRequest(UnstructuredSSRequest unstrReqInd) {
                // Server shouldn't be getting UnstructuredSSRequestIndication
- logger.error(String.format("onUnstructuredSSRequestIndication for Dialog=%d and invokeId=%d", unstrReqInd.getMAPDialog().getDialogId(), + logger.error(String.format("onUnstructuredSSRequestIndication for Dialog=%d and invokeId=%d", unstrReqInd.getMAPDialog().getLocalDialogId(), 
                                unstrReqInd.getInvokeId()));
        }

@@ -406,7 +406,7 @@
        @Override
        public void onUnstructuredSSResponse(UnstructuredSSResponse 
unstrResInd) {
                if (logger.isDebugEnabled()) {
- logger.debug(String.format("onUnstructuredSSResponseIndication for DialogId=%d", unstrResInd.getMAPDialog().getDialogId())); + logger.debug(String.format("onUnstructuredSSResponseIndication for DialogId=%d", unstrResInd.getMAPDialog().getLocalDialogId())); 
                }
                try {
USSDString ussdStrObj = this.mapProvider.getMAPParameterFactory().createUSSDString("Your balance is 500"); 
@@ -436,14 +436,14 @@
public void onUnstructuredSSNotifyRequest(UnstructuredSSNotifyRequest unstrNotifyInd) { 
                // This error condition. Client should never receive the
                // UnstructuredSSNotifyRequestIndication
- logger.error(String.format("onUnstructuredSSNotifyRequestIndication for Dialog=%d and invokeId=%d", unstrNotifyInd.getMAPDialog().getDialogId(), + logger.error(String.format("onUnstructuredSSNotifyRequestIndication for Dialog=%d and invokeId=%d", unstrNotifyInd.getMAPDialog().getLocalDialogId(), 
                                unstrNotifyInd.getInvokeId()));
        }
public void onUnstructuredSSNotifyResponseIndication(UnstructuredSSNotifyResponse unstrNotifyInd) { 
                // This error condition. Client should never receive the
                // UnstructuredSSNotifyRequestIndication
- logger.error(String.format("onUnstructuredSSNotifyResponseIndication for Dialog=%d and invokeId=%d", unstrNotifyInd.getMAPDialog().getDialogId(), + logger.error(String.format("onUnstructuredSSNotifyResponseIndication for Dialog=%d and invokeId=%d", unstrNotifyInd.getMAPDialog().getLocalDialogId(), 
                                unstrNotifyInd.getInvokeId()));
        }

@@ -457,7 +457,7 @@
         */
        @Override
public void onErrorComponent(MAPDialog mapDialog, Long invokeId, MAPErrorMessage mapErrorMessage) { - logger.error(String.format("onErrorComponent for Dialog=%d and invokeId=%d MAPErrorMessage=%s", mapDialog.getDialogId(), invokeId, mapErrorMessage)); + logger.error(String.format("onErrorComponent for Dialog=%d and invokeId=%d MAPErrorMessage=%s", mapDialog.getLocalDialogId(), invokeId, mapErrorMessage)); 
        }

        /*
@@ -470,7 +470,7 @@
         */
        @Override
public void onProviderErrorComponent(MAPDialog mapDialog, Long invokeId, MAPProviderError providerError) { - logger.error(String.format("onProviderErrorComponent for Dialog=%d and invokeId=%d MAPProviderError=%s", mapDialog.getDialogId(), invokeId, + logger.error(String.format("onProviderErrorComponent for Dialog=%d and invokeId=%d MAPProviderError=%s", mapDialog.getLocalDialogId(), invokeId, 
                                providerError));
        }

@@ -484,7 +484,7 @@
         */
        @Override
public void onRejectComponent(MAPDialog mapDialog, Long invokeId, Problem problem) { - logger.error(String.format("onRejectComponent for Dialog=%d and invokeId=%d Problem=%s", mapDialog.getDialogId(), invokeId, problem)); + logger.error(String.format("onRejectComponent for Dialog=%d and invokeId=%d Problem=%s", mapDialog.getLocalDialogId(), invokeId, problem)); 
        }

        /*
@@ -496,7 +496,7 @@
         */
        @Override
        public void onInvokeTimeout(MAPDialog mapDialog, Long invokeId) {
- logger.error(String.format("onInvokeTimeout for Dialog=%d and invokeId=%d", mapDialog.getDialogId(), invokeId)); + logger.error(String.format("onInvokeTimeout for Dialog=%d and invokeId=%d", mapDialog.getLocalDialogId(), invokeId)); 
        }

        public static void main(String args[]) {
=======================================
--- /map/load/src/main/java/org/mobicents/protocols/ss7/map/loadDialogic/ClientDialogic.java Wed Nov 14 05:09:09 2012 +++ /map/load/src/main/java/org/mobicents/protocols/ss7/map/loadDialogic/ClientDialogic.java Mon Dec 10 03:30:26 2012 
@@ -395,7 +395,7 @@
public void onForwardShortMessageResponse(ForwardShortMessageResponse forwSmRespInd) { 
                // TODO Auto-generated method stub
- logger.error("onForwardShortMessageRespIndication: " + forwSmRespInd.getMAPDialog().getDialogId()); + logger.error("onForwardShortMessageRespIndication: " + forwSmRespInd.getMAPDialog().getLocalDialogId()); 

                decrementNbConcurrentDialogs();
                synchronized (this) {
=======================================
--- /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/common/TesterBase.java Thu Aug 2 06:16:13 2012 +++ /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/common/TesterBase.java Mon Dec 10 03:30:26 2012 
@@ -57,19 +57,19 @@

        @Override
public void onErrorComponent(MAPDialog dlg, Long invokeId, MAPErrorMessage msg) { - String uData = msg.toString() + ", dlgId=" + dlg.getDialogId() + ", invokeId=" + invokeId; + String uData = msg.toString() + ", dlgId=" + dlg.getLocalDialogId() + ", invokeId=" + invokeId; this.testerHost.sendNotif(this.className, "Rcvd: Error component", uData, Level.DEBUG); 
        }

        @Override
public void onProviderErrorComponent(MAPDialog mapDialog, Long invokeId, MAPProviderError providerError) { - String uData = providerError + ", dlgId=" + mapDialog.getDialogId() + ", InvokeId=" + invokeId; + String uData = providerError + ", dlgId=" + mapDialog.getLocalDialogId() + ", InvokeId=" + invokeId; this.testerHost.sendNotif(this.className, "Rcvd: ProviderErrorComponent", uData, Level.DEBUG); 
        }

        @Override
public void onRejectComponent(MAPDialog mapDialog, Long invokeId, Problem problem) { - String uData = problem.toString() + ", dlgId=" + mapDialog.getDialogId() + ", InvokeId=" + invokeId; + String uData = problem.toString() + ", dlgId=" + mapDialog.getLocalDialogId() + ", InvokeId=" + invokeId; this.testerHost.sendNotif(this.className, "Rcvd: RejectComponent", uData, Level.DEBUG); 
        }

@@ -97,7 +97,7 @@

        @Override
public void onDialogNotice(MAPDialog mapDialog, MAPNoticeProblemDiagnostic notice) { - String uData = "dialogNotice=" + notice.toString() + ", dlgId=" + mapDialog.getDialogId(); + String uData = "dialogNotice=" + notice.toString() + ", dlgId=" + mapDialog.getLocalDialogId(); this.testerHost.sendNotif(this.className, "Rcvd: DialogNotice", uData, Level.DEBUG); 
        }

@@ -105,7 +105,7 @@
public void onDialogProviderAbort(MAPDialog mapDialog, MAPAbortProviderReason abortProviderReason, MAPAbortSource abortSource, 
                        MAPExtensionContainer extensionContainer) {
String uData = "abortProviderReason=" + abortProviderReason + ", abortSource=" + abortSource + ", dlgId=" 
-                               + mapDialog.getDialogId();
+                               + mapDialog.getLocalDialogId();
this.testerHost.sendNotif(this.className, "Rcvd: DialogProviderAbort", uData, Level.DEBUG); 
        }

@@ -113,7 +113,7 @@
public void onDialogReject(MAPDialog mapDialog, MAPRefuseReason refuseReason, MAPProviderError providerError, ApplicationContextName alternativeApplicationContext, MAPExtensionContainer extensionContainer) { String uData = "refuseReason=" + refuseReason + ", providerError=" + providerError + ", alternativeApplicationContext=" + alternativeApplicationContext 
-                               + ", dlgId=" + mapDialog.getDialogId();
+                               + ", dlgId=" + mapDialog.getLocalDialogId();
this.testerHost.sendNotif(this.className, "Rcvd: DialogReject", uData, Level.DEBUG); 
        }

@@ -137,7 +137,7 @@

        @Override
public void onDialogUserAbort(MAPDialog mapDialog, MAPUserAbortChoice userReason, MAPExtensionContainer extensionContainer) { - String uData = "userReason=" + userReason + ", dlgId=" + mapDialog.getDialogId(); + String uData = "userReason=" + userReason + ", dlgId=" + mapDialog.getLocalDialogId(); this.testerHost.sendNotif(this.className, "Rcvd: DialogUserAbort", uData, Level.DEBUG); 
        }

=======================================
--- /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpMan.java Tue Nov 13 06:18:58 2012 +++ /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/level2/SccpMan.java Mon Dec 10 03:30:26 2012 
@@ -32,6 +32,8 @@
 import org.mobicents.protocols.ss7.indicator.NumberingPlan;
 import org.mobicents.protocols.ss7.indicator.RoutingIndicator;
 import org.mobicents.protocols.ss7.mtp.Mtp3UserPart;
+import org.mobicents.protocols.ss7.sccp.LoadSharingAlgorithm;
+import org.mobicents.protocols.ss7.sccp.OriginationType;
 import org.mobicents.protocols.ss7.sccp.RemoteSignalingPointCode;
 import org.mobicents.protocols.ss7.sccp.RemoteSubSystem;
 import org.mobicents.protocols.ss7.sccp.Router;
@@ -373,16 +375,18 @@
                if (this.routeOnGtMode) {
                        this.router = this.sccpStack.getRouter();
- this.router.addPrimaryAddress(1, new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_GLOBAL_TITLE, dpc, this.createGlobalTitle(""), 0)); - this.router.addPrimaryAddress(2, new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, opc, this.createGlobalTitle(""), localSsn)); + this.router.addRoutingAddress(1, new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_GLOBAL_TITLE, dpc, this.createGlobalTitle(""), 0)); + this.router.addRoutingAddress(2, new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_DPC_AND_SSN, opc, this.createGlobalTitle(""), localSsn));
SccpAddress pattern = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_GLOBAL_TITLE, 0, this.createGlobalTitle("*"), 0); 
                        String mask = "K";
- ((RouterImpl)this.router).addRule(1, RuleType.Solitary, null, pattern, mask, 1, -1); + ((RouterImpl)this.router).addRule(1, RuleType.Solitary, null, null, pattern, mask, 1, -1, null); +// int id, RuleType ruleType, LoadSharingAlgorithm algo, OriginationType originationType, SccpAddress pattern, String mask, +// int pAddressId, int sAddressId, Integer newCallingPartyAddressAddressId
pattern = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_GLOBAL_TITLE, 0, this.createGlobalTitle(callingPartyAddressDigits), 0); 
                        mask = "R";
- ((RouterImpl)this.router).addRule(2, RuleType.Solitary, null, pattern, mask, 2, -1); + ((RouterImpl)this.router).addRule(2, RuleType.Solitary, null, null, pattern, mask, 2, -1, null);
if (extraLocalAddressDigits != null && !extraLocalAddressDigits.equals("")) { 
                                String[] ss = 
extraLocalAddressDigits.split(",");
@@ -392,7 +396,7 @@
                                        s = s.trim();
pattern = new SccpAddress(RoutingIndicator.ROUTING_BASED_ON_GLOBAL_TITLE, 0, this.createGlobalTitle(s), 0); 
                                        mask = "R";
- ((RouterImpl)this.router).addRule(ruleNum, RuleType.Solitary, null, pattern, mask, 2, -1); + ((RouterImpl)this.router).addRule(ruleNum, RuleType.Solitary, null, null, pattern, mask, 2, -1, null); 
                                        ruleNum++;
                                }
                        }
=======================================
--- /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsClientMan.java Sat Oct 20 10:12:24 2012 +++ /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsClientMan.java Mon Dec 10 03:30:26 2012 
@@ -490,7 +490,7 @@
                                curDialog.addMoForwardShortMessageRequest(da, 
oa, si, null, null);
                        curDialog.send();
- String mtData = createMoData(curDialog.getDialogId(), destIsdnNumber, origIsdnNumber, serviceCentreAddr); + String mtData = createMoData(curDialog.getLocalDialogId(), destIsdnNumber, origIsdnNumber, serviceCentreAddr); 
                        currentRequestDef += "Sent moReq;";
                        this.countMoFsmReq++;
this.testerHost.sendNotif(SOURCE_NAME, "Sent: moReq: " + msg, mtData, Level.DEBUG); 
@@ -577,7 +577,7 @@
                                        }
                                }
                        }
- String uData = this.createMtData(curDialog.getDialogId(), destImsi, origIsdnNumber, serviceCentreAddr); + String uData = this.createMtData(curDialog.getLocalDialogId(), destImsi, origIsdnNumber, serviceCentreAddr); this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: mtReq: " + msg, uData, Level.DEBUG); 
                } catch (MAPException e) {
this.testerHost.sendNotif(SOURCE_NAME, "Exception when decoding MtForwardShortMessageRequest tpdu : " + e.getMessage(), e, Level.ERROR); 
@@ -592,7 +592,7 @@
                this.countMoFsmResp++;

                MAPDialogSms curDialog = ind.getMAPDialog();
-               long invokeId = curDialog.getDialogId();
+               long invokeId = curDialog.getLocalDialogId();
                currentRequestDef += "Rsvd moResp;";
                this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: moResp", "", 
Level.DEBUG);
        }
@@ -611,7 +611,7 @@
                this.countMoFsmResp++;

                MAPDialogSms curDialog = ind.getMAPDialog();
-               long invokeId = curDialog.getDialogId();
+               long invokeId = curDialog.getLocalDialogId();
                currentRequestDef += "Rsvd moResp;";
                this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: moResp", "", 
Level.DEBUG);
        }
@@ -698,7 +698,7 @@
 //             return;
- String uData = this.createSriData(curDialog.getDialogId(), ind.getMsisdn().getAddress(), ind.getServiceCentreAddress().getAddress()); + String uData = this.createSriData(curDialog.getLocalDialogId(), ind.getMsisdn().getAddress(), ind.getServiceCentreAddress().getAddress()); this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: sriReq", uData, Level.DEBUG); 


@@ -711,7 +711,7 @@
                        this.needSendClose = true;

                        this.countSriResp++;
- uData = this.createSriRespData(curDialog.getDialogId(), this.sriResponseImsi, this.sriResponseVlr); + uData = this.createSriRespData(curDialog.getLocalDialogId(), this.sriResponseImsi, this.sriResponseVlr); this.testerHost.sendNotif(SOURCE_NAME, "Sent: sriResp", uData, Level.DEBUG); 
                } catch (MAPException e) {
this.testerHost.sendNotif(SOURCE_NAME, "Exception when invoking addSendRoutingInfoForSMResponse() : " + e.getMessage(), e, Level.ERROR); 
=======================================
--- /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerMan.java Sat Oct 20 10:12:24 2012 +++ /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/sms/TestSmsServerMan.java Mon Dec 10 03:30:26 2012 
@@ -456,7 +456,7 @@
curDialog.addSendRoutingInfoForSMRequest(msisdn, true, serviceCentreAddress, null, false, null, null, null); 
                        curDialog.send();
- String sriData = createSriData(curDialog.getDialogId(), destIsdnNumber, serviceCentreAddr); + String sriData = createSriData(curDialog.getLocalDialogId(), destIsdnNumber, serviceCentreAddr); 
                        currentRequestDef += "Sent SriReq;";
                        this.countSriReq++;
this.testerHost.sendNotif(SOURCE_NAME, "Sent: sriReq", sriData, Level.DEBUG); 
@@ -574,7 +574,7 @@
                                curDialog.addMtForwardShortMessageRequest(da, 
oa, si, false, null);
                        curDialog.send();
- String mtData = createMtData(curDialog.getDialogId(), destImsi, vlrNumber, origIsdnNumber, serviceCentreAddr); + String mtData = createMtData(curDialog.getLocalDialogId(), destImsi, vlrNumber, origIsdnNumber, serviceCentreAddr); 
                        currentRequestDef += "Sent mtReq;";
                        this.countMtFsmReq++;
this.testerHost.sendNotif(SOURCE_NAME, "Sent: mtReq: " + msg, mtData, Level.DEBUG); 
@@ -635,7 +635,7 @@
                this.countMtFsmResp++;

                MAPDialogSms curDialog = ind.getMAPDialog();
-               long invokeId = curDialog.getDialogId();
+               long invokeId = curDialog.getLocalDialogId();
                currentRequestDef += "Rsvd mtResp;";
                this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: mtResp", "", 
Level.DEBUG);
        }
@@ -699,7 +699,7 @@
                                        }
                                }
                        }
- String uData = this.createMoData(curDialog.getDialogId(), destIsdnNumber, origIsdnNumber, serviceCentreAddr); + String uData = this.createMoData(curDialog.getLocalDialogId(), destIsdnNumber, origIsdnNumber, serviceCentreAddr); this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: moReq: " + msg, uData, Level.DEBUG); 
                } catch (MAPException e) {
this.testerHost.sendNotif(SOURCE_NAME, "Exception when decoding MoForwardShortMessageRequest tpdu : " + e.getMessage(), e, Level.ERROR); 
@@ -740,7 +740,7 @@
                this.countMtFsmResp++;

                MAPDialogSms curDialog = ind.getMAPDialog();
-               long invokeId = curDialog.getDialogId();
+               long invokeId = curDialog.getLocalDialogId();
                currentRequestDef += "Rsvd mtResp;";
                this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: mtResp", "", 
Level.DEBUG);
        }
@@ -759,7 +759,7 @@
                this.countSriResp++;

                MAPDialogSms curDialog = ind.getMAPDialog();
-               long invokeId = curDialog.getDialogId();
+               long invokeId = curDialog.getLocalDialogId();
                LocationInfoWithLMSI li = ind.getLocationInfoWithLMSI();
                String vlrNum = "";
                if (li != null && li.getNetworkNodeNumber() != null)
=======================================
--- /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdClientMan.java Tue Sep 18 04:01:10 2012 +++ /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdClientMan.java Mon Dec 10 03:30:26 2012 
@@ -277,7 +277,7 @@
                sb.append(": CurDialog=");
                MAPDialogSupplementary curDialog = currentDialog;
                if (curDialog != null)
-                       sb.append(curDialog.getDialogId());
+                       sb.append(curDialog.getLocalDialogId());
                else
                        sb.append("No");
                sb.append("<br>Count: processUnstructuredSSRequest-");
@@ -430,7 +430,7 @@
this.testerHost.sendNotif(SOURCE_NAME, "Sent: procUnstrSsReq: " + (countProcUnstReqNot * 100) + " messages sent", "", Level.DEBUG); 
                                }
                        } else {
- String uData = this.createUssdMessageData(curDialog.getDialogId(), this.dataCodingScheme, msisdn, alPattern); + String uData = this.createUssdMessageData(curDialog.getLocalDialogId(), this.dataCodingScheme, msisdn, alPattern); this.testerHost.sendNotif(SOURCE_NAME, "Sent: procUnstrSsReq: " + msg, uData, Level.DEBUG); 
                        }

@@ -525,7 +525,7 @@

                        currentRequestDef += "Sent unstrSsResp=\"" + msg + 
"\";";
                        this.countUnstResp++;
- String uData = this.createUssdMessageData(curDialog.getDialogId(), this.dataCodingScheme, null, null); + String uData = this.createUssdMessageData(curDialog.getLocalDialogId(), this.dataCodingScheme, null, null); this.testerHost.sendNotif(SOURCE_NAME, "Sent: unstrSsResp: " + msg, uData, Level.DEBUG); 

                        return "UnstructuredSSResponse has been sent";
@@ -566,7 +566,7 @@

                this.countProcUnstResp++;
                if (!this.oneNotificationFor100Dialogs) {
- String uData = this.createUssdMessageData(ind.getMAPDialog().getDialogId(), ind.getDataCodingScheme().getCode(), null, null); + String uData = this.createUssdMessageData(ind.getMAPDialog().getLocalDialogId(), ind.getDataCodingScheme().getCode(), null, null); 
                        try {
this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: procUnstrSsResp: " + ind.getUSSDString().getString(null), uData, Level.DEBUG); 
                        } catch (MAPException e) {
@@ -595,7 +595,7 @@
                        e1.printStackTrace();
                }
                this.countUnstReq++;
- String uData = this.createUssdMessageData(curDialog.getDialogId(), ind.getDataCodingScheme().getCode(), null, null); + String uData = this.createUssdMessageData(curDialog.getLocalDialogId(), ind.getDataCodingScheme().getCode(), null, null); 
                try {
this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: unstrSsReq: " + ind.getUSSDString().getString(null), uData, Level.DEBUG); 
                } catch (MAPException e) {
@@ -619,7 +619,7 @@
                invokeId = ind.getInvokeId();

                this.countUnstNotifReq++;
- String uData = this.createUssdMessageData(dlg.getDialogId(), ind.getDataCodingScheme().getCode(), null, null); + String uData = this.createUssdMessageData(dlg.getLocalDialogId(), ind.getDataCodingScheme().getCode(), null, null); 
                try {
this.testerHost.sendNotif(SOURCE_NAME, "Rcvd: unstrSsNotify: " + ind.getUSSDString().getString(null), uData, Level.DEBUG); 
                } catch (MAPException e1) {
=======================================
--- /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdServerMan.java Tue Sep 18 04:01:10 2012 +++ /tools/simulator/core/src/main/java/org/mobicents/protocols/ss7/tools/simulator/tests/ussd/TestUssdServerMan.java Mon Dec 10 03:30:26 2012 
@@ -277,7 +277,7 @@
                sb.append(": CurDialog=");
                MAPDialogSupplementary curDialog = currentDialog;
                if (curDialog != null)
-                       sb.append(curDialog.getDialogId());
+                       sb.append(curDialog.getLocalDialogId());
                else
                        sb.append("No");
                sb.append(", Pending dialogs=");
@@ -443,7 +443,7 @@
this.testerHost.sendNotif(SOURCE_NAME, "Sent: procUnstrSsResp: " + (countProcUnstRespNot * 100) + " messages sent", "", Level.DEBUG); 
                        }
                } else {
- String uData = this.createUssdMessageData(curDialog.getDialogId(), this.dataCodingScheme, null, null); + String uData = this.createUssdMessageData(curDialog.getLocalDialogId(), this.dataCodingScheme, null, null); this.testerHost.sendNotif(SOURCE_NAME, "Sent: procUnstrSsResp: " + msg, uData, Level.DEBUG); 
                }

@@ -482,7 +482,7 @@
                        dd.currentRequestDef = currentRequestDef;
                }
                this.countUnstReq++;
- String uData = this.createUssdMessageData(curDialog.getDialogId(), this.dataCodingScheme, null, null); + String uData = this.createUssdMessageData(curDialog.getLocalDialogId(), this.dataCodingScheme, null, null); this.testerHost.sendNotif(SOURCE_NAME, "Sent: unstrSsReq: " + msg, uData, Level.DEBUG); 

                return "UnstructuredSSRequest has been sent";
@@ -577,7 +577,7 @@
                        dlg.send();

                        this.countUnstNotifReq++;
- String uData = this.createUssdMessageData(dlg.getDialogId(), this.dataCodingScheme, msisdn, alPattern); + String uData = this.createUssdMessageData(dlg.getLocalDialogId(), this.dataCodingScheme, msisdn, alPattern); this.testerHost.sendNotif(SOURCE_NAME, "Sent: unstrSsNotify: " + msg, uData, Level.DEBUG); 

                        return "UnstructuredSSNotify has been sent";
@@ -618,7 +618,7 @@
                }
                this.countProcUnstReq++;
                if (!this.oneNotificationFor100Dialogs) {
- String uData = this.createUssdMessageData(ind.getMAPDialog().getDialogId(), ind.getDataCodingScheme().getCode(), ind.getMSISDNAddressString(), + String uData = this.createUssdMessageData(ind.getMAPDialog().getLocalDialogId(), ind.getDataCodingScheme().getCode(), ind.getMSISDNAddressString(), 
                                        ind.getAlertingPattern());
                        try {
this.sendRcvdNotice("Rcvd: procUnstrSsReq: " + ind.getUSSDString().getString(null), pref, uData); 
@@ -688,7 +688,7 @@
                        currentRequestDef = dd.currentRequestDef;
                String pref = "CurDialog: ";
                this.countUnstResp++;
- String uData = this.createUssdMessageData(ind.getMAPDialog().getDialogId(), ind.getDataCodingScheme().getCode(), null, null); + String uData = this.createUssdMessageData(ind.getMAPDialog().getLocalDialogId(), ind.getDataCodingScheme().getCode(), null, null); 
                try {
this.sendRcvdNotice("Rcvd: unstrSsResp: " + ind.getUSSDString().getString(null), pref, uData); 
                } catch (MAPException e) {

Reply via email to