Commit 2bf8db5b authored by garciay's avatar garciay
Browse files

Add Insert Subscriber Data TCs for both MME and HSS

Re-organize the DiameterS6a_TestConfiguration
Remove Gx-Rx references
Support of MTC/PTCs (could be simplified to the MTC only during development phases)
parent 024b397c
Loading
Loading
Loading
Loading
+162 −27
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ module DiameterS6a_HSS_TCFunctions {
    //import from LibCommon_VerdictControl all;
    
    // LibDiameter 
    import from LibDiameter_Interface {
        type DiameterComponent 
    };
    import from LibDiameter_Steps {
        function f_getVerdict
    };
@@ -28,11 +25,14 @@ module DiameterS6a_HSS_TCFunctions {
        function 
            f_preamble_HSS, f_postamble_HSS
    };
    import from DiameterS6a_TestSystem {
        type TestAdapter
    };
    
    // 5.2.2.1 Update Location
    group updateLocation {
        
        function f_TC_HSS_UL_01() runs on DiameterComponent {
        function f_TC_HSS_UL_01() runs on TestAdapter {
            
            // Local variables
            
@@ -53,7 +53,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_01
        
        function f_TC_HSS_UL_02() runs on DiameterComponent {
        function f_TC_HSS_UL_02() runs on TestAdapter {
            
            // Local variables
            
@@ -71,7 +71,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_02
        
        function f_TC_HSS_UL_03() runs on DiameterComponent {
        function f_TC_HSS_UL_03() runs on TestAdapter {
            
            // Local variables
            
@@ -89,7 +89,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_03
        
        function f_TC_HSS_UL_04() runs on DiameterComponent {
        function f_TC_HSS_UL_04() runs on TestAdapter {
            
            // Local variables
            
@@ -107,7 +107,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_04
        
        function f_TC_HSS_UL_05() runs on DiameterComponent {
        function f_TC_HSS_UL_05() runs on TestAdapter {
            
            // Local variables
            
@@ -125,7 +125,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_05
        
        function f_TC_HSS_UL_06() runs on DiameterComponent {
        function f_TC_HSS_UL_06() runs on TestAdapter {
            
            // Local variables
            
@@ -143,7 +143,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_06
        
        function f_TC_HSS_UL_07() runs on DiameterComponent {
        function f_TC_HSS_UL_07() runs on TestAdapter {
            
            // Local variables
            
@@ -161,7 +161,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_07
        
        function f_TC_HSS_UL_08() runs on DiameterComponent {
        function f_TC_HSS_UL_08() runs on TestAdapter {
            
            // Local variables
            
@@ -179,7 +179,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_08
        
        function f_TC_HSS_UL_09() runs on DiameterComponent {
        function f_TC_HSS_UL_09() runs on TestAdapter {
            
            // Local variables
            
@@ -197,7 +197,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_09
        
        function f_TC_HSS_UL_10() runs on DiameterComponent {
        function f_TC_HSS_UL_10() runs on TestAdapter {
            
            // Local variables
            
@@ -215,7 +215,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_10
        
        function f_TC_HSS_UL_11() runs on DiameterComponent {
        function f_TC_HSS_UL_11() runs on TestAdapter {
            
            // Local variables
            
@@ -233,7 +233,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_11
        
        function f_TC_HSS_UL_12() runs on DiameterComponent {
        function f_TC_HSS_UL_12() runs on TestAdapter {
            
            // Local variables
            
@@ -251,7 +251,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_UL_12
        
        function f_TC_HSS_UL_13() runs on DiameterComponent {
        function f_TC_HSS_UL_13() runs on TestAdapter {
            
            // Local variables
            
@@ -271,7 +271,7 @@ module DiameterS6a_HSS_TCFunctions {
    // 5.2.2.2 Cancel Location
    group cancelLocation {
        
        function f_TC_HSS_CL_01() runs on DiameterComponent {
        function f_TC_HSS_CL_01() runs on TestAdapter {
            
            // Local variables
            
@@ -286,7 +286,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_CL_01
        
        function f_TC_HSS_CL_02() runs on DiameterComponent {
        function f_TC_HSS_CL_02() runs on TestAdapter {
            
            // Local variables
            
@@ -301,7 +301,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_CL_02
        
        function f_TC_HSS_CL_03() runs on DiameterComponent {
        function f_TC_HSS_CL_03() runs on TestAdapter {
            
            // Local variables
            
@@ -321,7 +321,7 @@ module DiameterS6a_HSS_TCFunctions {
    // 5.2.2.3 Purge UE
    group purgeUE {
        
        function f_TC_HSS_PUE_01() runs on DiameterComponent {
        function f_TC_HSS_PUE_01() runs on TestAdapter {
            
            // Local variables
            
@@ -336,7 +336,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_PUE_01
        
        function f_TC_HSS_PUE_02() runs on DiameterComponent {
        function f_TC_HSS_PUE_02() runs on TestAdapter {
            
            // Local variables
            
@@ -351,7 +351,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_PUE_02
        
        function f_TC_HSS_PUE_03() runs on DiameterComponent {
        function f_TC_HSS_PUE_03() runs on TestAdapter {
            
            // Local variables
            
@@ -366,7 +366,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_PUE_03
        
        function f_TC_HSS_PUE_04() runs on DiameterComponent {
        function f_TC_HSS_PUE_04() runs on TestAdapter {
            
            // Local variables
            
@@ -381,7 +381,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_PUE_04
        
        function f_TC_HSS_PUE_05() runs on DiameterComponent {
        function f_TC_HSS_PUE_05() runs on TestAdapter {
            
            // Local variables
            
@@ -396,7 +396,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_PUE_05
        
        function f_TC_HSS_PUE_06() runs on DiameterComponent {
        function f_TC_HSS_PUE_06() runs on TestAdapter {
            
            // Local variables
            
@@ -411,7 +411,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_PUE_06
        
        function f_TC_HSS_PUE_07() runs on DiameterComponent {
        function f_TC_HSS_PUE_07() runs on TestAdapter {
            
            // Local variables
            
@@ -426,7 +426,7 @@ module DiameterS6a_HSS_TCFunctions {
            
        } // End of TC function f_TC_HSS_PUE_07
        
        function f_TC_HSS_PUE_08() runs on DiameterComponent {
        function f_TC_HSS_PUE_08() runs on TestAdapter {
            
            // Local variables
            
@@ -446,6 +446,141 @@ module DiameterS6a_HSS_TCFunctions {
    // 5.2.2.4 Insert Subscriber Data
    group insertSubscriberData {
        
        function f_TC_HSS_ISD_01() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_HSS_ISD_01
        
        function f_TC_HSS_ISD_02() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_HSS_ISD_02
        
        function f_TC_HSS_ISD_03() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_HSS_ISD_03
        
        function f_TC_HSS_ISD_04() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_HSS_ISD_04
        
        function f_TC_HSS_ISD_05() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_HSS_ISD_05
        
        function f_TC_HSS_ISD_06() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_HSS_ISD_06
        
        function f_TC_HSS_ISD_07() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_HSS_ISD_07
        
        function f_TC_HSS_ISD_08() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_HSS_ISD_08
        
        function f_TC_HSS_ISD_09() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_HSS_ISD_09
        
    } // End of group insertSubscriberData
    
    // 5.2.2.5 Delete Subscriber Data
+197 −15
Original line number Diff line number Diff line
@@ -7,14 +7,16 @@
module DiameterS6a_MME_TCFunctions {
    
    // LibDiameter 
    import from LibDiameter_Interface {
        type DiameterComponent 
    
    // DiameterS6a
    import from DiameterS6a_TestSystem {
        type TestAdapter
    };
    
    // 5.2.1.1 Update Location
    group updateLocation {
        
        function f_TC_MME_UL_01() runs on DiameterComponent {
        function f_TC_MME_UL_01() runs on TestAdapter {
            
            // Local variables
            
@@ -29,7 +31,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_UL_01
        
        function f_TC_MME_UL_02() runs on DiameterComponent {
        function f_TC_MME_UL_02() runs on TestAdapter {
            
            // Local variables
            
@@ -44,7 +46,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_UL_02
        
        function f_TC_MME_UL_03() runs on DiameterComponent {
        function f_TC_MME_UL_03() runs on TestAdapter {
            
            // Local variables
            
@@ -59,7 +61,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_UL_03
        
        function f_TC_MME_UL_04() runs on DiameterComponent {
        function f_TC_MME_UL_04() runs on TestAdapter {
            
            // Local variables
            
@@ -74,7 +76,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_UL_04
        
        function f_TC_MME_UL_05() runs on DiameterComponent {
        function f_TC_MME_UL_05() runs on TestAdapter {
            
            // Local variables
            
@@ -89,7 +91,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_UL_05
        
        function f_TC_MME_UL_06() runs on DiameterComponent {
        function f_TC_MME_UL_06() runs on TestAdapter {
            
            // Local variables
            
@@ -104,7 +106,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_UL_06
        
        function f_TC_MME_UL_07() runs on DiameterComponent {
        function f_TC_MME_UL_07() runs on TestAdapter {
            
            // Local variables
            
@@ -124,7 +126,7 @@ module DiameterS6a_MME_TCFunctions {
    // 5.2.1.2 Cancel Location
    group cancelLocation {
        
        function f_TC_MME_CL_01() runs on DiameterComponent {
        function f_TC_MME_CL_01() runs on TestAdapter {
            
            // Local variables
            
@@ -139,7 +141,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_CL_01
        
        function f_TC_MME_CL_02() runs on DiameterComponent {
        function f_TC_MME_CL_02() runs on TestAdapter {
            
            // Local variables
            
@@ -159,7 +161,7 @@ module DiameterS6a_MME_TCFunctions {
    // 5.2.1.3 Purge UE
    group purgeUE {
        
        function f_TC_MME_PUE_01() runs on DiameterComponent {
        function f_TC_MME_PUE_01() runs on TestAdapter {
            
            // Local variables
            
@@ -174,7 +176,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_PUE_01
        
        function f_TC_MME_PUE_02() runs on DiameterComponent {
        function f_TC_MME_PUE_02() runs on TestAdapter {
            
            // Local variables
            
@@ -189,7 +191,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_PUE_02
        
        function f_TC_MME_PUE_03() runs on DiameterComponent {
        function f_TC_MME_PUE_03() runs on TestAdapter {
            
            // Local variables
            
@@ -204,7 +206,7 @@ module DiameterS6a_MME_TCFunctions {
            
        } // End of TC function f_TC_MME_PUE_03
        
        function f_TC_MME_PUE_04() runs on DiameterComponent {
        function f_TC_MME_PUE_04() runs on TestAdapter {
            
            // Local variables
            
@@ -224,6 +226,186 @@ module DiameterS6a_MME_TCFunctions {
    // 5.2.1.4 Insert Subscriber Data
    group insertSubscriberData {
        
        function f_TC_MME_ISD_01() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_01
        
        function f_TC_MME_ISD_02() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_02
        
        function f_TC_MME_ISD_03() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_03
        
        function f_TC_MME_ISD_04() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_04
        
        function f_TC_MME_ISD_05() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_05
        
        function f_TC_MME_ISD_06() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_06
        
        function f_TC_MME_ISD_07() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_07
        
        function f_TC_MME_ISD_08() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_08
        
        function f_TC_MME_ISD_09() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_09
        
        function f_TC_MME_ISD_10() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_10
        
        function f_TC_MME_ISD_11() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_11
        
        function f_TC_MME_ISD_12() runs on TestAdapter {
            
            // Local variables
            
            // Preamble
            
            // Test Body
            // Clause 'when'
            
            // Clause 'then'
            
            // Postamble
            
        } // End of TC function f_TC_MME_ISD_12
        
    } // End of group insertSubscriberData
    
    // 5.2.1.5 Delete Subscriber Data
+10 −62
Original line number Diff line number Diff line
@@ -18,32 +18,17 @@
    //import from LibCommon_VerdictControl all ;

    // LibDiameter
//    import from LibDiameter_Templates all;
    import from LibDiameter_TypesAndValues {
        const c_applIdGx
    };
    import from LibDiameter_Steps {
        altstep 
            a_diameter_catchSyncStop, a_diameter_default;
        function 
            f_preambleClient, f_preambleDiameterBaseClient, 
            f_postambleDiameterBase, f_postambleDisconnect, 
            f_Diameter_Init_Component, f_IPV4or6_String2Address 
    };
    import from LibDiameter_PIXITS {
        modulepar PX_DIAM_LLP_ENABLED
    };
    import from LibDiameter_Interface {
        type DiameterComponent
    };
    
    // DiameterS6a
//    import from DiameterGx_Templates all;
    import from DiameterS6a_PIXITS all;
//    import from DiameterGx_Gx_TCFunctions all;
//    import from DiameterGx_TestConfiguration all;
    import from DiameterS6a_Templates {
        template m_sessionId, m_originHost, m_originRealm, m_destinationHost, m_destinationRealm
//    import from DiameterS6a_Templates {
//        template m_sessionId, m_originHost, m_originRealm, m_destinationHost, m_destinationRealm
//    };
    import from DiameterS6a_TestSystem {
        type TestAdapter
    };

    // GPRS tunneling protocol
@@ -57,36 +42,7 @@
        *  @param   
        */
        function f_DiameterS6a_init()
        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
            f_Diameter_Init_Component();
            
            // Initialize component variables
            vc_ETS_address := PX_DIAMETER_S6a_ETS_IPADDR;
            vc_ETS_port    := PX_DIAMETER_S6a_ETS_PORT;
            vc_SUT_address := PX_DIAMETER_S6a_SUT_IPADDR;
            vc_SUT_port    := PX_DIAMETER_S6a_SUT_PORT;

            vc_sessionId := m_sessionId(PX_SessionID);

            vc_originHost := m_originHost(PX_OriginHost);
            vc_originRealm := m_originRealm(PX_OriginRealm); // realm of the originator (TS)

            vc_originHost_IUT := m_originHost(PX_DestinationHost);
            vc_originRealm_IUT := m_originRealm(PX_DestinationRealm); // realm of the originator (TS)

            vc_destinationHost := m_destinationHost(PX_DestinationHost);
            vc_destinationRealm := m_destinationRealm(PX_DestinationRealm);

            vc_hostIPAddress := valueof(f_IPV4or6_String2Address (PX_DIAMETER_S6a_ETS_IPADDR));

            vc_send_hopid := hex2int('00000100'H);
            vc_send_endid := hex2int('01000000'H);
        runs on TestAdapter {
            
        } // End of function f_DiameterGx_init
        
@@ -96,12 +52,8 @@
        
        group hssRole {
            
            function f_preamble_HSS() runs on DiameterComponent {
                if(PX_DIAM_LLP_ENABLED) {
                    f_preambleClient();
                }
            function f_preamble_HSS() runs on TestAdapter {
                f_DiameterS6a_init();
                f_preambleDiameterBaseClient(c_applIdGx);
            } // End of function f_preamble_HSS
        
        } // End of group hssRole
@@ -112,11 +64,7 @@
        
        group hssRole {
            
            function f_postamble_HSS() runs on DiameterComponent {
                f_postambleDiameterBase();
                if(PX_DIAM_LLP_ENABLED) {
                    f_postambleDisconnect();
                }
            function f_postamble_HSS() runs on TestAdapter {
            } // End of function f_preamble_HSS
        
        } // End of group hssRole
@@ -131,7 +79,7 @@
    
    group SendMessage {
        
//    function f_awaiting_ULR (template (value) DIAMETER_MSG p_diameterMSG) runs on DiameterComponent
//    function f_awaiting_ULR (template (value) DIAMETER_MSG p_diameterMSG) runs on TestAdapter
//        {stop
//        }
        
+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ module DiameterS6a_Templates {
    // LibDiameter
    import from LibDiameter_TypesAndValues all; // TODO Remove 'all'
    import from LibDiameter_Templates all;
    import from DiameterGx_Templates all;
    
    // DiameterS6a
    import from DiameterS6a_TypesAndValues all;
+1793 −657

File changed.

Preview size limit exceeded, changes collapsed.

Loading