Commit 004fbaef authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Merge branch 'pespin/pr' into 'main'

Add several cs templates for NG_REGISTRATION_REQUEST

See merge request !11
parents 78c00433 66b56af6
Loading
Loading
Loading
Loading
+11 −0
Original line number Original line Diff line number Diff line
@@ -238,6 +238,17 @@ module NG_NAS_Common {
    otherDigits := p_Guti
    otherDigits := p_Guti
  };
  };


  template (value) NG_MobileIdentity cs_NG_MobileIdentitySUCI(template (value) B4_Type p_SUPIFormat,
                                                              template (value) octetstring p_OtherDigits) :=
  { /* @status    APPROVED (IMS, NR5GC, NR5GC_IRAT, POS) */
      iei         := omit,
      iel         := int2oct(1+lengthof(p_OtherDigits), 2),              // @sic R5s190719 sic@
      idDigit1    := p_SUPIFormat,                      // 4 bits
      oddEvenInd  := '0'B,                              // 1 bit
      typeOfId    := tsc_IdType_NG_SUCI,                // 3 bits
      otherDigits := p_OtherDigits
  };

  template (present) NG_MobileIdentity cr_NG_MobileIdentity_TypeOfId(template (present) B4_Type p_FirstDigit,
  template (present) NG_MobileIdentity cr_NG_MobileIdentity_TypeOfId(template (present) B4_Type p_FirstDigit,
                                                                     template (present) B1_Type p_OddEvenInd,
                                                                     template (present) B1_Type p_OddEvenInd,
                                                                     template (present) octetstring p_OtherDigits,
                                                                     template (present) octetstring p_OtherDigits,
+103 −0
Original line number Original line Diff line number Diff line
@@ -270,6 +270,101 @@ module NG_NAS_Templates {
    }
    }
  };
  };


 template (omit) NG_NAS_UL_Message_Type cs_NG_REGISTRATION_REQUEST(template (value) RegistrationType p_RegistrationType,
                                                                   template (value) NAS_KsiValue p_KeySetId,
                                                                   template (value) B1_Type p_Tsc,
                                                                   template (value) NG_MobileIdentity p_MobileId,
                                                                   template (omit) NAS_KeySetIdentifier p_NonCurrentKSI := omit,
                                                                   template (omit) NG_GMM_Cap p_GMM_Cap := omit,
                                                                   template (omit) NG_UE_SecurityCapability p_UESecurityCap := omit,
                                                                   template (omit) NSSAI p_ReqNSSAI := omit,
                                                                   template (omit) NG_TrackingAreaId p_TAI := omit,
                                                                   template (omit) UE_NetworkCap p_UE_NetworkCap := omit,
                                                                   template (omit) ULDataStatus p_ULDataStatus := omit,
                                                                   template (omit) PDU_SessionStatus p_PDU_SessionStatus := omit,
                                                                   template (omit) MICO_Ind p_MICO_Ind := omit,
                                                                   template (omit) UE_Status p_UE_Status := omit,
                                                                   template (omit) NG_MobileIdentity p_AddGUTI := omit,
                                                                   template (omit) AllowedPDU_SessionStatus p_AllowedPDU_SessionStatus := omit,
                                                                   template (omit) UE_UsageSetting p_UE_UsageSetting := omit,
                                                                   template (omit) NG_DRXparameter p_DRXparam := omit,
                                                                   template (omit) EPS_MessageContainer p_EPSMsg := omit,
                                                                   template (omit) LADN_Ind p_LADN_Ind := omit,
                                                                   template (omit) PayloadContainerType p_ContainerType := omit, // @sic R5w190113 sic@
                                                                   template (omit) PayloadContainer p_Payload := omit,
                                                                   template (omit) NetworkSlicingInd p_NetworkSlicingInd := omit,
                                                                   template (omit) NG_UpdateType p_NG_UpdateType := omit,
                                                                   template (omit) MS_Clsmk2 p_MS_Clsmk2 := omit,
                                                                   template (omit) CodecList p_SupportedCodecs := omit,
                                                                   template (omit) EPS_BearerContextStatus p_EPS_BearerContextStatus := omit, // @sic R5s190543 sic@
                                                                   template (omit) NASMessageContainer p_Msg := omit,
                                                                   template (omit) ExtdDRXParams p_ExtdDRXParams := omit,
                                                                   template (omit) GPRS_Timer3 p_T3324 := omit,
                                                                   template (omit) UERadioCapId p_UERadioCapId := omit,
                                                                   template (omit) MappedNSSAI p_MappedNSSAI := omit,
                                                                   template (omit) AddInfoRequest p_AddInfoRequest := omit,
                                                                   template (omit) WUSAssistInfo p_WUSAssistInfo := omit,
                                                                   template (omit) N5GCInd p_N5GCInd := omit,
                                                                   template (omit) NB_N1ModeDRXParams p_NB_N1ModeDRXParams := omit,
                                                                   template (omit) UE_RequestType p_UeRequestType := omit,
                                                                   template (omit) NG_PagingRestriction p_PagingRestrict := omit,
                                                                   template (omit) ServiceLvlAAContainer p_ServiceLvlAA := omit,
                                                                   template (omit) NID p_NId := omit,
                                                                   template (omit) PLMN_IdIE p_MSPLMNwDisasterCondition := omit,
                                                                   template (omit) PEIPS_AssistInfo p_RequestedPEIPS_AssistInfo := omit,
                                                                   template (omit) GPRS_Timer3 p_T3512 := omit
                                                                   ) := { /* 24.501 cl. 8.2.6 */
    /* @status    APPROVED (IMS, NR5GC, NR5GC_IRAT, POS) */
    registration_Request := {
      protocolDiscriminator   := tsc_EPD_GMM,                     /* cl. 9.2       M V 1   */
      spareHalfOctet          := tsc_SpareHalfOctet,              /* cl. 9.3      M V 1/2 */
      securityHeaderType      := tsc_SHT_NoSecurityProtection,
      messageType             := tsc_MT_NG_RegistrationRequest,   /* cl. 9.7      M V 1   */
      ngNasKSI                := cs_NAS_KeySetIdentifier_lv(valueof(p_KeySetId), valueof(p_Tsc)), /* cl. 9.11.3.32 M V 1/2 */
      registrationType        := p_RegistrationType,              /* cl. 9.11.3.7 M LV 2  */
      ngMobileId              := p_MobileId,                      /* cl. 9.11.3.4 M LV 5-?  */
      nonCurrentNativeKSI     := p_NonCurrentKSI,                 /* cl. 9.11.3.32 O TV 1 IEI=C- */
      gmmCapability           := p_GMM_Cap,                       /* cl. 9.11.3.1  O TLV 3-15 IEI=10 */
      ueSecurityCapability    := p_UESecurityCap,                 /* cl. 9.11.3.54 O TLV 4-10 IEI=2E */
      requestedNSSAI          := p_ReqNSSAI,                      /* cl. 9.11.3.37 O TLV 4-74 IEI=2F */
      lastVisitedRegisteredTai := p_TAI,                          /* cl. 9.11.3.8  O TV 7 IEI=52 */
      s1_UE_Capability        := p_UE_NetworkCap,                 /* cl. 9.11.3.48 O LV 4-15 IEI=65 */
      ulDataStatus            := p_ULDataStatus,                  /* cl. 9.11.3.57 O TLV 4-34 IEI=40 */
      pduSessionStatus        := p_PDU_SessionStatus,             /* cl. 9.11.3.44  O TLV 4-34 IEI=50 */
      micoInd                 := p_MICO_Ind,                      /* cl. 9.11.3.31 O TLV 1 IEI=B */
      ueStatus                := p_UE_Status,                     /* cl. 9.11.3.56 O TLV 3 IEI=2B */
      additionalGUTI          := p_AddGUTI,                       /* cl. 9.11.3.4  O TLV 5-? IEI=2C */
      allowedPDUSessionStatus := p_AllowedPDU_SessionStatus,      /* cl. 9.11.3.13 O TLV 4-34 IEI=25 */
      ueUsageSetting          := p_UE_UsageSetting,               /* cl. 9.11.3.55 O TLV 3 IEI=60 */
      reqDRXParams            := p_DRXparam,                      /* cl. 9.11.3.22 O TLV ? IEI=51 */
      epsMessage              := p_EPSMsg,                        /* cl. 9.11.3.24 O TLV-E ? IEI=7C */
      ladnInd                 := p_LADN_Ind,                      /* cl. 9.11.3.29 O TLV-E 3-811 IEI=7E */
      payloadContainerType    := p_ContainerType,                 /* cl. 9.11.3.40 O TV 1 IEI=8 Mar 19 @sic R5w190113 sic@*/
      payload                 := p_Payload,                       /* cl. 9.11.3.39 O TLV-E 4-65538 IEI=7B */
      networkSlicingInd       := p_NetworkSlicingInd,             /* cl. 9.11.3.36 O TV 1 IEI=9 Dec18 */
      updateType              := p_NG_UpdateType,                 /* cl. 9.11.3.9A O TLV 3 IEI=53 Dec18 */
      msClassmark2            := p_MS_Clsmk2, /* cl. 9.11.3.31C O TLV 5 IEI=41 Sep20 @sic R5s201387 Baseline Moving sic@ */
      supportedCodecs         := p_SupportedCodecs, /* cl. 9.11.3.51A O TLV 5-n IEI=42 Sep20 @sic R5s201387 Baseline Moving sic@ */
      nasMsg                  := p_Msg,                           /* cl. 9.11.3.33 O TLV-E 4-n IEI=71 Dec18 */
      epsBearerContextStatus  := p_EPS_BearerContextStatus,       /* cl. 9.11.3.23A O TLV 4 IEI=60 Jun19 @sic R5s190543 sic@ */
      requestedExtdDRXParams  := p_ExtdDRXParams, /* cl. 9.11.3.26A O TLV 3 IEI=6E Sep20 @sic R5s201387 Baseline Moving sic@ */
      t3324Value              := p_T3324, /* cl. 9.11.2.5   O TLV 3 IEI=6A Sep20 @sic R5s201387 Baseline Moving sic@ */
      ueRadioCapabilityId     := p_UERadioCapId, /* cl. 9.11.3.68  O TLV 3-n IEI=67 Sep20 @sic R5s201387 Baseline Moving sic@ */
      requestedMappedNSSAI    := p_MappedNSSAI, /* cl. 9.11.3.31B O TLV 3-42 IEI=35 Sep20 @sic R5s201387 Baseline Moving sic@ */
      additionalInfoReq       := p_AddInfoRequest, /* cl. 9.11.3.12A O TLV 3 IEI=48 Sep20 @sic R5s201387 Baseline Moving sic@ */
      requestedWUSAssistanceInfo := p_WUSAssistInfo, /* cl. 9.11.3.71  O TLV 3-n IEI=1A Sep20 @sic R5s201387 Baseline Moving sic@ */
      n5GCInd                 := p_N5GCInd, /* cl. 9.11.3.72  O T   1 IEI=A Sep20 @sic R5s201387 Baseline Moving sic@ */
      requestedNB_N1DRXParams := p_NB_N1ModeDRXParams,  /* cl. 9.11.3.73  O TLV 3 IEI=30 Sep20 @sic R5s201387 Baseline Moving sic@ */
      ueRequestType           := p_UeRequestType, /* cl. 9.11.3.76  O TLV 3 IEI=29 Sep22 @sic R5s221179 Baseline Moving sic@ */
      pagingRestrict          := p_PagingRestrict, /* cl. 9.11.3.77  O TLV 3-35 IEI=28 Sep22 @sic R5s221179 Baseline Moving sic@ */
      serviceLvlAA            := p_ServiceLvlAA, /* cl. 9.11.2.10  O TLV-E 6-n IEI=72 Sep22 @sic R5s221179 Baseline Moving sic@ */
      nId                     := p_NId, /* cl. 9.11.3.79  O TLV 8 IEI=32 Sep22 @sic R5s221179 Baseline Moving sic@ */
      msPLMNwDisasterCondition  := p_MSPLMNwDisasterCondition, /* cl. 9.11.3.85  O TLV 5 IEI=16 Sep22 @sic R5s221179 Baseline Moving sic@ */
      requestedPEIPS_AssistInfo := p_RequestedPEIPS_AssistInfo,  /* cl. 9.11.3.80  O TLV 3-n IEI=2A Sep22 @sic R5s221179 Baseline Moving sic@ */
      t3512Value              := p_T3512  /* cl. 9.11.2.5   O TLV 3 IEI=3B Jun23 @sic R5s230533 sic@ */
    }
  } // End of template m_NG_REGISTRATION_REQUEST

  template (present) NG_UpdateType cr_NG_Update (template (present) B1_Type p_NgRAN_RCU := ?,
  template (present) NG_UpdateType cr_NG_Update (template (present) B1_Type p_NgRAN_RCU := ?,
                                                 template (present) B1_Type p_SmsRequested := ?,
                                                 template (present) B1_Type p_SmsRequested := ?,
                                                 template (present) B2_Type p_EPS_PNB_CIoT := ?,
                                                 template (present) B2_Type p_EPS_PNB_CIoT := ?,
@@ -1426,6 +1521,14 @@ module NG_NAS_Templates {
    registrationType    := p_Type
    registrationType    := p_Type
  };
  };


  template (value) RegistrationType cs_RegistrationType (template (value) B3_Type p_Type,
                                                         template (value) B1_Type p_FOR) :=
  { /* 24.501 cl. 9.11.3.7 */
    /* @status    APPROVED (IMS, NR5GC, NR5GC_IRAT, POS) */
    fOR                 := p_FOR,
    registrationType    := p_Type
  };

  template (value) CAGInfoList cs_EmptyCAGInfoList :=
  template (value) CAGInfoList cs_EmptyCAGInfoList :=
  { /* @status    APPROVED (NR5GC) */
  { /* @status    APPROVED (NR5GC) */
    /* 24.501 cl. 9.11.3.18A */
    /* 24.501 cl. 9.11.3.18A */