From 98461915af6af84964e4bcc83c3811eeb107f68f Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 4 Oct 2024 08:55:05 +0000 Subject: [PATCH 1/4] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 94 ++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 32 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 83f86744d..a5f9bf503 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 19.0.0 + version: 18.8.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -169,6 +169,27 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' servedEESList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + Operation: + type: object + properties: + name: + type: string + allowedConsumers: + type: string + operationSemantics: + type: string + description: any of enumrated value + enum: + - REQUEST/RESPONSE + - SUBSCRIBE/NOTIFY + #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: type: object @@ -177,8 +198,36 @@ components: $ref: '#/components/schemas/ECSFunction-Multiple' EdgeDataNetwork: $ref: '#/components/schemas/EdgeDataNetwork-Multiple' - EASBundle: - $ref: '#/components/schemas/EASBundle-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- + ManagedFunction: + type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' +#-------- Definition of abstract IOCs -------------------------------------------- +#-------- Definition of Edge common IOCs -------------------------------------------- + ManagedEdgeNFService-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' +#-------- Definition of Edge common IOCs -------------------------------------------- + #-------- Definition of concrete IOCs -------------------------------------------- @@ -283,9 +332,10 @@ components: serviceContinuitySupport: type: boolean eASFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' registrationInfo: $ref: '#/components/schemas/RegistrationInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: @@ -397,30 +447,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - EASBundle-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - properties: - bundleIdentifier: - type: string - bundledEASIdentifier: - type: string - bundleType: - type: string - mainEASIdentifier: - type: string - coordinatedEASDiscovery: - type: boolean - coordinatedACR: - type: boolean - eDNAffinity: - type: string - description: any of enumrated value - enum: - - STRONG - - WEAK - - PREFERRED + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -456,17 +483,20 @@ components: type: array items: $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - EASBundle-Multiple: + ManagedEdgeNFService-Multiple: type: array items: - $ref: '#/components/schemas/EASBundle-Single' + $ref: '#/components/schemas/ManagedEdgeNFService-Single' + + + #--------------------------------- Definition ------------------------------------ resources-edgeNrm: oneOf: - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' - - $ref: '#/components/schemas/EESFunction-Single' + - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' - $ref: '#/components/schemas/EASRequirements-Single' - $ref: '#/components/schemas/EASProfile-Single' @@ -474,4 +504,4 @@ components: - $ref: '#/components/schemas/OperatorEdgeFederation-Single' - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - $ref: '#/components/schemas/EASResourceReservationJob-Single' - - $ref: '#/components/schemas/EASBundle-Single' + - $ref: '#/components/schemas/ManagedEdgeNFService-Single' -- GitLab From 0e044599a9988fc40e5c5bfdd8e5254ec80cc4ce Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 4 Oct 2024 09:10:58 +0000 Subject: [PATCH 2/4] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 42 ++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index a5f9bf503..d80dc7c0f 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.8.0 + version: 19.0.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -198,6 +198,9 @@ components: $ref: '#/components/schemas/ECSFunction-Multiple' EdgeDataNetwork: $ref: '#/components/schemas/EdgeDataNetwork-Multiple' + EASBundle: + $ref: '#/components/schemas/EASBundle-Multiple' + #-------- Definition of abstract IOCs -------------------------------------------- ManagedFunction: type: object @@ -332,10 +335,9 @@ components: serviceContinuitySupport: type: boolean eASFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' registrationInfo: $ref: '#/components/schemas/RegistrationInfo' - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: @@ -447,7 +449,30 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - + EASBundle-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + bundleIdentifier: + type: string + bundledEASIdentifier: + type: string + bundleType: + type: string + mainEASIdentifier: + type: string + coordinatedEASDiscovery: + type: boolean + coordinatedACR: + type: boolean + eDNAffinity: + type: string + description: any of enumrated value + enum: + - STRONG + - WEAK + - PREFERRED #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -483,20 +508,22 @@ components: type: array items: $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' + EASBundle-Multiple: + type: array + items: + $ref: '#/components/schemas/EASBundle-Single' ManagedEdgeNFService-Multiple: type: array items: $ref: '#/components/schemas/ManagedEdgeNFService-Single' - - #--------------------------------- Definition ------------------------------------ resources-edgeNrm: oneOf: - $ref: '#/components/schemas/EASFunction-Single' - $ref: '#/components/schemas/ECSFunction-Single' - - $ref: '#/components/schemas/EESFunction-Single' + - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' - $ref: '#/components/schemas/EASRequirements-Single' - $ref: '#/components/schemas/EASProfile-Single' @@ -504,4 +531,5 @@ components: - $ref: '#/components/schemas/OperatorEdgeFederation-Single' - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - $ref: '#/components/schemas/EASResourceReservationJob-Single' + - $ref: '#/components/schemas/EASBundle-Single' - $ref: '#/components/schemas/ManagedEdgeNFService-Single' -- GitLab From 989df7b87b5de7b700faf88a20f0cb4ebcdfb4e9 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 17 Oct 2024 08:27:34 +0000 Subject: [PATCH 3/4] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index d80dc7c0f..0183f3e77 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -201,13 +201,6 @@ components: EASBundle: $ref: '#/components/schemas/EASBundle-Multiple' -#-------- Definition of abstract IOCs -------------------------------------------- - ManagedFunction: - type: object - properties: - ManagedEdgeNFService: - $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' -#-------- Definition of abstract IOCs -------------------------------------------- #-------- Definition of Edge common IOCs -------------------------------------------- ManagedEdgeNFService-Single: allOf: @@ -339,6 +332,11 @@ components: registrationInfo: $ref: '#/components/schemas/RegistrationInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' + ECSFunction-Single: allOf: @@ -363,6 +361,10 @@ components: sharedECSInfo: $ref: '#/components/schemas/FederatedECSInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' EASRequirements-Single: allOf: -- GitLab From 82c1fb9bc80f8339b06796d35786814c63791041 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 17 Oct 2024 10:41:48 +0000 Subject: [PATCH 4/4] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 0183f3e77..24ce1f3fc 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -187,8 +187,8 @@ components: type: string description: any of enumrated value enum: - - REQUEST/RESPONSE - - SUBSCRIBE/NOTIFY + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: -- GitLab