Commit cf405583 authored by Yann Garcia's avatar Yann Garcia
Browse files

Restore lost code in Templates & test function

parent d3b1bc6d
Loading
Loading
Loading
Loading
+48 −0
Original line number Original line Diff line number Diff line
@@ -4455,6 +4455,10 @@ module NGAP_TCFunctions {
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");


                // Body
                // Body
                f_recv_NGAP_PDU(
                                mw_ngap_initMsg(
                                                mw_n2_HandoverRequest
                                ));


                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
@@ -4487,6 +4491,28 @@ module NGAP_TCFunctions {
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");


                // Body
                // Body
                f_send_NGAP_PDU(
                                m_ngap_initMsg(
                                               m_n2_PathSwitchRequest(
                                                                      -, -,
                                                                      m_uPTransportLayerInformation_userLocationInformationNR(
                                                                                                                              m_userLocationInformationNR(
                                                                                                                                                          m_nR_CGI,
                                                                                                                                                          m_tAI
                                                                                                                              )),
                                                                      m_uESecurityCapabilities,
                                                                      {
                                                                        m_pDUSessionResourceToBeSwitchedDLItem(
                                                                                                               -,
                                                                                                               ''O // FIXME FSCOM Shall be bit2oct(encvalue(m_pathSwitchRequestTransfer))
                                                                                                               )
                                                                      }
                                )));

                f_recv_NGAP_PDU(
                                mw_ngap_succMsg(
                                                mw_n2_PathSwitchRequestAcknowledge
                                ));


                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
@@ -4512,6 +4538,28 @@ module NGAP_TCFunctions {
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");


                // Body
                // Body
                f_send_NGAP_PDU(
                                m_ngap_initMsg(
                                               m_n2_PathSwitchRequest(
                                                                      -, -,
                                                                      m_uPTransportLayerInformation_userLocationInformationNR(
                                                                                                                              m_userLocationInformationNR(
                                                                                                                                                          m_nR_CGI,
                                                                                                                                                          m_tAI
                                                                                                                              )),
                                                                      m_uESecurityCapabilities,
                                                                      {
                                                                        m_pDUSessionResourceToBeSwitchedDLItem(
                                                                                                               -,
                                                                                                               ''O // FIXME FSCOM Shall be bit2oct(encvalue(m_pathSwitchRequestTransfer))
                                                                                                               )
                                                                      }
                                )));

                f_recv_NGAP_PDU(
                                mw_ngap_unsuccMsg(
                                                  mw_n2_PathSwitchRequestFailure
                                ));


                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");
+7 −8
Original line number Original line Diff line number Diff line
@@ -7649,7 +7649,7 @@ module LibNGAP_Templates {
                        template (present) InitiatingMessage mw_n2_LocationReportingFailureIndication(
                        template (present) InitiatingMessage mw_n2_LocationReportingFailureIndication(
                                                                                                      template (present) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID,
                                                                                                      template (present) AMF_UE_NGAP_ID p_amfUeNgapID := PX_AMF_UE_NGAP_ID,
                                                                                                      template (present) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID,
                                                                                                      template (present) RAN_UE_NGAP_ID p_ranUeNgapID := PX_RAN_UE_NGAP_ID,
                                                                          template (present) CauseRadioNetwork p_cause
                                                                                                      template (present) Cause p_cause
                                                                                                      ) := {
                                                                                                      ) := {
                            procedureCode := id_LocationReportingFailureIndication,
                            procedureCode := id_LocationReportingFailureIndication,
                            criticality   := ignore,
                            criticality   := ignore,
@@ -7667,14 +7667,13 @@ module LibNGAP_Templates {
                                                                              value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID }
                                                                              value_ := { RAN_UE_NGAP_ID := p_ranUeNgapID }
                                                                          },
                                                                          },
                                                                          {
                                                                          {
                                                                              id := id_CauseRadioNetwork,
                                                                              id := id_Cause,
                                                                              criticality := ignore,
                                                                              criticality := ignore,
                                                                              value_ := { id_CauseRadioNetwork := p_causeRadioNetwork}
                                                                              value_ := { Cause := p_cause }
                                                                          }
                                                                          }
                                                    }
                                                    }
                                                }
                                                }
                                            }
                                            }
>>>>>>> 1e8a41e (new Testcase, function and template for TC_NGAP_AMF_CMP_02, TC_NGAP_AMF_CMP_03, TC_NGAP_AMF_CMP_04, TC_NGAP_AMF_CMP_05, TC_NGAP_AMF_CMP_06)
                        } // End of template mw_n2_LocationReportingFailureIndication
                        } // End of template mw_n2_LocationReportingFailureIndication
                        
                        
                    }
                    }