Merge branch 'cr/TS33128/0181' of forge.3gpp.org:sa3/li-trial into test_merge (17d629e1) · Commits · SA3 / SA3LI Trial

33128/r17/TS33128Payloads.asn

+59 −2

Original line number	Diff line number	Diff line
		@@ -2440,7 +2440,13 @@ N3GALocation ::= SEQUENCE
		tAI [1] TAI OPTIONAL,
		n3IWFID [2] N3IWFIDNGAP OPTIONAL,
		uEIPAddr [3] IPAddr OPTIONAL,
		portNumber [4] INTEGER OPTIONAL
		portNumber [4] INTEGER OPTIONAL,
		tNAPID [5] TNAPID OPTIONAL,
		tWAPID [6] TWAPID OPTIONAL,
		hFCNodeID [7] HFCNodeID OPTIONAL,
		gLI [8] GLI OPTIONAL,
		w5GBANLineType [9] W5GBANLineType OPTIONAL,
		gCI [10] GCI OPTIONAL
		}

		-- TS 38.413 [23], clause 9.3.2.4
		@@ -2463,7 +2469,9 @@ ANNodeID ::= CHOICE
		n3IWFID [1] N3IWFIDSBI,
		gNbID [2] GNbID,
		nGENbID [3] NGENbID,
		eNbID [4] ENbID
		eNbID [4] ENbID,
		wAGFID [5] WAGFID,
		tNGFID [6] TNGFID
		}

		-- TS 38.413 [23], clause 9.3.1.6
		@@ -2514,6 +2522,51 @@ N3IWFIDNGAP ::= BIT STRING (SIZE(16))
		-- TS 29.571 [17], clause 5.4.4.28
		N3IWFIDSBI ::= UTF8String

		-- TS 29.571 [17], clause 5.4.4.28 and table 5.4.2-1
		TNGFID ::= UTF8String

		-- TS 29.571 [17], clause 5.4.4.28 and table 5.4.2-1
		WAGFID ::= UTF8String

		-- TS 29.571 [17], clause 5.4.4.62
		TNAPID ::= SEQUENCE
		{
		sSID [1] SSID OPTIONAL,
		bSSID [2] BSSID OPTIONAL,
		civicAddress [3] CivicAddressBytes OPTIONAL
		}

		-- TS 29.571 [17], clause 5.4.4.64
		TWAPID ::= SEQUENCE
		{
		sSID [1] SSID OPTIONAL,
		bSSID [2] BSSID OPTIONAL,
		civicAddress [3] CivicAddressBytes OPTIONAL
		}

		-- TS 29.571 [17], clause 5.4.4.62 and clause 5.4.4.64
		SSID ::= UTF8String

		-- TS 29.571 [17], clause 5.4.4.62 and clause 5.4.4.64
		BSSID ::= UTF8String

		-- TS 29.571 [17], clause 5.4.4.36 and table 5.4.2-1
		HFCNodeID ::= UTF8String

		-- TS 29.571 [17], clause 5.4.4.10 and table 5.4.2-1
		-- Contains the original binary data i.e. value of the YAML field after base64 encoding is removed
		GLI ::= OCTET STRING (SIZE(0..150))

		-- TS 29.571 [17], clause 5.4.4.10 and table 5.4.2-1
		GCI ::= UTF8String

		-- TS 29.571 [17], clause 5.4.4.10 and clause 5.4.3.33
		W5GBANLineType ::= ENUMERATED
		{
		dSL(1),
		pON(2)
		}

		-- TS 29.571 [17], table 5.4.2-1
		TAC ::= OCTET STRING (SIZE(2..3))

		@@ -2733,6 +2786,10 @@ CivicAddress ::= SEQUENCE
		pom [31] UTF8String OPTIONAL
		}

		-- TS 29.571 [17], clauses 5.4.4.62 and 5.4.4.64
		-- Contains the original binary data i.e. value of the YAML field after base64 encoding is removed
		CivicAddressBytes ::= OCTET STRING

		-- TS 29.572 [24], clause 6.1.6.2.15
		PositioningMethodAndUsage ::= SEQUENCE
		{