encdec merge (786dfddd) · Commits · INT - Core Network and Interoperability Testing / 5G Core / NAS

ttcn/Lib3GPP/NG_NAS/NG_NAS_TypeDefs.ttcn

+47 −60

Original line number	Diff line number	Diff line
		@@ -51,13 +51,11 @@ module NG_NAS_TypeDefs {
		RAND rand optional, /* cl. 9.11.3.16 O TV 17 IEI=21 */
		AUTN autn optional, /* cl. 9.11.3.15 O TLV 18 IEI=20 */
		EAP_Message eapMessage optional /* cl. 9.11.2.2 O TLV-E 7-1503 IEI=78 */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======
		}with {
		variant "PRESENCE(spareHalfOctet='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//}with{variant "FIELDORDER(msb)"};
		// }

		type record NG_AUTHENTICATION_RESPONSE { /* 24.501 cl. 8.2.2
		Significance: dual
		@@ -68,13 +66,12 @@ module NG_NAS_TypeDefs {
		MessageType messageType, /* cl. 9.7 M V 1 */
		AuthenticationResponseParameter authResponseParam optional, /* cl. 9.11.3.17 O TLV 18 IEI=2D */
		EAP_Message eapMessage optional /* cl. 9.11.2.2 O TLV-E 7-1503 IEI=78 */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_AUTHENTICATION_RESULT { /* 24.501 cl. 8.2.3
		Significance: dual
		@@ -87,13 +84,12 @@ module NG_NAS_TypeDefs {
		NAS_KeySetIdentifier ngNasKeySetId, /* cl. 9.11.3.32 M V 1/2 */
		EAP_Message eapMessage, /* cl. 9.11.2.2 M LV-E 6-1502 */
		ABBA abba optional /* cl. 9.11.3.10 O TLV 3-n IEI=38 Dec18 */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_AUTHENTICATION_FAILURE { /* 24.501 cl. 8.2.4
		Significance: dual
		@@ -104,13 +100,12 @@ module NG_NAS_TypeDefs {
		MessageType messageType, /* cl. 9.7 M V 1 */
		GMM_GSM_Cause gmmCause, /* cl. 9.11.3.2 M V 1 */
		AuthenticationFailureParameter authFailureParam optional /* cl. 9.11.3.14 O TLV 16 IEI=30 */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_AUTHENTICATION_REJECT { /* 24.501 cl. 8.2.5
		Significance: dual
		@@ -120,13 +115,12 @@ module NG_NAS_TypeDefs {
		SecurityHeaderType securityHeaderType, /* cl. 9.3 M V 1/2 */
		MessageType messageType, /* cl. 9.7 M V 1 */
		EAP_Message eapMessage optional /* cl. 9.11.2.2 O TLV-E 7-1503 IEI=78 Dec18 */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_REGISTRATION_REQUEST { /* 24.501 cl. 8.2.6
		Significance: dual
		@@ -288,13 +282,12 @@ module NG_NAS_TypeDefs {
		AdditionalInformation additionalInfo optional, /* cl. 9.11.2.1 O TLV 3-n IEI=24 */
		MA_PDUSessionInfo maPDUSessionInfo optional, /* cl. 9.11.3.31A O TV 1 IEI=A Sep20 @sic R5s201387 Baseline Moving sic@ */
		ReleaseAssistanceInd releaseAssistanceInd optional /* cl. 9.11.3.46A O TV 1 IEI=F Sep20 @sic R5s201387 Baseline Moving sic@ */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_DL_NAS_TRANSPORT { /* 24.501 cl. 8.2.11
		Significance: dual
		@@ -311,13 +304,12 @@ module NG_NAS_TypeDefs {
		GMM_GSM_Cause gmmCause optional, /* cl. 9.11.3.2 O TV 2 IEI=58 */
		GPRS_Timer3 backOffTimerValue optional, /* cl. 9.11.2.5 O TLV 3 IEI=37 */
		GPRS_Timer3 lowerBoundTimerValue optional /* cl. 9.11.2.5 O TLV 3 IEI=3A Sep22 @sic R5s221179 Baseline Moving sic@ */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_DEREGISTRATION_REQUEST_MO { /* 24.501 cl. 8.2.12 (UE originating deregister)
		Significance: dual
		@@ -359,13 +351,12 @@ module NG_NAS_TypeDefs {
		GPRS_Timer3 lowerBoundTimerValue optional, /* cl. 9.11.2.5 O TLV 3 IEI=3A Sep22 @sic R5s221179 Baseline Moving sic@ */
		NG_TrackingAreaIdList forbidTAIList_Roaming optional, /* cl. 9.11.3.9 O TLV 9-114 IEI=1D Sep22 @sic R5s221179 Baseline Moving sic@ */
		NG_TrackingAreaIdList forbidTAIList_RegProvService optional /* cl. 9.11.3.9 O TLV 9-114 IEI=1E Sep22 @sic R5s221179 Baseline Moving sic@ */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_SERVICE_REQUEST { /* 24.501 cl. 8.2.16
		Significance: dual
		@@ -483,13 +474,12 @@ module NG_NAS_TypeDefs {
		MessageType messageType, /* cl. 9.7 M V 1 */
		SpareHalfOctet spareHalfOctet2, /* cl. 9.5 M V 1/2 */
		IdentityType identityType /* cl. 9.11.3.3 M V 1/2 */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_IDENTITY_RESPONSE { /* 24.501 cl. 8.2.22
		Significance: dual
		@@ -510,13 +500,12 @@ module NG_NAS_TypeDefs {
		MessageType messageType, /* cl. 9.7 M V 1 */
		SpareHalfOctet spareHalfOctet2, /* cl. 9.5 M V 1/2 */
		AccessType accessType /* cl. 9.11.3.11 M V 1/2 */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_NOTIFICATION_RESPONSE { /* 24.501 cl. 8.2.24
		Significance: dual
		@@ -545,13 +534,12 @@ module NG_NAS_TypeDefs {
		EAP_Message eapMessage optional, /* cl. 9.11.2.2 O TLV-E 7-1503 IEI=78 */
		ABBA abba optional, /* cl. 9.11.3.10 O TLV 4-n IEI=38 Dec18 */
		S1_UE_SecurityCapability replayedUESecurityCap optional /* cl. 9.11.3.48A O TLV 4-7 IEI=19 Dec18 @sic R5s190421 sic@*/
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H, spareHalfOctet2='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }

		type record NG_SECURITY_MODE_COMPLETE { /* 24.501 cl. 8.2.26
		Significance: dual
		@@ -584,13 +572,12 @@ module NG_NAS_TypeDefs {
		MessageAuthenticationCode messageAuthenticationCode, /* cl. 9.8 M V 4 */
		NAS_SequenceNumber sequenceNumber, /* cl. 9.10 M V 1 */
		NG_NAS_Message plainNASMessage /* cl. 9.9 M V 3-n */
		<<<<<<< HEAD
		}with{variant "FIELDORDER(msb)"};
		=======

		}with {
		variant "PRESENCE(spareHalfOctet='0'H)";
		}
		>>>>>>> 22d86add030cd3da835e95ca682f86332b832143
		//with{variant "FIELDORDER(msb)"};
		// }


		type record NG_GMM_STATUS { /* 24.501 cl. 8.2.29