Resolving merge conflicts (6b7b39a8) · Commits · SA3 / SA3 LI

33128/r19/TS33128Payloads.asn

+104 −2

Original line number	Diff line number	Diff line
		@@ -284,11 +284,20 @@ XIRIEvent ::= CHOICE
		iMSDataChannelSetup [162] IMSDataChannelSetup,
		iMSDataChannelModification [163] IMSDataChannelModification,
		iMSDataChannelTermination [164] IMSDataChannelTermination,

		-- NEF events, see clause 7.7.X.1
		nEF5GVNGroupCreation [165] NEF5GVNGroupCreation,
		nEF5GVNGroupUpdate [166] NEF5GVNGroupUpdate,
		nEF5GVNGroupDeletion [167] NEF5GVNGroupDeletion,
		nEF5GVNGroupQuery [168] NEF5GVNGroupQuery
		nEF5GVNGroupQuery [168] NEF5GVNGroupQuery,

		-- HSS events, see clause 7.2.3.3
		hSSSubscriberRecordChange [169] HSSSubscriberRecordChange,

		-- IMS HSS events, see clause 7.2.4.3
		iMSHSSServingSystemMessage [170] IMSHSSServingSystemMessage,
		iMSHSSStartOfInterceptionWithRegisteredTarget [171] IMSHSSStartOfInterceptionWithRegisteredTarget,
		iMSHSSSubscriberRecordChange [172] IMSHSSSubscriberRecordChange
		}

		-- ==============
		@@ -561,7 +570,15 @@ IRIEvent ::= CHOICE
		nEF5GVNGroupCreation [165] NEF5GVNGroupCreation,
		nEF5GVNGroupUpdate [166] NEF5GVNGroupUpdate,
		nEF5GVNGroupDeletion [167] NEF5GVNGroupDeletion,
		nEF5GVNGroupQuery [168] NEF5GVNGroupQuery
		nEF5GVNGroupQuery [168] NEF5GVNGroupQuery,

		-- HSS events, see clause 7.2.3.3
		hSSSubscriberRecordChange [169] HSSSubscriberRecordChange,

		-- IMS HSS events, see clause 7.2.4.3
		iMSHSSServingSystemMessage [170] IMSHSSServingSystemMessage,
		iMSHSSStartOfInterceptionWithRegisteredTarget [171] IMSHSSStartOfInterceptionWithRegisteredTarget,
		iMSHSSSubscriberRecordChange [172] IMSHSSSubscriberRecordChange
		}

		IRITargetIdentifier ::= SEQUENCE
		@@ -6190,6 +6207,12 @@ HSSStartOfInterceptionWithRegisteredTarget ::= SEQUENCE
		pSUserState [3] SBIType
		}

		HSSSubscriberRecordChange ::= SEQUENCE
		{
		hSSIdentities [1] SEQUENCE OF HSSIdentities,
		subscriberRecordChangePayload [2] SubscriberRecordChangePayload OPTIONAL
		}

		HSSIdentities ::= SEQUENCE
		{
		ePSSubscriberIDs [1] EPSSubscriberIDs OPTIONAL,
		@@ -6201,6 +6224,85 @@ SubscriptionDataSets ::= CHOICE
		iMSSubscriptionData [1] SBIType
		}

		-- =======================
		-- IMS HSS definitions
		-- =======================

		IMSHSSServingSystemMessage ::= SEQUENCE
		{
		iMSI [1] IMSI,
		oldPLMNID [2] PLMNID,
		authorizationRequest [3] AuthorizationRequest,
		roamingIndicator [4] RoamingIndicator,
		deregistrationData [5] SBIType OPTIONAL
		}

		IMSHSSStartOfInterceptionWithRegisteredTarget ::= SEQUENCE
		{
		hSSIdentities [1] SEQUENCE OF HSSIdentities,
		iMSProfileData [2] SBIType OPTIONAL,
		iMSRegistrationStatus [3] IMSRegistrationStatus
		}

		IMSHSSSubscriberRecordChange ::= SEQUENCE
		{
		hSSIdentities [1] SEQUENCE OF HSSIdentities,
		iMSProfileData [2] SBIType OPTIONAL,
		mSISDNs [3] SEQUENCE (SIZE(1..MAX)) OF MSISDN OPTIONAL,
		iMEI [4] IMEI OPTIONAL,
		previousIMEI [5] IMEI OPTIONAL
		}

		IMSRegistrationStatus ::= ENUMERATED
		{
		initialRegistration(1),
		reregistration(2),
		timeoutDeregistration(3),
		userDeregistration(4),
		administrativeDeregistration(5),
		authenticationFailure(6),
		authenticationTimeout(7),
		unregisteredUser(8)
		}

		AuthorizationRequest ::= SEQUENCE
		{
		authorizationType [1] AuthorizationType,
		iMPI [2] IMPI,
		visitedNetworkIdentifier [3] UTF8String
		}

		AuthorizationType ::= ENUMERATED
		{
		registration(1),
		deregistration(2)
		}

		SubscriberRecordChangePayload ::= CHOICE
		{
		iMEIUpdateInfo [1] IMEIUpdateInfo,
		iMEIUpdateResponse [2] IMEIUpdateResponse,
		roamingStatusUpdateInfo [3] RoamingStatusUpdateInfo
		}

		IMEIUpdateInfo ::= SEQUENCE
		{
		iMSI [1] IMSI OPTIONAL,
		iMEI [2] IMEI OPTIONAL,
		iMEISV [3] IMEISV OPTIONAL
		}

		IMEIUpdateResponse ::= SEQUENCE
		{
		previousIMEI [1] IMEI OPTIONAL,
		previousIMEISV [2] IMEISV OPTIONAL
		}

		RoamingStatusUpdateInfo ::= SEQUENCE
		{
		iMSI [1] IMSI OPTIONAL,
		pLMNID [2] PLMNID OPTIONAL
		}
		-- =================
		-- Common Parameters
		-- =================