pespin has submitted this change. ( 
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41425?usp=email )

Change subject: cosmetic: SCCP_Test/SCCP_Testcases.{cfg,ttcn}: Fix trailing 
whitespace
......................................................................

cosmetic: SCCP_Test/SCCP_Testcases.{cfg,ttcn}: Fix trailing whitespace

Change-Id: I17140056c40305a8eb8024df5403897d0853098e
---
M SCCP_Test/SCCP_Testcases.cfg
M SCCP_Test/SCCP_Testcases.ttcn
2 files changed, 94 insertions(+), 94 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved




diff --git a/SCCP_Test/SCCP_Testcases.cfg b/SCCP_Test/SCCP_Testcases.cfg
index 5ba8c60..9920cf0 100644
--- a/SCCP_Test/SCCP_Testcases.cfg
+++ b/SCCP_Test/SCCP_Testcases.cfg
@@ -2,9 +2,9 @@
 #FileName := "SCCP_selftest.cfg"
 FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING
 #ConsoleMask := LOG_ALL
-#ConsoleMask := TTCN_TESTCASE | TTCN_PORTEVENT | TTCN_DEBUG | TTCN_MATCHING
+#ConsoleMask := TTCN_TESTCASE | TTCN_PORTEVENT | TTCN_DEBUG | TTCN_MATCHING
 #ConsoleMask :=  TTCN_WARNING | TTCN_ERROR | TTCN_TESTCASE | TTCN_STATISTICS | 
TTCN_PORTEVENT
-#ConsoleMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING
+#ConsoleMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING
 LogSourceInfo := Yes

 [EXECUTE]
@@ -47,7 +47,7 @@
 #for mtp3_itu/gti0011 or mtp3_ansi/gti0001 :
 #tsp_translationType := 7
 SCCP_Emulation.tsp_SIF_MaxLength := 272
-SCCP_Emulation.tsp_force_xudt := 0 // 1:yes, 0:no
+SCCP_Emulation.tsp_force_xudt := 0 // 1:yes, 0:no

 [MAIN_CONTROLLER]
 //TCPPort := 7145
diff --git a/SCCP_Test/SCCP_Testcases.ttcn b/SCCP_Test/SCCP_Testcases.ttcn
index b659fc6..bf93380 100644
--- a/SCCP_Test/SCCP_Testcases.ttcn
+++ b/SCCP_Test/SCCP_Testcases.ttcn
@@ -16,10 +16,10 @@
 //
 //  File:                  SCCP_TestCases.ttcn
 //  Description:  SS7 SCCP basic SEA test
-//                according to specification ITU-T SS7 SCCP, ANSI ..., TCC ...
-//  References:   ITU-T: Recommendation Q.711-Q.714,
-//                ANSI  T1.112-2001,
-//                TCC
+//                according to specification ITU-T SS7 SCCP, ANSI ..., TCC ...
+//  References:   ITU-T: Recommendation Q.711-Q.714,
+//                ANSI  T1.112-2001,
+//                TCC
 //  Rev:          <RnXnn>
 //  Updated:       2007.04.12
 //  Contact:      http://ttcn.ericsson.se
@@ -28,7 +28,7 @@



-//Note : this has been modified to include M3UA Emulation and SCTP Test port
+//Note : this has been modified to include M3UA Emulation and SCTP Test port
 //Elemer Lelik 12.04.2017


@@ -36,17 +36,17 @@
 module SCCP_Testcases
 {//startmodule

-modulepar
+modulepar
 {
   hexstring tsp_own_GT := '0614377760'H;
   hexstring tsp_remote_GT := '0614375760'H;
   integer tsp_SSN := 2; //8:MSC 5:MAP see 3.4.2.2/Q.713
   octetstring tsp_SIO := '83'O;//SCCP national
-  integer tsp_own_SPC := 461087; // =0x07091E
+  integer tsp_own_SPC := 461087; // =0x07091E
   integer tsp_remote_SPC := 461086; // =0x07091D
   integer tsp_SLS := 0;
   charstring tsp_sccp_serviceType := "mtp3_itu";
-
+
   octetstring MTP3_UserPart_SIO;
   integer MTP3_UserPart_OPC,
           MTP3_UserPart_DPC,
@@ -84,10 +84,10 @@

 // Model of MSC:
 type component system_CT {
-
-     port SCTPasp_PT           sctp;

-
+     port SCTPasp_PT           sctp;
+
+
 };


@@ -101,13 +101,13 @@

   var M3UA_CT vc_M3UA ;

-  var MSC_SCCP_MTP3_parameters v_BootA;
+  var MSC_SCCP_MTP3_parameters v_BootA;
   var SCCP_PAR_Connection_Id v_cid_A ;
-
-  port SCCPasp_PT A_PORT; //SCCPuserA
+
+  port SCCPasp_PT A_PORT; //SCCPuserA
 }

-function initBootParams() runs on MTC_CT
+function initBootParams() runs on MTC_CT
 {
   v_BootA :=
   { sio:=
@@ -116,8 +116,8 @@
       si:= substr(oct2bit(tsp_SIO),4,4)
     },
     opc:=tsp_own_SPC,
-    dpc:=tsp_remote_SPC,
-    sls:=tsp_SLS,
+    dpc:=tsp_remote_SPC,
+    sls:=tsp_SLS,
     sccp_serviceType:=tsp_sccp_serviceType,
     ssn:= tsp_SSN
   };
@@ -128,21 +128,21 @@
 {
   initBootParams();
   log("v_BootA:",v_BootA);
-
+
   // Protocol Stack  creation & connections:
   vc_SCCP_A:=SCCP_CT.create;
   vc_M3UA:=M3UA_CT.create;

   connect(self:A_PORT,vc_SCCP_A:SCCP_SP_PORT);
   connect(vc_M3UA:MTP3_SP_PORT,vc_SCCP_A:MTP3_SCCP_PORT);
-  map(vc_M3UA:SCTP_PORT,system:sctp);
-
-  vc_M3UA.start(f_M3UA_Emulation(tsp_address));
-  vc_SCCP_A.start( SCCPStart( v_BootA ) ); // Bootparameters
+  map(vc_M3UA:SCTP_PORT,system:sctp);

-
+  vc_M3UA.start(f_M3UA_Emulation(tsp_address));
+  vc_SCCP_A.start( SCCPStart( v_BootA ) ); // Bootparameters
+
+
   log( "init() is done");
-
+
 }// init

 function terminate( ) runs on MTC_CT //system system_CT
@@ -154,16 +154,16 @@
   }*/
     all component.stop;

-  unmap(vc_M3UA:SCTP_PORT,system:sctp);
-  disconnect(vc_M3UA:MTP3_SP_PORT,vc_SCCP_A:MTP3_SCCP_PORT);
+  unmap(vc_M3UA:SCTP_PORT,system:sctp);
+  disconnect(vc_M3UA:MTP3_SP_PORT,vc_SCCP_A:MTP3_SCCP_PORT);
   disconnect(self:A_PORT,vc_SCCP_A:SCCP_SP_PORT);

-
+
     log(" all components stopped");
     self.stop;
 } //terminate

-// function getOddEven returns '0'
+// function getOddEven returns '0'
 // if even number of dec digit can be found in GT see Q.713
 function getOddEven( in hexstring pl_GT) return bitstring
 {
@@ -184,19 +184,19 @@

 function setAddresses_gti0001() runs on MTC_CT
 {
-    if( (tsp_sccp_serviceType == "mtp3_itu") or
+    if( (tsp_sccp_serviceType == "mtp3_itu") or
         (tsp_sccp_serviceType == "mtp3b_itu") or
         (tsp_sccp_serviceType == "mtp3_ttc") or
         (tsp_sccp_serviceType == "mtp3b_ttc")
       ) {
-      v_CalledAddress :={
+      v_CalledAddress :={
         addressIndicator  := {
           pointCodeIndic := '1'B,
           ssnIndicator := '1'B,
           globalTitleIndic := '0001'B,
           routingIndicator := '1'B
         },//addressIndicator
-        signPointCode     := SCCP_SPC_int2bit(tsp_remote_SPC, 
tsp_sccp_serviceType, tsp_SIO), // see SCCP.ttcn
+        signPointCode     := SCCP_SPC_int2bit(tsp_remote_SPC, 
tsp_sccp_serviceType, tsp_SIO), // see SCCP.ttcn
         subsystemNumber   := tsp_SSN,
         globalTitle := {
           gti0001:= {
@@ -206,72 +206,72 @@
           }
         }//globalTitle
       } // v_CalledAddress
-
-      v_CallingAddress :={
+
+      v_CallingAddress :={
         addressIndicator  := {
           pointCodeIndic := '1'B,
           ssnIndicator := '1'B,
           globalTitleIndic := '0001'B,
           routingIndicator := '1'B
         },//addressIndicator
-        signPointCode     := SCCP_SPC_int2bit(tsp_own_SPC, 
tsp_sccp_serviceType, tsp_SIO), // see SCCP.ttcn
+        signPointCode     := SCCP_SPC_int2bit(tsp_own_SPC, 
tsp_sccp_serviceType, tsp_SIO), // see SCCP.ttcn
         subsystemNumber   := tsp_SSN,
-        globalTitle:= {
+        globalTitle:= {
           gti0001 := {
             natureOfAddress := '0000011'B,
-            oddeven := getOddEven( tsp_own_GT ),
+            oddeven := getOddEven( tsp_own_GT ),
             globalTitleAddress := tsp_own_GT
           }
         }//globalTitle
       } // v_CallingAddress
-
+
     } else if(
         (tsp_sccp_serviceType == "mtp3_ansi") or
-        (tsp_sccp_serviceType == "mtp3b_ansi")
+        (tsp_sccp_serviceType == "mtp3b_ansi")
       ) {
-
-      v_CalledAddress :={
+
+      v_CalledAddress :={
         addressIndicator  := {
           pointCodeIndic := '1'B,
           ssnIndicator := '1'B,
           globalTitleIndic := '0001'B,
           routingIndicator := '0'B
         },//addressIndicator
-        signPointCode     := SCCP_SPC_int2bit(tsp_remote_SPC, 
tsp_sccp_serviceType, tsp_SIO), // see SCCP.ttcn
+        signPointCode     := SCCP_SPC_int2bit(tsp_remote_SPC, 
tsp_sccp_serviceType, tsp_SIO), // see SCCP.ttcn
         subsystemNumber   := tsp_SSN,
         globalTitle := {
           gti0011:= {
             translationType   := int2oct(7,1),
-            encodingScheme    := getOddEven_ansi( tsp_remote_GT ),
-            numberingPlan     := '0111'B,  //ISDN/mobile numbering plan, see 
T1.112.3-2001/3.4.2.3.1
+            encodingScheme    := getOddEven_ansi( tsp_remote_GT ),
+            numberingPlan     := '0111'B,  //ISDN/mobile numbering plan, see 
T1.112.3-2001/3.4.2.3.1
             globalTitleAddress:= tsp_remote_GT
           }
         }//globalTitle
       } // v_CalledAddress
-
-      v_CallingAddress :={
+
+      v_CallingAddress :={
         addressIndicator  := {
           pointCodeIndic := '1'B,
           ssnIndicator := '1'B,
           globalTitleIndic := '0001'B,
           routingIndicator := '0'B
         },//addressIndicator
-        signPointCode     := SCCP_SPC_int2bit(tsp_remote_SPC, 
tsp_sccp_serviceType, tsp_SIO), // see SCCP.ttcn
+        signPointCode     := SCCP_SPC_int2bit(tsp_remote_SPC, 
tsp_sccp_serviceType, tsp_SIO), // see SCCP.ttcn
         subsystemNumber   := tsp_SSN,
         globalTitle := {
           gti0011:= {
             translationType   := int2oct(7,1),
-            encodingScheme    := getOddEven_ansi( tsp_own_GT ),
-            numberingPlan     := '0111'B,  //ISDN/mobile numbering plan, see 
T1.112.3-2001/3.4.2.3.1
+            encodingScheme    := getOddEven_ansi( tsp_own_GT ),
+            numberingPlan     := '0111'B,  //ISDN/mobile numbering plan, see 
T1.112.3-2001/3.4.2.3.1
             globalTitleAddress:= tsp_own_GT
           }
         }//globalTitle
       } // v_CallingAddress
     }//if
-
+
 }//setAddresses_gti001

-function f_SendAndReceive1N_UNITDATA(in octetstring pl_userdata) runs on MTC_CT
+function f_SendAndReceive1N_UNITDATA(in octetstring pl_userdata) runs on MTC_CT
 {
   var ASP_SCCP_N_UNITDATA_ind vl_N_UNITDATA_ind;
   timer TL_timer:= 120.0;
@@ -282,12 +282,12 @@
                                       '00000001'B, //return option
                                       pl_userdata,
                                       omit ) );
-  alt {
+  alt {
     [] A_PORT.receive( tr_ASP_N_UNITDATA_ind ) -> value vl_N_UNITDATA_ind
-      {
+      {

         if( (vl_N_UNITDATA_ind.calledAddress == v_CalledAddress ) and
-        (vl_N_UNITDATA_ind.callingAddress == v_CallingAddress) and
+        (vl_N_UNITDATA_ind.callingAddress == v_CallingAddress) and
         (vl_N_UNITDATA_ind.userData == pl_userdata) )
         {
           log("Correct  CalledAddress, CallingAddress and userData received, 
data are correct");
@@ -298,13 +298,13 @@
           log("Some data corrupted");
           setverdict( fail );
         }
-      };
-    [] TL_timer.timeout
-      {
+      };
+    [] TL_timer.timeout
+      {
         setverdict( fail );
         log("Timeout....");
-      };
-  } //alt
+      };
+  } //alt
   TL_timer.stop;
 }//f_SendAndReceive1N_UNITDATA

@@ -315,8 +315,8 @@
 /****************************************************
 function f_connect
 Establishes a connection
-(Sends an ASP_SCCP_N_CONNECT_req on A_PORT and waits for
-N_CONNECT_ind on B_PORT. If it is received,
+(Sends an ASP_SCCP_N_CONNECT_req on A_PORT and waits for
+N_CONNECT_ind on B_PORT. If it is received,
 it sends back an ASP_SCCP_N_CONNECT_res on B_PORT and waits for
 N_CONNECT_cfm on A_PORT)
 ****************************************************/
@@ -327,14 +327,14 @@
   setverdict(none);
   v_cid_A := 13;
   timer TL_timer:= 120.0;
-  TL_timer.start;
-
+  TL_timer.start;
+
   A_PORT.send( t_ASP_N_CONNECT_req( v_CalledAddress,
                                     v_CallingAddress,
                                     omit, //expeditedDataSel
                                     omit, //QoS
                                     omit, //userData
-                                    v_cid_A,
+                                    v_cid_A,
                                     omit //importance
                                     ) );

@@ -345,7 +345,7 @@
         log("f_connect finished successfully");
         return true;
       }
-    [] TL_timer.timeout
+    [] TL_timer.timeout
       {
         setverdict( fail );
         log("Timeout....");
@@ -371,21 +371,21 @@
       {
         setverdict( pass );
         log("f_connect finished successfully");
-    
+
       }
-    [] TL_timer.timeout
+    [] TL_timer.timeout
       {
         setverdict( fail );
         log("Timeout....");
-  
+
       }
-
+
   } //alt
 }//f_send

 //f_disconnect with timeout

-function f_disconnect( ) runs on MTC_CT
+function f_disconnect( ) runs on MTC_CT
 {
   var ASP_SCCP_N_DISCONNECT_ind vl_N_DISCONNECT_ind;
   timer TL_timer:= 25.0;
@@ -393,22 +393,22 @@
   A_PORT.send( t_ASP_N_DISCONNECT_req( omit, // respondingAddress
                                       0,  //reason : end user originated, see 
3.11/Q.713
                                       omit, //userData
-                                      v_cid_A,
+                                      v_cid_A,
                                       omit ))
   alt {
-
+
     [] A_PORT.receive
       {
         repeat;
       }
-    [] TL_timer.timeout
-      { 
+    [] TL_timer.timeout
+      {
         setverdict( pass );
         log("Timeout....");
-      };
+      };
   }//alt
-
- 
+
+
 }//f_disconnect

 //===================================================
@@ -419,17 +419,17 @@
 tc_ConnlessSendingShortASP
 Sends a 300 octet long userdata in one ASP_SCCP_N_UNITDATA_req
 and receives it in one ASP_SCCP_N_UNITDATA_req.
-SCCP transfers information
+SCCP transfers information
 in udp or (forced) xudp packets.
 ****************************************************/
-testcase tc_ConnlessSendingShortASP() runs on MTC_CT
+testcase tc_ConnlessSendingShortASP() runs on MTC_CT
 {
   var octetstring vl_userdata;
   init();
   setAddresses_gti0001();
-  vl_userdata :='12345678901234567890'O;
+  vl_userdata :='12345678901234567890'O;
   f_SendAndReceive1N_UNITDATA( vl_userdata );
-  terminate();
+  terminate();
  } //tc_ConnlessSendingShortASP

 /****************************************************
@@ -437,21 +437,21 @@
  Sends a 300 octet long userdata in one ASP_SCCP_N_UNITDATA_req
  and receives it in one ASP_SCCP_N_UNITDATA_req.
  It is used for segmentation and reassembly.
- SCCP transfers information
-in xudp packets
+ SCCP transfers information
+in xudp packets
 ****************************************************/
 testcase tc_ConnlessSendingLongASP() runs on MTC_CT system system_CT
 {
   var octetstring vl_userdata;
-  var integer vl_i;
+  var integer vl_i;
   init();
   setAddresses_gti0001();
   vl_userdata := ''O;
   for(vl_i:=0;vl_i<30;vl_i:=vl_i+1) {
-    vl_userdata := vl_userdata &'12345678901234567890'O;
+    vl_userdata := vl_userdata &'12345678901234567890'O;
   }
   f_SendAndReceive1N_UNITDATA( vl_userdata );
-  terminate();
+  terminate();
 }//tc_ConnlessSendingLongASP

 /****************************************************
@@ -468,20 +468,20 @@
     f_send(vl_userdata);
     f_disconnect();
   }
-  terminate();
+  terminate();
 }
 /****************************************************
 tc_ConnOrientedLongASPSending
 ****************************************************/
-testcase tc_ConnOrientedLongASPSending() runs on MTC_CT
+testcase tc_ConnOrientedLongASPSending() runs on MTC_CT
 {
   var octetstring vl_userdata;
-  var integer vl_i;
+  var integer vl_i;
   init();
   setAddresses_gti0001();
   vl_userdata := ''O;
   for(vl_i:=0;vl_i<30;vl_i:=vl_i+1) {
-    vl_userdata := vl_userdata &'12345678901234567890'O;
+    vl_userdata := vl_userdata &'12345678901234567890'O;
   }
   if(f_connect())
   {
@@ -489,12 +489,12 @@
     //f_SendAndReceive1N_UNITDATA( vl_userdata );
     f_disconnect();
   }
-  terminate();
+  terminate();
 }
 /****************************************************
  CONTROL
 ****************************************************/
-control
+control
 {
   execute( tc_ConnlessSendingShortASP() );
   execute( tc_ConnlessSendingLongASP() );

--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41425?usp=email
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I17140056c40305a8eb8024df5403897d0853098e
Gerrit-Change-Number: 41425
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>

Reply via email to