WebSVN - DIAMETER / DiameterS9 - Path Comparison

Ignore whitespace Rev 62 → Rev 63

 /trunk/DiameterS9/ttcn/DiameterS9_Steps.ttcn3
 ,6 → 25,7
     import from DiameterS9_Templates all;
     import from DiameterS9_Gxx_Templates all;
     import from DiameterS9_TestConfiguration all;
+    import from DiameterS9_TestSystem all;
     group GlobalSteps {
 ,7 → 37,6
         runs on DiameterComponent {
             //Defaults
-            vc_def_catchSyncStop_diameter := activate(a_diameter_catchSyncStop());
             vc_default_diameter := activate (a_diameter_default());
             //Base LibDiameter init function if there will be any base initialisation
 ,7 → 73,6
         runs on DiameterComponent {
             //Defaults
-            vc_def_catchSyncStop_diameter := activate(a_diameter_catchSyncStop());
             vc_default_diameter := activate (a_diameter_default());
             //Base LibDiameter init function if there will be any base initialisation
 ,7 → 109,6
         runs on DiameterComponent {
             //Defaults
-            vc_def_catchSyncStop_diameter := activate(a_diameter_catchSyncStop());
             vc_default_diameter := activate (a_diameter_default());
             //Base LibDiameter init function if there will be any base initialisation
 ,7 → 145,6
         runs on DiameterComponent {
             //Defaults
-            vc_def_catchSyncStop_diameter := activate(a_diameter_catchSyncStop());
             vc_default_diameter := activate (a_diameter_default());
             //Base LibDiameter init function if there will be any base initialisation
 ,6 → 185,7
             {
                 f_preambleClient();
             }
             f_DiameterS9_init();
             f_preambleDiameterBaseClient(c_applIdS9);
         }
 ,6 → 196,7
             {
                 f_preambleServer();
             }
             f_DiameterS9_init();
             f_preambleDiameterBaseServer(c_applIdS9);
         }
 ,6 → 207,7
             {
                 f_preambleClient();
             }
             f_DiameterGxx1_init();
             f_preambleDiameterBaseClient(c_applIdGxx);
         }
 ,6 → 228,7
             {
                 f_preambleClient();
             }
             f_DiameterGx_init();
             f_preambleDiameterBaseClient(c_applIdGx);
         }
 ,6 → 319,8
                 f_postambleDisconnect();
             }
+            // Deactivate defaults
+            deactivate;
         }
         function f_postamble_HPCRF() runs on DiameterComponent
 ,6 → 333,8
                 f_postambleDisconnect();
             }
+            // Deactivate defaults
+            deactivate;
         }
         function f_postamble_BBERF() runs on DiameterComponent
 ,6 → 345,8
             if(PX_DIAM_LLP_ENABLED)
             {
                 f_postambleDisconnect();
+            // Deactivate defaults
+            deactivate;
             }
         }
 ,6 → 361,8
                 f_postambleDisconnect();
             }
+            // Deactivate defaults
+            deactivate;
         }
         /**
 ,16 → 417,16
         function f_ConfigRun_HPCRF_PCEF(DiameterComponent p_diameterComponent_hpcrf,
                                         DiameterComponent p_diameterComponent_pcef,
-                                        in SyncPointList p_syncPointIds ) runs on ServerSyncComp
+                                        in SyncPointList p_syncPointIds ) runs on DiameterS9
         {
             if (PX_Gxsupport) {
                 // synchronize PTCs on 3 sychronization points
-                f_serverSync2Clients(p_syncPointIds);
+                f_serverSync2ClientsAndStop(p_syncPointIds);
                 f_cf_1S9_1Gx_hpcrfDown(p_diameterComponent_hpcrf,
                                        p_diameterComponent_pcef);
             } else {
                 // synchronize single PTC on 3 sychronization points
-                f_serverSync1Client(p_syncPointIds);
+                f_serverSyncNClientsAndStop(f_NrofComps(), p_syncPointIds);
                 f_cf_1S9_hpcrfDown(p_diameterComponent_hpcrf);
             }
         }
 ,16 → 464,16
         function f_ConfigRun_HPCRF_BBERF(DiameterComponent p_diameterComponent_hpcrf,
                                          DiameterComponent p_diameterComponent_bberf,
-                                         in SyncPointList p_syncPointIds ) runs on ServerSyncComp
+                                         in SyncPointList p_syncPointIds ) runs on DiameterS9
         {
             if (PX_Gxxsupport) {
                 // synchronize PTCs on 3 sychronization points
-                f_serverSync2Clients(p_syncPointIds );
+                f_serverSync2ClientsAndStop(p_syncPointIds );
                 f_cf_1S9_1Gxx_hpcrfDown(p_diameterComponent_hpcrf,
                                         p_diameterComponent_bberf);
             } else {
                 // synchronize single PTC on 3 sychronization points
-                f_serverSync1Client(p_syncPointIds );
+                f_serverSyncNClientsAndStop(f_NrofComps(), p_syncPointIds );
                 f_cf_1S9_hpcrfDown(p_diameterComponent_hpcrf);
             }
         }
 ,17 → 481,17
         function f_ConfigRun_HPCRF_2BBERF(DiameterComponent p_diameterComponent_hpcrf,
                                           DiameterComponent p_diameterComponent_bberf1,
                                           DiameterComponent p_diameterComponent_bberf2,
-                                          in SyncPointList p_syncPointIds ) runs on ServerSyncComp
+                                          in SyncPointList p_syncPointIds ) runs on DiameterS9
         {
             if (PX_Gxxsupport) {
                 // synchronize PTCs on 3 sychronization points
-                f_serverSync3Clients(p_syncPointIds);
+                f_serverSync3ClientsAndStop(p_syncPointIds);
                 f_cf_1S9_2Gxx_hpcrfDown(p_diameterComponent_hpcrf,
                                         p_diameterComponent_bberf1,
                                         p_diameterComponent_bberf2);
             } else {
                 // synchronize single PTC on 3 sychronization points
-                f_serverSync1Client(p_syncPointIds);
+                f_serverSyncNClientsAndStop(f_NrofComps(), p_syncPointIds);
                 f_cf_1S9_hpcrfDown(p_diameterComponent_hpcrf);
             }
         }

 /trunk/DiameterS9/ttcn/DiameterS9_TestCases.ttcn
 ,7 → 1,7
 /**
- *      @author         STF 466
+ *    @author     STF 466
  *  @version    $Id$
- *      @desc           This module provides test cases
+ *    @desc        This module provides test cases
  *              for SIP-IMS-S9-DIAMETER tests.
  */
 ,7 → 21,8
     //import from DiameterS9_PICS all;
     import from DiameterS9_PIXITS all;
     import from DiameterS9_Steps all;
+    import from DiameterS9_TestSystem all;
     group TP_HPCRFRole {
         group TP_HPCRFRole_MS { //S9 message syntax
             /*
 ,7 → 29,7
             * @desc TC_HPCRF_MS_01
             */
             testcase TC_HPCRF_MS_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 39,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_MS_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_MS_01
 ,7 → 52,7
             * @desc TC_HPCRF_HSE_01
             */
             testcase TC_HPCRF_HSE_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 62,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HSE_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HSE_01
 ,7 → 71,7
             * @desc TC_HPCRF_HSE_02
             */
             testcase TC_HPCRF_HSE_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 81,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HSE_02());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HSE_02
 ,7 → 94,7
             * @desc TC_HPCRF_HSM_01
             */
             testcase TC_HPCRF_HSM_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 104,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HSM_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HSM_01
 ,7 → 113,7
             * @desc TC_HPCRF_HSM_02
             */
             testcase TC_HPCRF_HSM_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 123,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HSM_02());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HSM_02
 ,7 → 132,7
             * @desc TC_HPCRF_HSM_03
             */
             testcase TC_HPCRF_HSM_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 142,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HSM_03());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HSM_03
 ,7 → 151,7
             * @desc TC_HPCRF_HSM_04
             */
             testcase TC_HPCRF_HSM_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 161,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HSM_04());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HSM_04
 ,7 → 174,7
             * @desc TC_HPCRF_HPQ_01
             */
             testcase TC_HPCRF_HPQ_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 184,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HPQ_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HPQ_01
 ,7 → 193,7
             * @desc TC_HPCRF_HPQ_02
             */
             testcase TC_HPCRF_HPQ_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 203,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HPQ_02());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HPQ_02
 ,7 → 216,7
             * @desc TC_HPCRF_HST_01
             */
             testcase TC_HPCRF_HST_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 226,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HST_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HST_01
 ,7 → 235,7
             * @desc TC_HPCRF_HST_02
             */
             testcase TC_HPCRF_HST_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 245,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HST_02());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HST_02
 ,7 → 254,7
             * @desc TC_HPCRF_HST_03
             */
             testcase TC_HPCRF_HST_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 264,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HST_03());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HST_03
 ,7 → 273,7
             * @desc TC_HPCRF_HST_04
             */
             testcase TC_HPCRF_HST_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 283,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HST_04());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HST_04
 ,7 → 296,7
             * @desc TC_HPCRF_HBM_01
             */
             testcase TC_HPCRF_HMB_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 306,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HMB_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HMB_01
 ,7 → 315,7
             * @desc TC_HPCRF_HMB_02
             */
             testcase TC_HPCRF_HMB_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 325,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HMB_02());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HMB_02
 ,7 → 334,7
             * @desc TC_HPCRF_HMB_03
             */
             testcase TC_HPCRF_HMB_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 344,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HMB_03());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HMB_03
 ,7 → 353,7
             * @desc TC_HPCRF_HMB_04
             */
             testcase TC_HPCRF_HMB_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 363,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HMB_04());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HMB_04
 ,7 → 372,7
             * @desc TC_HPCRF_HMB_05
             */
             testcase TC_HPCRF_HMB_05()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 382,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HMB_05());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HMB_05
 ,7 → 391,7
             * @desc TC_HPCRF_HMB_06
             */
             testcase TC_HPCRF_HMB_06()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 401,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HMB_06());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HMB_06
 ,7 → 410,7
             * @desc TC_HPCRF_HMB_07
             */
             testcase TC_HPCRF_HMB_07()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 420,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_HMB_07());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_HMB_07
 ,7 → 433,7
             * @desc TC_HPCRF_VQR_01
             */
             testcase TC_HPCRF_VQR_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 443,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VQR_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VQR_01
 ,7 → 452,7
             * @desc TC_HPCRF_VQR_02
             */
             testcase TC_HPCRF_VQR_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 462,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VQR_02());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VQR_02
 ,7 → 471,7
             * @desc TC_HPCRF_VQR_03
             */
             testcase TC_HPCRF_VQR_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 481,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VQR_03());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VQR_03
 ,7 → 490,7
             * @desc TC_HPCRF_VQR_04
             */
             testcase TC_HPCRF_VQR_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 500,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VQR_04());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VQR_04
 ,7 → 512,7
             * @desc TC_HPCRF_VPQ_01
             */
             testcase TC_HPCRF_VPQ_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 522,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VPQ_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VPQ_01
 ,7 → 531,7
             * @desc TC_HPCRF_VPQ_02
             */
             testcase TC_HPCRF_VPQ_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 541,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VPQ_02());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VPQ_02
 ,7 → 550,7
             * @desc TC_HPCRF_VPQ_03
             */
             testcase TC_HPCRF_VPQ_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 560,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VPQ_03());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VPQ_03
 ,7 → 569,7
             * @desc TC_HPCRF_VPQ_04
             */
             testcase TC_HPCRF_VPQ_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 579,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VPQ_04());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VPQ_04
 ,7 → 588,7
             * @desc TC_HPCRF_VPQ_05
             */
             testcase TC_HPCRF_VPQ_05()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 598,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VPQ_05());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VPQ_05
 ,7 → 611,7
             * @desc TC_HPCRF_VST_01
             */
             testcase TC_HPCRF_VST_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 621,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VST_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VST_01
 ,7 → 630,7
             * @desc TC_HPCRF_VST_02
             */
             testcase TC_HPCRF_VST_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 640,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VST_02());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VST_02
 ,7 → 649,7
             * @desc TC_HPCRF_VST_03
             */
             testcase TC_HPCRF_VST_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 659,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VST_03());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VST_03
 ,7 → 668,7
             * @desc TC_HPCRF_VST_04
             */
             testcase TC_HPCRF_VST_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 //Variables
                 var DiameterComponent v_diameterComponent_vpcrf;
 ,7 → 678,7
                 v_diameterComponent_vpcrf.start(f_TC_HPCRF_VST_04());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_vpcrfDown(v_diameterComponent_vpcrf);
             } // end TC_HPCRF_VST_04
 ,13 → 688,13
     } //end group TP_HPCRFRole
     group TP_VPCRFRole {
-        group TP_VPCRFRole_MS {
+        group TP_VPCRFRole_MS {
             /*
             * @desc TC_VPCRF_MS_01
             */
             testcase TC_VPCRF_MS_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 706,7
                 v_diameterComponent_hpcrf.start(f_TC_VPCRF_MS_01());
                 // synchronize PTC on 3 sychronization points
-                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});
+                f_serverSyncNClientsAndStop(f_NrofComps(), {c_prDone, c_tbDone, c_poDone});
                 f_cf_1S9_hpcrfDown(v_diameterComponent_hpcrf);
 ,13 → 713,13
             } // end TC_VPCEF_MS_01
         }//end group TP_VPCRFRole_MS
-        group TP_VPCRFRole_HSE {
+        group TP_VPCRFRole_HSE {
             /*
             * @desc TC_VPCRF_HSE_01
             */
             testcase TC_VPCRF_HSE_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 744,7
             * @desc TC_VPCRF_HSE_02
             */
             testcase TC_VPCRF_HSE_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,13 → 766,13
             } // end TC_VPCEF_HSE_02
         }//end group TP_VPCRFRole_HSE
-        group TP_VPCRFRole_HSM {
+        group TP_VPCRFRole_HSM {
             /*
             * @desc TC_VPCRF_HSM_01
             */
             testcase TC_VPCRF_HSM_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 797,7
             * @desc TC_VPCRF_HSM_02
             */
             testcase TC_VPCRF_HSM_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 822,7
             * @desc TC_VPCRF_HSM_03
             */
             testcase TC_VPCRF_HSM_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 847,7
             * @desc TC_VPCRF_HSM_04
             */
             testcase TC_VPCRF_HSM_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 875,7
             * @desc TC_VPCRF_HPQ_01
             */
             testcase TC_VPCRF_HPQ_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 900,7
             * @desc TC_VPCRF_HPQ_02
             */
             testcase TC_VPCRF_HPQ_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 925,7
             * @desc TC_VPCRF_HPQ_03
             */
             testcase TC_VPCRF_HPQ_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 950,7
             * @desc TC_VPCRF_HPQ_04
             */
             testcase TC_VPCRF_HPQ_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,13 → 972,13
             } // end TC_VPCEF_HPQ_04
         }//end group TP_VPCRFRole_HPQ
-        group TP_VPCRFRole_HST {
+        group TP_VPCRFRole_HST {
             /*
             * @desc TC_VPCRF_HST_01
             */
             testcase TC_VPCRF_HST_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1003,7
             * @desc TC_VPCRF_HST_02
             */
             testcase TC_VPCRF_HST_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1028,7
             * @desc TC_VPCRF_HST_03
             */
             testcase TC_VPCRF_HST_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1053,7
             * @desc TC_VPCRF_HST_04
             */
             testcase TC_VPCRF_HST_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1081,7
             * @desc TC_VPCRF_HMB_01
             */
             testcase TC_VPCRF_HMB_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1108,7
             * @desc TC_VPCRF_HMB_02
             */
             testcase TC_VPCRF_HMB_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1135,7
             * @desc TC_VPCRF_HMB_03
             */
             testcase TC_VPCRF_HMB_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1162,7
             * @desc TC_VPCRF_HMB_04
             */
             testcase TC_VPCRF_HMB_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1189,7
             * @desc TC_VPCRF_HMB_05
             */
             testcase TC_VPCRF_HMB_05()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1216,7
             * @desc TC_VPCRF_HMB_06
             */
             testcase TC_VPCRF_HMB_06()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1243,7
             * @desc TC_VPCRF_HMB_07
             */
             testcase TC_VPCRF_HMB_07()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1274,7
             * @desc TC_VPCRF_HDS_01
             */
             testcase TC_VPCRF_HDS_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1304,7
             * @desc TC_VPCRF_HSL_01
             */
             testcase TC_VPCRF_HSL_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1334,7
             * @desc TC_VPCRF_VQR_01
             */
             testcase TC_VPCRF_VQR_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1359,7
             * @desc TC_VPCRF_VQR_02
             */
             testcase TC_VPCRF_VQR_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1384,7
             * @desc TC_VPCRF_VQR_03
             */
             testcase TC_VPCRF_VQR_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1409,7
             * @desc TC_VPCRF_VQR_04
             */
             testcase TC_VPCRF_VQR_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1434,7
             * @desc TC_VPCRF_VQR_05
             */
             testcase TC_VPCRF_VQR_05()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1459,7
             * @desc TC_VPCRF_VQR_06
             */
             testcase TC_VPCRF_VQR_06()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1488,7
             * @desc TC_VPCRF_VPQ_01
             */
             testcase TC_VPCRF_VPQ_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1513,7
             * @desc TC_VPCRF_VPQ_02
             */
             testcase TC_VPCRF_VPQ_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1541,7
             * @desc TC_VPCRF_VST_01
             */
             testcase TC_VPCRF_VST_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1566,7
             * @desc TC_VPCRF_VST_02
             */
             testcase TC_VPCRF_VST_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1591,7
             * @desc TC_VPCRF_VST_03
             */
             testcase TC_VPCRF_VST_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1616,7
             * @desc TC_VPCRF_VST_04
             */
             testcase TC_VPCRF_VST_04()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1641,7
             * @desc TC_VPCRF_VST_05
             */
             testcase TC_VPCRF_VST_05()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1670,7
             * @desc TC_VPCRF_VMB_01
             */
             testcase TC_VPCRF_VMB_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1695,7
             * @desc TC_VPCRF_VMB_02
             */
             testcase TC_VPCRF_VMB_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1725,7
             * @desc TC_VPCRF_VDS_01
             */
             testcase TC_VPCRF_VDS_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1751,7
             * @desc TC_VPCRF_VDS_02
             */
             testcase TC_VPCRF_VDS_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1776,7
             * @desc TC_VPCRF_VDS_03
             */
             testcase TC_VPCRF_VDS_03()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1806,7
             * @desc TC_VPCRF_VSL_01
             */
             testcase TC_VPCRF_VSL_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1836,7
             * @desc TC_VPCRF_VIF_01
             */
             testcase TC_VPCRF_VIF_01()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize
 ,7 → 1862,7
             * @desc TC_VPCRF_VIF_02
             */
             testcase TC_VPCRF_VIF_02()
-            runs on ServerSyncComp
+            runs on DiameterS9
             system TestAdapter {
                 // Initialize

 /trunk/DiameterS9/ttcn/DiameterS9_TestConfiguration.ttcn
 ,7 → 1,7
 /**
- *      @author         STF 466
+ *    @author     STF 466
  *  @version    $Id$
- *      @desc           This module provides test component configurations
+ *    @desc        This module provides test component configurations
  *              for DIAMETER tests.
  */
 ,40 → 8,39
 module DiameterS9_TestConfiguration
 {
     //LibCommon
-    import from LibCommon_Sync {type ServerSyncComp,SyncPointList;
-                                modulepar PX_TSYNC_TIME_LIMIT;
-                                function f_serverWaitForAllClientsToStop, f_serverSyncClientsTimed;} ;
+    import from LibCommon_Sync all;
     import from LibCommon_VerdictControl {type FncRetCode;
                                           function f_setVerdict;}
+    import from LibCommon_BasicTypesAndValues { type UInt };
     //LibDiameter
     import from LibDiameter_Interface all;
     import from LibDiameter_PIXITS {modulepar PX_DIAM_LLP_ENABLED;};
-        //AtsIms
-        import from DiameterS9_TestSystem all;
-        import from DiameterS9_PIXITS {modulepar PX_Gxsupport,PX_Gxxsupport;};
+    //AtsIms
+    import from DiameterS9_TestSystem all;
+    import from DiameterS9_PIXITS {modulepar PX_Gxsupport,PX_Gxxsupport;};
-        /*
-        ** @desc f_NrofComps returns the number of test components
-        ** based on the PIXIT value PX_Rxsupportt
-        */
-        function f_NrofComps() return integer
-                {       if (PX_Gxsupport or PX_Gxxsupport)
-                        { return 2 }
-                        else
-                        { return 1 }
-                };
-        // end f_NrofComps
+    /*
+    ** @desc f_NrofComps returns the number of test components
+    ** based on the PIXIT value PX_Rxsupportt
+    */
+    function f_NrofComps() return UInt
+        {    if (PX_Gxsupport or PX_Gxxsupport)
+            { return 2 }
+            else
+            { return 1 }
+        };
+    // end f_NrofComps
-        group cfUp {
+    group cfUp {
         /**
          *
          * @desc Creates test configuration of cf_1S9_vpcrf - H-PCRF is SUT
-         * @param p_diameterComponent_vpcrf     v-pcrf component
+         * @param p_diameterComponent_vpcrf    v-pcrf component
          */
         function f_cf_1S9_vpcrfUp(out DiameterComponent p_diameterComponent_vpcrf)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
             //Variables
             var FncRetCode v_ret := e_success;
 ,14 → 48,18
             //Create
             p_diameterComponent_vpcrf := DiameterComponent.create ;
-            //Connect
+            // Connect mtc sync port
+            connect(self:syncPort, self:syncPort);
+            // Connect client sync port
             connect(p_diameterComponent_vpcrf:syncPort, self:syncPort) ;
             //Map
             map(p_diameterComponent_vpcrf:DIAMP, system:V_PCRF_S9);// Diameter Init test Configuration
             if (PX_DIAM_LLP_ENABLED){
-                map(p_diameterComponent_vpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
+                map(p_diameterComponent_vpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
             }
+            activate(a_mtc_shutdown());
             f_setVerdict(v_ret);
         }//end f_cf_1S9_vpcrfUp
 ,10 → 66,10
         /**
          *
          * @desc Creates test configuration of CF_1S9_ - V-PCRF is SUT
-         * @param p_diameterComponent_hpcrf     h-pcrf component
+         * @param p_diameterComponent_hpcrf    h-pcrf component
          */
         function f_cf_1S9_hpcrfUp(out DiameterComponent p_diameterComponent_hpcrf)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
             //Variables
             var FncRetCode v_ret := e_success;
 ,15 → 77,18
             //Create
             p_diameterComponent_hpcrf := DiameterComponent.create ;
-            //Connect
+            // Connect mtc sync port
+            connect(self:syncPort, self:syncPort);
+            // Connect client sync port
             connect(p_diameterComponent_hpcrf:syncPort, self:syncPort) ;
             //Map
             map(p_diameterComponent_hpcrf:DIAMP, system:H_PCRF_S9);// Diameter Init test Configuration
             if (PX_DIAM_LLP_ENABLED){
-                map(p_diameterComponent_hpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
+                map(p_diameterComponent_hpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
             }
+            activate(a_mtc_shutdown());
             f_setVerdict(v_ret);
         }//end f_cf_1S9_hpcrfUp
 ,11 → 95,11
         /**
          *
          * @desc Creates test configuration of CF_1S9_1Gx - V-PCRF is SUT
-         * @param p_diameterComponent_hpcrf     h-pcef component
-         * @param p_diameterComponent_pcef      pcef component
+         * @param p_diameterComponent_hpcrf    h-pcef component
+         * @param p_diameterComponent_pcef    pcef component
          */
         function f_cf_1S9_1Gx_hpcrfUp(out DiameterComponent p_diameterComponent_hpcrf, out DiameterComponent p_diameterComponent_pcef)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
             //Variables
             var FncRetCode v_ret := e_success;
 ,23 → 107,27
             //Create
             p_diameterComponent_hpcrf := DiameterComponent.create ;
             if (PX_Gxsupport) {
-                    p_diameterComponent_pcef := DiameterComponent.create ;
+                p_diameterComponent_pcef := DiameterComponent.create ;
             }
-            //Connect
+            // Connect mtc sync port
+            connect(self:syncPort, self:syncPort);
+            // Connect client sync port
             connect(p_diameterComponent_hpcrf:syncPort, self:syncPort) ;
             if (PX_Gxsupport) {
-                    connect(p_diameterComponent_pcef:syncPort, self:syncPort) ;
+                connect(p_diameterComponent_pcef:syncPort, self:syncPort) ;
             }
             //Map
             map(p_diameterComponent_hpcrf:DIAMP, system:H_PCRF_S9);// Diameter Init test Configuration
             if (PX_Gxsupport) {
-                    map(p_diameterComponent_pcef:DIAMP, system:PCEF_Gx);// Diameter Init test Configuration
+                map(p_diameterComponent_pcef:DIAMP, system:PCEF_Gx);// Diameter Init test Configuration
             }
             if (PX_DIAM_LLP_ENABLED){
-                map(p_diameterComponent_hpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
-                map(p_diameterComponent_pcef:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
+                map(p_diameterComponent_hpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
+                map(p_diameterComponent_pcef:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
             }
+            activate(a_mtc_shutdown());
             f_setVerdict(v_ret);
         }//end f_cf_1S9_1Gx_hpcrfUp
 ,31 → 138,34
          * @param p_diameterComponent_bberf bberf component
          */
         function f_cf_1S9_1Gxx_hpcrfUp(out DiameterComponent p_diameterComponent_hpcrf, out DiameterComponent p_diameterComponent_bberf)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
             //Variables
             var FncRetCode v_ret := e_success;
             //Create
-            p_diameterComponent_hpcrf := DiameterComponent.create ;
             if (PX_Gxxsupport) {
                 p_diameterComponent_bberf := DiameterComponent.create ;
             }
-            //Connect
+            // Connect mtc sync port
+            connect(self:syncPort, self:syncPort);
+            // Connect client sync port
             connect(p_diameterComponent_hpcrf:syncPort, self:syncPort) ;
             if (PX_Gxxsupport) {
-                    connect(p_diameterComponent_bberf:syncPort, self:syncPort) ;
+                connect(p_diameterComponent_bberf:syncPort, self:syncPort) ;
             }
             //Map
             map(p_diameterComponent_hpcrf:DIAMP, system:H_PCRF_S9);// Diameter Init test Configuration
             if (PX_Gxxsupport) {
-                    map(p_diameterComponent_bberf:DIAMP, system:BBERF_Gxx);// Diameter Init test Configuration
+                map(p_diameterComponent_bberf:DIAMP, system:BBERF_Gxx);// Diameter Init test Configuration
             }
             if (PX_DIAM_LLP_ENABLED){
-                map(p_diameterComponent_hpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
-                map(p_diameterComponent_bberf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
+                map(p_diameterComponent_hpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
+                map(p_diameterComponent_bberf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
             }
+            activate(a_mtc_shutdown());
             f_setVerdict(v_ret);
         }//end f_cf_1S9_1Gxx_hpcrfUp
 ,7 → 177,7
          * @param p_diameterComponent_bberf2 bberf2 represents new bberf component
          */
         function f_cf_1S9_2Gxx_hpcrfUp(out DiameterComponent p_diameterComponent_hpcrf, out DiameterComponent p_diameterComponent_bberf1, out DiameterComponent p_diameterComponent_bberf2)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
             //Variables
             var FncRetCode v_ret := e_success;
 ,30 → 188,34
                 p_diameterComponent_bberf1 := DiameterComponent.create ;
                 p_diameterComponent_bberf2 := DiameterComponent.create ;
             }
-            //Connect
+            // Connect mtc sync port
+            connect(self:syncPort, self:syncPort);
+            // Connect client sync port
             connect(p_diameterComponent_hpcrf:syncPort, self:syncPort) ;
             if (PX_Gxxsupport) {
-                    connect(p_diameterComponent_bberf1:syncPort, self:syncPort) ;
+                connect(p_diameterComponent_bberf1:syncPort, self:syncPort) ;
                 connect(p_diameterComponent_bberf2:syncPort, self:syncPort) ;
             }
             //Map
             map(p_diameterComponent_hpcrf:DIAMP, system:H_PCRF_S9);// Diameter Init test Configuration
             if (PX_Gxxsupport) {
-                    map(p_diameterComponent_bberf1:DIAMP, system:BBERF_Gxx1);// Diameter Init test Configuration
+                map(p_diameterComponent_bberf1:DIAMP, system:BBERF_Gxx1);// Diameter Init test Configuration
                 map(p_diameterComponent_bberf2:DIAMP, system:BBERF_Gxx2);// Diameter Init test Configuration
             }
             if (PX_DIAM_LLP_ENABLED){
-                map(p_diameterComponent_hpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
-                map(p_diameterComponent_bberf1:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
+                map(p_diameterComponent_hpcrf:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
+                map(p_diameterComponent_bberf1:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
                 map(p_diameterComponent_bberf2:LLPP, system:LLIMS);// Lower Layer Primitive Init test Configuration
             }
+            activate(a_mtc_shutdown());
             f_setVerdict(v_ret);
         }//end f_cf_1S9_2Gxx_hpcrfUp
-        }//end group cfUp
+    }//end group cfUp
-        group cfDown {
+    group cfDown {
         /**
         *
 ,16 → 223,16
         * @param p_diameterComponent_vpcrf diameter component
         */
         function f_cf_1S9_vpcrfDown(in DiameterComponent p_diameterComponent_vpcrf)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
-            f_serverWaitForAllClientsToStop();
+            deactivate;
             //Disconnect
             disconnect(p_diameterComponent_vpcrf:syncPort, self:syncPort);
             //Unmap
             unmap(p_diameterComponent_vpcrf:DIAMP, system:V_PCRF_S9);
             if (PX_DIAM_LLP_ENABLED){
-                unmap(p_diameterComponent_vpcrf:LLPP, system:LLIMS);
+                unmap(p_diameterComponent_vpcrf:LLPP, system:LLIMS);
             }
         }//end f_cf_1S9_vpcrfDown
 ,10 → 242,10
         * @param p_diameterComponent_hpcrf diameter component
         */
         function f_cf_1S9_hpcrfDown(in DiameterComponent p_diameterComponent_hpcrf)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
-            f_serverWaitForAllClientsToStop();
+            deactivate;
             //Disconnect
             disconnect(p_diameterComponent_hpcrf:syncPort, self:syncPort);
 ,8 → 252,9
             //Unmap
             unmap(p_diameterComponent_hpcrf:DIAMP, system:H_PCRF_S9);
             if (PX_DIAM_LLP_ENABLED){
-                unmap(p_diameterComponent_hpcrf:LLPP, system:LLIMS);
+                unmap(p_diameterComponent_hpcrf:LLPP, system:LLIMS);
             }
         }//end f_cf_1S9_hpcrfDown
         /**
 ,24 → 264,25
         * @param p_diameterComponent_pcef diameter component
         */
         function f_cf_1S9_1Gx_hpcrfDown(in DiameterComponent p_diameterComponent_hpcrf, in DiameterComponent p_diameterComponent_pcef)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
-            f_serverWaitForAllClientsToStop();
+            deactivate;
             //Disconnect
             disconnect(p_diameterComponent_hpcrf:syncPort, self:syncPort);
             if (PX_Gxsupport) {
-                    disconnect(p_diameterComponent_pcef:syncPort, self:syncPort);
+                disconnect(p_diameterComponent_pcef:syncPort, self:syncPort);
             }
             //Unmap
             unmap(p_diameterComponent_hpcrf:DIAMP, system:H_PCRF_S9);
             if (PX_Gxsupport) {
-                    unmap(p_diameterComponent_pcef:DIAMP, system:PCEF_Gx);
+                unmap(p_diameterComponent_pcef:DIAMP, system:PCEF_Gx);
             }
             if (PX_DIAM_LLP_ENABLED){
-                unmap(p_diameterComponent_hpcrf:LLPP, system:LLIMS);
-                unmap(p_diameterComponent_pcef:LLPP, system:LLIMS);
+                unmap(p_diameterComponent_hpcrf:LLPP, system:LLIMS);
+                unmap(p_diameterComponent_pcef:LLPP, system:LLIMS);
             }
         }//end f_cf_1S9_1Gx_hpcrfDown
         /**
 ,24 → 292,25
         * @param p_diameterComponent_bberf diameter component
         */
         function f_cf_1S9_1Gxx_hpcrfDown(in DiameterComponent p_diameterComponent_hpcrf, in DiameterComponent p_diameterComponent_bberf)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
-            f_serverWaitForAllClientsToStop();
+            deactivate;
             //Disconnect
             disconnect(p_diameterComponent_hpcrf:syncPort, self:syncPort);
             if (PX_Gxxsupport) {
-                    disconnect(p_diameterComponent_bberf:syncPort, self:syncPort);
+                disconnect(p_diameterComponent_bberf:syncPort, self:syncPort);
             }
             //Unmap
             unmap(p_diameterComponent_hpcrf:DIAMP, system:H_PCRF_S9);
             if (PX_Gxxsupport) {
-                    unmap(p_diameterComponent_bberf:DIAMP, system:BBERF_Gxx);
+                unmap(p_diameterComponent_bberf:DIAMP, system:BBERF_Gxx);
             }
             if (PX_DIAM_LLP_ENABLED){
-                unmap(p_diameterComponent_hpcrf:LLPP, system:LLIMS);
-                unmap(p_diameterComponent_bberf:LLPP, system:LLIMS);
+                unmap(p_diameterComponent_hpcrf:LLPP, system:LLIMS);
+                unmap(p_diameterComponent_bberf:LLPP, system:LLIMS);
             }
         }//end f_cf_1S9_1Gxx_hpcrfDown
         /**
 ,123 → 320,42
         * @param p_diameterComponent_bberf diameter component
         */
         function f_cf_1S9_2Gxx_hpcrfDown(in DiameterComponent p_diameterComponent_hpcrf, in DiameterComponent p_diameterComponent_bberf1, in DiameterComponent p_diameterComponent_bberf2)
-        runs on ServerSyncComp
+        runs on DiameterS9
         {
-            f_serverWaitForAllClientsToStop();
+            deactivate;
             //Disconnect
             disconnect(p_diameterComponent_hpcrf:syncPort, self:syncPort);
             if (PX_Gxxsupport) {
-                    disconnect(p_diameterComponent_bberf1:syncPort, self:syncPort);
+                disconnect(p_diameterComponent_bberf1:syncPort, self:syncPort);
                 disconnect(p_diameterComponent_bberf2:syncPort, self:syncPort);
             }
             //Unmap
             unmap(p_diameterComponent_hpcrf:DIAMP, system:H_PCRF_S9);
             if (PX_Gxxsupport) {
-                    unmap(p_diameterComponent_bberf1:DIAMP, system:BBERF_Gxx1);
+                unmap(p_diameterComponent_bberf1:DIAMP, system:BBERF_Gxx1);
                 unmap(p_diameterComponent_bberf2:DIAMP, system:BBERF_Gxx2);
             }
             if (PX_DIAM_LLP_ENABLED){
-                unmap(p_diameterComponent_hpcrf:LLPP, system:LLIMS);
-                unmap(p_diameterComponent_bberf1:LLPP, system:LLIMS);
+                unmap(p_diameterComponent_hpcrf:LLPP, system:LLIMS);
+                unmap(p_diameterComponent_bberf1:LLPP, system:LLIMS);
                 unmap(p_diameterComponent_bberf2:LLPP, system:LLIMS);
             }
         }//end f_cf_1S9_2Gxx_hpcrfDown
-        } //end group cfDown
+    } //end group cfDown
-        group syncNoStop // Same functions as in LibCommon but without call of f_serverWaitForAllClientsToStop()
-        {
-        /**
-         * @desc   Implements synchronization of N clients from server side
-         *         on one or more synchronization points.
-         *         If problem occurs, then server sends STOP to all clients.
-         *         Waits for PX_TSYNC_TIME_LIMIT to let clients
-         *         finish executing their behavior until this
-         *         synchronization point. After passing all synchronization
-         *         points successfuly the server waits for all clients
-         *         to stop.
-         *         See f_serverSyncClientsTimed for overwriting this
-         *         the timing constraint!
-         *         This function sets the server component verdict.
-         * @remark The use of this function requires prior connection  of
-         *         the server sync ports!
-         * @see    LibCommon_Sync.f_connect4SelfOrClientSync
-         * @see    LibCommon_Sync.PX_TSYNC_TIME_LIMIT
-         * @see    LibCommon_Sync.f_serverSyncClientsTimed
-         * @see    LibCommon_Sync.f_serverWaitForAllClientsToStop
-         * @param  p_numClients number of synchronization clients
-         * @param  p_syncPointIds list of synchronization point name/ids
-         */
-        function f_serverSyncNClients (
-          in integer p_numClients,
-          in SyncPointList p_syncPointIds )
-        runs on ServerSyncComp {
-          var integer i, v_noOfSyncIds := lengthof(p_syncPointIds);
-          for ( i := 0; i < v_noOfSyncIds; i := i+1 ) {
-            f_serverSyncClientsTimed (
-              p_numClients,
-              p_syncPointIds[i],
-              PX_TSYNC_TIME_LIMIT );
-          }
+    group shutDownAltsteps {
+        altstep a_mtc_shutdown()
+        runs on SelfSyncComp {
+          []  syncSendPort.receive(m_syncServerStop){
+              tc_sync.stop ;
+              log("**** a_mtc_shutdown: MTC component received STOP signal **** ");
+            }
         }
-        /* @desc        Implements synchronization of client from server side
-         *          on one or more synchronization points.
-         *                      If problem occurs, then server sends STOP to client.
-         *                      Waits for PX_TSYNC_TIME_LIMIT to let client
-         *                      finish executing behavior until this
-         *                      synchronization point.
-         * @remark      The use of this function requires prior connection  of
-         *                      the server sync ports!
-         * @param   p_syncPointIds list of synchronization point name/ids
-         * @return  execution status
-         */
-        function f_serverSync1Client( in SyncPointList p_syncPointIds )
-        runs on ServerSyncComp {
-                var integer i, v_noOfSyncIds := lengthof(p_syncPointIds);
-                for ( i := 0; i < v_noOfSyncIds; i := i+1 ) {
-                        f_serverSyncClientsTimed(1,p_syncPointIds[i], PX_TSYNC_TIME_LIMIT);
-                }
-        }
-    /* @desc    Implements synchronization of 2 clients from server side
-     *          on one or more synchronization points.
-     *                  If problem occurs, then server sends STOP to all clients.
-     *                  Waits for PX_TSYNC_TIME_LIMIT to let clients
-     *                  finish executing their behavior until this
-     *                  synchronization point.
-     * @remark  The use of this function requires prior connection  of
-     *                  the server sync ports!
-     * @param   p_syncPointIds list of synchronization point name/ids
-     * @return  execution status
-     */
-    function f_serverSync2Clients( in SyncPointList p_syncPointIds )
-    runs on ServerSyncComp {
-        var integer i, v_noOfSyncIds := sizeof(p_syncPointIds);
-        for ( i := 0; i < v_noOfSyncIds; i := i+1 ) {
-            f_serverSyncClientsTimed(2,p_syncPointIds[i], PX_TSYNC_TIME_LIMIT);
-        }
-    }
-    /* @desc    Implements synchronization of 3 clients from server side
-     *          on one or more synchronization points.
-     *                  If problem occurs, then server sends STOP to all clients.
-     *                  Waits for PX_TSYNC_TIME_LIMIT to let clients
-     *                  finish executing their behavior until this
-     *                  synchronization point.
-     * @remark  The use of this function requires prior connection  of
-     *                  the server sync ports!
-     * @param   p_syncPointIds list of synchronization point name/ids
-     * @return  execution status
-     */
-    function f_serverSync3Clients( in SyncPointList p_syncPointIds )
-    runs on ServerSyncComp {
-        var integer i, v_noOfSyncIds := sizeof(p_syncPointIds);
-        for ( i := 0; i < v_noOfSyncIds; i := i+1 ) {
-            f_serverSyncClientsTimed(3,p_syncPointIds[i], PX_TSYNC_TIME_LIMIT);
-        }
-    }
-        } //end group syncNoStop
+    } // end group shutDownAltsteps
 } // end module DiameterS9_TestConfiguration

 /trunk/DiameterS9/ttcn/DiameterS9_TestSystem.ttcn
 ,6 → 7,9
 module DiameterS9_TestSystem {
+    // LibCommon
+    import from LibCommon_Sync all;
     //LibDiameter
     import from LibDiameter_Interface {type DiameterPort;};
 ,6 → 28,10
             }
         } // end Group TestSystemInterfaces
+        type component DiameterS9 extends ServerSyncComp, SelfSyncComp {
+        } // End of component DiameterS9
       }// end group TestComponents
     } //end group SystemConfiguration
 } // end module DiameterS9_TestSystem

/trunk
Property changes:
Modified: svn:externals
## -1,4 +1,4 ##
-^/../LibCommon/tags/v1.3.0 LibCommon
-^/../LibIms/tags/v1.8.0 LibIms
-^/../LibSip/tags/v1.8.0 LibSip
-^/../LibDiameter/trunk LibDiameter
+^/../LibCommon/tags/v1.4.0 LibCommon
+^/../LibIms/tags/v1.8.0 LibIms
+^/../LibSip/tags/v1.8.0 LibSip
+^/../LibDiameter/trunk LibDiameter

ETSI Repository

Compare Revisions

Ignore whitespace Rev 62 → Rev 63