diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn
index 30502982f8b6e32282e34f239168ead7b2245977..efaac5f969b4c39f7051e9aaeff0d46476feff4d 100644
--- a/33128/r18/TS33128Payloads.asn
+++ b/33128/r18/TS33128Payloads.asn
@@ -194,7 +194,18 @@ XIRIEvent ::= CHOICE
-- AMF events, see 6.2.2.2.9 continued from choice 5
aMFRANHandoverCommand [113] AMFRANHandoverCommand,
- aMFRANHandoverRequest [114] AMFRANHandoverRequest
+ aMFRANHandoverRequest [114] AMFRANHandoverRequest,
+
+ -- EES events, see clause 7.X.2
+ eESEECRegistration [201] EESEECRegistration,
+ eESEASDiscovery [202] EESEASDiscovery,
+ eESEASDiscoverySubscription [203] EESEASDiscoverySubscription,
+ eESEASDiscoveryNotification [204] EESEASDiscoveryNotification,
+ eESAppContextRelocation [205] EESAppContextRelocation,
+ eESACRSubscription [206] EESACRSubscription,
+ eESACRNotification [207] EESACRNotification,
+ eESEECContextRelocation [208] EESEECContextRelocation,
+ eESStartOfInterceptionWithRegisteredEEC [209] EESStartOfInterceptionWithRegisteredEEC
}
-- ==============
@@ -379,7 +390,19 @@ IRIEvent ::= CHOICE
-- AMF events, see 6.2.2.2.9 continued from choice 5
aMFRANHandoverCommand [113] AMFRANHandoverCommand,
- aMFRANHandoverRequest [114] AMFRANHandoverRequest
+ aMFRANHandoverRequest [114] AMFRANHandoverRequest,
+
+ -- EES events, see clause 7.X.2
+ eESEECRegistration [201] EESEECRegistration,
+ eESEASDiscovery [202] EESEASDiscovery,
+ eESEASDiscoverySubscription [203] EESEASDiscoverySubscription,
+ eESEASDiscoveryNotification [204] EESEASDiscoveryNotification,
+ eESAppContextRelocation [205] EESAppContextRelocation,
+ eESACRSubscription [206] EESACRSubscription,
+ eESACRNotification [207] EESACRNotification,
+ eESEECContextRelocation [208] EESEECContextRelocation,
+ eESStartOfInterceptionWithRegisteredEEC [209] EESStartOfInterceptionWithRegisteredEEC
+
}
IRITargetIdentifier ::= SEQUENCE
@@ -452,6 +475,7 @@ S8HRBearerInfo ::= SEQUENCE
-- ================
-- HR LI parameters
+
-- ================
N9HRMessageCause ::= ENUMERATED
@@ -3414,6 +3438,376 @@ RCDDisplayInfo ::= SEQUENCE
jcl [3] OCTET STRING OPTIONAL
}
+-- =================
+-- EES definitions
+-- =================
+
+-- See clause 7.X.2.2 for details of this structure
+EESEECRegistration ::= SEQUENCE
+{
+ registrationType [1] RegistrationType,
+ eECID [2] UTF8String,
+ gPSI [3] GPSI OPTIONAL,
+ aCProfiles [4] ACProfiles OPTIONAL,
+ eECServiceContSupport [5] ACRScenarios OPTIONAL,
+ expirationTime [6] Timestamp OPTIONAL,
+ eECContextID [7] UTF8String OPTIONAL,
+ srcEESID [8] UTF8String OPTIONAL,
+ unfulfilledACProfiles [9] UnfulfilledACProfiles OPTIONAL,
+ failureResponse [10] FailureResponse OPTIONAL
+}
+
+-- See clause 7.X.2.3 for details of this structure
+EESEASDiscovery ::= SEQUENCE
+{
+ eECID [1] UTF8String,
+ gPSI [2] GPSI OPTIONAL,
+ eASDiscoveryFilter [3] EASDiscoveryFilter OPTIONAL,
+ eECServiceContSupport [4] ACRScenarios OPTIONAL,
+ uELocation [5] Location OPTIONAL,
+ eASTargetDNAIs [6] DNAIs OPTIONAL,
+ discoveredEAS [7] DiscoveredEAS OPTIONAL,
+ failureResponse [8] FailureResponse OPTIONAL
+}
+
+-- See clause 7.X.2.4 for details of this structure
+EESEASDiscoverySubscription ::= SEQUENCE
+{
+ eECID [1] UTF8String,
+ gPSI [2] GPSI OPTIONAL,
+ subscriptionType [3] SubscriptionType,
+ eASEventType [4] EASEventType,
+ eASDiscoveryFilter [5] EASDiscoveryFilter OPTIONAL,
+ eASDynamicInfoFilter [6] EASDynamicInfoFilter OPTIONAL,
+ eECServiceContSupport [7] ACRScenarios OPTIONAL,
+ expirationTime [8] Timestamp OPTIONAL,
+ subscriptionId [9] UTF8String OPTIONAL,
+ failureResponse [10] FailureResponse OPTIONAL
+}
+
+-- See clause 7.X.2.5 for details of this structure
+EESEASDiscoveryNotification ::= SEQUENCE
+{
+ subscriptionID [1] UTF8String,
+ eventType [2] EASEventType,
+ discoveredEAS [3] DiscoveredEAS,
+ failureResponse [4] FailureResponse OPTIONAL
+}
+
+-- See clause 7.X.2.6 for details of this structure
+EESAppContextRelocation ::= SEQUENCE
+{
+ eECID [1] UTF8String,
+ gPSI [2] GPSI OPTIONAL,
+ eESACRDetOrInit [3] EESACRDetOrInit
+}
+
+EESACRDetOrInit ::= CHOICE
+{
+ aCRDetermineReq [1] ACRDetermineReq,
+ aCRInitiateReq [2] ACRInitiateReq
+}
+
+ACRDetermineReq ::= SEQUENCE
+{
+ eASID [1] EASID OPTIONAL,
+ aCID [2] ACID OPTIONAL,
+ sEASEndpoint [3] EASEndpoint
+}
+
+ACRInitiateReq ::= SEQUENCE
+{
+ eASID [1] EASID OPTIONAL,
+ aCID [2] ACID OPTIONAL,
+ tEASEndpoint [3] EASEndpoint,
+ sEASEndpoint [4] EASEndpoint OPTIONAL,
+ previousTEASEndpoint [5] EASEndpoint OPTIONAL,
+ routeReq [6] RouteToLocation OPTIONAL
+}
+
+-- See clause 7.X.2.7 for details of this structure
+EESACRSubscription ::= SEQUENCE
+{
+ eECID [1] UTF8String,
+ gPSI [2] GPSI OPTIONAL,
+ subscriptionType [3] SubscriptionType,
+ expirationTime [4] Timestamp OPTIONAL,
+ eASIDs [5] EASIDs,
+ aCIDs [6] ACIDs OPTIONAL,
+ eventIDs [7] ACREventIDs OPTIONAL,
+ subscriptionId [8] UTF8String OPTIONAL,
+ failureResponse [9] FailureResponse OPTIONAL
+}
+
+-- See clause 7.X.2.8 for details of this structure
+EESACRNotification ::= SEQUENCE
+{
+ subscriptionID [1] UTF8String,
+ eASID [2] EASID,
+ eventID [3] ACREventIDs,
+ targetInfo [4] TargetInfo OPTIONAL,
+ aCRRes [5] BOOLEAN OPTIONAL,
+ failReason [6] UTF8String OPTIONAL
+}
+
+-- See clause 7.X.2.9 for details of this structure
+EESEECContextRelocation ::= SEQUENCE
+{
+ eECID [1] UTF8String,
+ eECContextID [2] UTF8String,
+ gPSI [3] GPSI OPTIONAL,
+ uELoc [4] Location OPTIONAL,
+ aCProfiles [5] ACProfiles OPTIONAL
+}
+
+-- See clause 7.X.2.10 for details of this structure
+EESStartOfInterceptionWithRegisteredEEC ::= SEQUENCE
+{
+ eECID [1] UTF8String,
+ gPSI [2] GPSI OPTIONAL,
+ aCProfiles [3] ACProfiles OPTIONAL,
+ eECServiceContSupport [4] ACRScenarios OPTIONAL,
+ expirationTime [5] Timestamp OPTIONAL,
+ eECContextID [6] UTF8String OPTIONAL,
+ srcEESID [7] UTF8String OPTIONAL,
+ unfulfilledACProfiles [8] UnfulfilledACProfiles OPTIONAL,
+ timeOfRegistration [9] Timestamp OPTIONAL
+}
+
+-- ==============
+-- EES parameters
+-- ==============
+
+RegistrationType ::= ENUMERATED
+{
+ registration (1),
+ registrationUpdate(2),
+ deregistration(3)
+}
+
+ACProfiles ::= SET OF ACProfile
+
+ACProfile ::= SEQUENCE
+{
+ aCID [1] ACID,
+ aCType [2] UTF8String OPTIONAL,
+ aCSchedule [3] Daytime OPTIONAL,
+ expACGeoServArea [4] Location OPTIONAL,
+ eASsInfo [5] EASsInfo OPTIONAL,
+ aCServiceContSupport [6] ACRScenarios OPTIONAL
+}
+
+ACID ::= UTF8String
+
+ACRScenarios ::= SET OF ACRScenario
+
+ACRScenario ::= ENUMERATED
+{
+ eECInitiated(1),
+ eECExecutedViaSourceEES(2),
+ eECExecutedViaTargetEES(3),
+ sourceEASDecided(4),
+ sourceEESExecuted(5),
+ eELManagedACR(6)
+}
+
+UnfulfilledACProfiles ::= SET OF UnfulfilledACProfile
+
+UnfulfilledACProfile ::= SEQUENCE
+{
+ aCID [1] ACID,
+ reason [2] UnfulfilledACProfileReason
+}
+
+UnfulfilledACProfileReason ::= ENUMERATED
+{
+ eASNotAvailable(1),
+ requirementsUnfulfilled(2)
+}
+
+EASID ::= UTF8String
+
+EASsInfo ::= SET OF EASInfo
+
+EASInfo ::= SEQUENCE
+{
+ eASID [1] EASID,
+ expectedSvcKPIs [2] ServiceKPIs OPTIONAL,
+ minimumReqSvcKPIs [3] ServiceKPIs OPTIONAL
+}
+
+ServiceKPIs ::= SEQUENCE
+{
+ connectionBandwidth [1] INTEGER OPTIONAL,
+ requestRate [2] INTEGER OPTIONAL,
+ responseTime [3] INTEGER OPTIONAL,
+ requestedAvailability [4] INTEGER OPTIONAL,
+ requestedCompute [5] OCTET STRING OPTIONAL,
+ requestedGraphCompute [6] OCTET STRING OPTIONAL,
+ requestedMemory [7] OCTET STRING OPTIONAL,
+ requestedStorage [8] OCTET STRING OPTIONAL
+}
+
+FailureResponse ::= ENUMERATED
+{
+ error400(1),
+ error401(2),
+ error403(3),
+ error404(4),
+ error406(5),
+ error411(6),
+ error413(7),
+ error415(8),
+ error429(9),
+ error500(10),
+ error503(11)
+}
+
+EASDiscoveryFilter ::= CHOICE
+{
+ aCsCharacteristics [1] ACProfiles,
+ eASCharacteristics [2] EASsCharacteristics
+}
+
+EASsCharacteristics ::= SET OF EASCharacteristics
+
+EASCharacteristics ::= SEQUENCE
+{
+ eASID [1] EASID OPTIONAL,
+ aSPID [2] UTF8String OPTIONAL,
+ eASType [3] UTF8String OPTIONAL,
+ eASSchedule [4] Daytime OPTIONAL,
+ eASProfile [5] EASProfile OPTIONAL,
+ eASServiceArea [6] Location OPTIONAL,
+ eASServicePermLevel [7] UTF8String OPTIONAL,
+ eASServiceFeatures [8] EASServiceFeatures OPTIONAL
+}
+
+DNAIs ::= SET OF DNAI
+
+DiscoveredEAS ::= SEQUENCE
+{
+ eASProfile [1] EASProfile,
+ lifetime [2] INTEGER OPTIONAL
+}
+
+EASProfile ::= SEQUENCE
+{
+ eASID [1] EASID,
+ eASEndpoint [2] EASEndpoint,
+ aCIDs [3] ACIDs OPTIONAL,
+ aSPID [4] UTF8String OPTIONAL,
+ eASType [5] UTF8String OPTIONAL,
+ eASDescription [6] UTF8String OPTIONAL,
+ eASSchedule [7] Daytime OPTIONAL,
+ eASServiceArea [8] Location OPTIONAL,
+ eASServiceKPIs [9] ServiceKPIs OPTIONAL,
+ eASServicePermLevel [10] UTF8String OPTIONAL,
+ eASServiceFeatures [11] EASServiceFeatures OPTIONAL,
+ eASServiceContSupport [12] ACRScenarios OPTIONAL,
+ appLocs [13] RouteToLocations OPTIONAL,
+ eASStatus [14] EASStatus OPTIONAL
+}
+
+EASStatus ::= ENUMERATED
+{
+ enabled(1),
+ disabled(2)
+}
+
+EASEndpoint ::= SEQUENCE
+{
+ fQDN [1] FQDN OPTIONAL,
+ iPv4Addresses [2] IPv4Addresses OPTIONAL,
+ iPv6Addresses [3] IPv6Addresses OPTIONAL,
+ uRI [4] UTF8String OPTIONAL
+}
+
+RouteToLocations ::= SET OF RouteToLocation
+EASServiceFeatures ::= SET OF EASServiceFeature
+EASServiceFeature ::= UTF8String
+ACIDs ::= SET OF ACID
+IPv4Addresses ::= SET OF IPv4Address
+IPv6Addresses ::= SET OF IPv6Address
+
+SubscriptionType ::= ENUMERATED
+{
+ subscription(1),
+ subscriptionUpdate(2),
+ unsubscription(3)
+}
+
+EASEventType ::= ENUMERATED
+{
+ eASAvailabilityChange(1),
+ eASDynamicInfoChange(2)
+}
+
+EASDynamicInfoFilter ::= SEQUENCE
+{
+ eASId [1] EASID,
+ eASStatus [2] BOOLEAN,
+ eASAcIDs [3] BOOLEAN,
+ eASDesc [4] BOOLEAN,
+ eASPt [5] BOOLEAN,
+ eASFeature [6] BOOLEAN,
+ eASSchedule [7] BOOLEAN,
+ eASSvcArea [8] BOOLEAN,
+ eASSvcKpi [9] BOOLEAN,
+ eASSvcCont [10] BOOLEAN
+}
+
+EASIDs ::= SET OF EASID
+
+ACREventIDs ::= ENUMERATED
+{
+ targetInformation(1),
+ aCRComplete(2)
+}
+
+TargetInfo ::= SEQUENCE
+{
+ discoveredEAS [1] DiscoveredEAS,
+ targetEESInfo [2] EDNConfigurationInfo OPTIONAL
+}
+
+EDNConfigurationInfo ::= SEQUENCE
+{
+ eDNConnectionInfo [1] EDNConnectionInfo,
+ eESsInfo [2] EESsInfo,
+ lifetime [3] INTEGER OPTIONAL
+}
+
+EDNConnectionInfo ::= SEQUENCE
+{
+ dNN [1] DNN OPTIONAL,
+ sNSSAI [2] SNSSAI OPTIONAL,
+ serviceArea [3] Location OPTIONAL
+}
+
+EESsInfo ::= SET OF EESInfo
+
+EESInfo ::= SEQUENCE
+{
+ eESID [1] EESID,
+ eESEndpoint [2] EESEndpoint,
+ eASIDs [3] EASIDs OPTIONAL,
+ serviceArea [4] Location OPTIONAL,
+ dNAIS [5] DNAIs OPTIONAL
+}
+
+EESID ::= UTF8String
+
+EESEndpoint ::= SEQUENCE
+{
+ fQDN [1] FQDN OPTIONAL,
+ iPv4Addresses [2] IPv4Addresses OPTIONAL,
+ iPv6Addresses [3] IPv6Addresses OPTIONAL,
+ uRI [4] UTF8String OPTIONAL
+}
+
+
+
-- ===================
-- 5G LALS definitions
-- ===================
diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd
index d5f9cfef7976d6b5098595cd1df63e755f40c322..f5a58f283d7365ebb66ce70489bc1350a66c9995 100644
--- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd
+++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd
@@ -36,6 +36,17 @@
+
+
+
+
+
+
+
+
+
+
+