Commit 30b98b23 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in Ats_NG_NAS

parent 31c77276

titan-test-system-framework @ 3f542e05

Original line number Diff line number Diff line 
Subproject commit e477d327f4df850e487feab5c0f68b1044db3cf1
 
Subproject commit 3f542e05e054a605c110d0b0b62908057c7203b2

ttcn/Ats_NG_NAS/NG_NAS_TCFunctions.ttcn

+36 −4
Original line number Diff line number Diff line
@@ -1251,12 +1251,20 @@ module NG_NAS_TCFunctions { 
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");



                // Body

                var octetstring v_other_digits :=  // ETSI TS 124 501 Figure 9.11.3.4.3: 5GS mobile identity information element for type of identity "SUCI" and SUPI format "IMSI"

                    PX_PLMN & 

                    '0000'O & // Routing Indicator

                    '00'O   & // Protection scheme

                    '00'O   & // Home network public key identifier

                    PX_MSIN;

                log("f_TC_5GNAS_AMF_REG_REJ_01: v_other_digits: ", v_other_digits);

                log("f_TC_5GNAS_AMF_REG_REJ_01: m_NG_MobileIdentitySUCI: ", m_NG_MobileIdentitySUCI(PX_SUPI_FORMAT, v_other_digits, PX_TYPE_OF_ID));

                vt_NgNasUl_Msg := 

                    m_NG_REGISTRATION_REQUEST(

                        {'1'B,'001'B},//in template (value) RegistrationType p_RegistrationType,

                        '111'B,//in template (value) NAS_KsiValue p_KeySetId,

                        '0'B,//in template (value) B1_Type p_Tsc,

                        m_NG_MobileIdentitySUCI(PX_TYPE_OF_ID,PX_SUPI_DIGITS),//in template (value) NG_MobileIdentity p_MobileId,  // 24.501 cl. 9.11.3.4

                        m_NG_MobileIdentitySUCI(PX_SUPI_FORMAT, v_other_digits, PX_TYPE_OF_ID),//in template (value) NG_MobileIdentity p_MobileId,  // 24.501 cl. 9.11.3.4

                        

                        -,/* in template (omit) NAS_KeySetIdentifier p_NonCurrentKSI := omit,*/

                        -,/*in template (omit) NG_GMM_Cap p_GMM_Cap := omit,*/
@@ -1425,12 +1433,20 @@ module NG_NAS_TCFunctions { 
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");



                // Body

                var octetstring v_other_digits :=  // ETSI TS 124 501 Figure 9.11.3.4.3: 5GS mobile identity information element for type of identity "SUCI" and SUPI format "IMSI"

                    PX_PLMN & 

                    '0000'O & // Routing Indicator

                    '00'O   & // Protection scheme

                    '00'O   & // Home network public key identifier

                    PX_MSIN;

                log("f_TC_5GNAS_AMF_REG_REJ_02: v_other_digits: ", v_other_digits);

                log("f_TC_5GNAS_AMF_REG_REJ_02: m_NG_MobileIdentitySUCI: ", m_NG_MobileIdentitySUCI(PX_SUPI_FORMAT, v_other_digits, PX_TYPE_OF_ID));

                vt_NgNasUl_Msg := 

                    m_NG_REGISTRATION_REQUEST(

                            {'1'B,'001'B},//in template (value) RegistrationType p_RegistrationType,

                            '111'B,//in template (value) NAS_KsiValue p_KeySetId,

                            '0'B,//in template (value) B1_Type p_Tsc,

                            m_NG_MobileIdentitySUCI(PX_TYPE_OF_ID,PX_SUPI_DIGITS),//in template (value) NG_MobileIdentity p_MobileId,

                            m_NG_MobileIdentitySUCI(PX_SUPI_FORMAT, v_other_digits, PX_TYPE_OF_ID),//in template (value) NG_MobileIdentity p_MobileId,

                            

                            omit, // in template (omit) NAS_KeySetIdentifier p_NonCurrentKSI := omit,

                            omit, // in template (omit) NG_GMM_Cap p_GMM_Cap := omit,
@@ -1549,6 +1565,14 @@ module NG_NAS_TCFunctions { 
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");



                // Body

                var octetstring v_other_digits :=  // ETSI TS 124 501 Figure 9.11.3.4.3: 5GS mobile identity information element for type of identity "SUCI" and SUPI format "IMSI"

                    PX_PLMN & 

                    '0000'O & // Routing Indicator

                    '00'O   & // Protection scheme

                    '00'O   & // Home network public key identifier

                    PX_MSIN;

                log("f_TC_5GNAS_AMF_DRG_ACC_01: v_other_digits: ", v_other_digits);

                log("f_TC_5GNAS_AMF_DRG_ACC_01: m_NG_MobileIdentitySUCI: ", m_NG_MobileIdentitySUCI(PX_SUPI_FORMAT, v_other_digits, PX_TYPE_OF_ID));

                vt_NgNasUl_Msg := 

                    m_NG_DEREGISTRATION_REQUEST_MO(

                        crs_DeregisterType ('0'B,//B1_Type p_SwitchOff,
@@ -1556,7 +1580,7 @@ module NG_NAS_TCFunctions { 
                                            '01'B//B2_Type p_Access := '01'B),//in template (value) DeregisterType p_DeregisterType,

                        ),

                        cs_NAS_KeySetIdentifier_lv('111'B,'1'B),//in template (value) NAS_KeySetIdentifier p_KSI,

                        m_NG_MobileIdentitySUCI(PX_TYPE_OF_ID,PX_SUPI_DIGITS)//in template (value) NG_MobileIdentity p_MobileId,                            

                        m_NG_MobileIdentitySUCI(PX_SUPI_FORMAT, v_other_digits, PX_TYPE_OF_ID)//in template (value) NG_MobileIdentity p_MobileId,                            

                    );

                 f_send_NGAP_PDU(

                    m_ngap_initMsg(
@@ -1616,6 +1640,14 @@ module NG_NAS_TCFunctions { 
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");



                // Body

                var octetstring v_other_digits :=  // ETSI TS 124 501 Figure 9.11.3.4.3: 5GS mobile identity information element for type of identity "SUCI" and SUPI format "IMSI"

                    PX_PLMN & 

                    '0000'O & // Routing Indicator

                    '00'O   & // Protection scheme

                    '00'O   & // Home network public key identifier

                    PX_MSIN;

                log("f_TC_5GNAS_AMF_DRG_ACC_02: v_other_digits: ", v_other_digits);

                log("f_TC_5GNAS_AMF_DRG_ACC_02: m_NG_MobileIdentitySUCI: ", m_NG_MobileIdentitySUCI(PX_SUPI_FORMAT, v_other_digits, PX_TYPE_OF_ID));

                vt_NgNasUl_Msg := 

                    m_NG_DEREGISTRATION_REQUEST_MO(

                        crs_DeregisterType ('1'B,//B1_Type p_SwitchOff,
@@ -1623,7 +1655,7 @@ module NG_NAS_TCFunctions { 
                                            '01'B//B2_Type p_Access := '01'B),//in template (value) DeregisterType p_DeregisterType,

                        ),

                        cs_NAS_KeySetIdentifier_lv('111'B,'1'B),//in template (value) NAS_KeySetIdentifier p_KSI,

                        m_NG_MobileIdentitySUCI(PX_TYPE_OF_ID,PX_SUPI_DIGITS)//in template (value) NG_MobileIdentity p_MobileId,                            

                        m_NG_MobileIdentitySUCI(PX_SUPI_FORMAT, v_other_digits, PX_TYPE_OF_ID)//in template (value) NG_MobileIdentity p_MobileId,                            

                    );

                 f_send_NGAP_PDU(

                    m_ngap_initMsg(