From 833332061ace64d6a0a40be1182c96e0d214630d Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 6 Aug 2024 08:41:09 +0000 Subject: [PATCH 1/3] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 38 ++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 0848b77d4..2d4d40ee5 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -158,7 +158,20 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' servedEESList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - + BundleRequirements: + type: object + properties: + coordinatedEASDiscovery: + type: boolean + coordinatedACR: + type: boolean + eDNAffinity: + type: string + description: any of enumrated value + enum: + - STRONG + - WEAK + - PREFERRED #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: @@ -168,6 +181,8 @@ components: $ref: '#/components/schemas/ECSFunction-Multiple' EdgeDataNetwork: $ref: '#/components/schemas/EdgeDataNetwork-Multiple' + EASBundle: + $ref: '#/components/schemas/EASBundle-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- @@ -382,7 +397,21 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - + EASDundle-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + bundleIdentifier: + type: string + bundledEASIdentifier: + type: string + bundleType: + type: string + mainEASIdentifier: + type: string + bunbleRequirements: + $ref: '#/components/schemas/BundleRequirements' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -418,6 +447,10 @@ components: type: array items: $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' + EASBundle-Multiple: + type: array + items: + $ref: '#/components/schemas/EASBundle-Single' #--------------------------------- Definition ------------------------------------ @@ -434,3 +467,4 @@ components: - $ref: '#/components/schemas/OperatorEdgeFederation-Single' - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - $ref: '#/components/schemas/EASResourceReservationJob-Single' + - $ref: '#/components/schemas/EASBundle-Single' -- GitLab From 8210867a1a5e208796c7f79e7e28ae07d3843d85 Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 6 Aug 2024 08:55:47 +0000 Subject: [PATCH 2/3] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 2d4d40ee5..0efb48c0f 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -397,7 +397,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' edgeDataNetworkRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - EASDundle-Single: + EASBundle-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -410,7 +410,7 @@ components: type: string mainEASIdentifier: type: string - bunbleRequirements: + bundleRequirements: $ref: '#/components/schemas/BundleRequirements' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -450,9 +450,7 @@ components: EASBundle-Multiple: type: array items: - $ref: '#/components/schemas/EASBundle-Single' - - + $ref: '#/components/schemas/EASBundle-Single' #--------------------------------- Definition ------------------------------------ resources-edgeNrm: -- GitLab From bc12d6782696e7852bba7eaba6c8a73ef76be6e7 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 8 Aug 2024 05:32:57 +0000 Subject: [PATCH 3/3] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 0efb48c0f..eaec572d8 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -158,21 +158,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' servedEESList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - BundleRequirements: - type: object - properties: - coordinatedEASDiscovery: - type: boolean - coordinatedACR: - type: boolean - eDNAffinity: - type: string - description: any of enumrated value - enum: - - STRONG - - WEAK - - PREFERRED - #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: type: object @@ -410,8 +395,17 @@ components: type: string mainEASIdentifier: type: string - bundleRequirements: - $ref: '#/components/schemas/BundleRequirements' + 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 ---------------------- @@ -457,7 +451,7 @@ components: 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' -- GitLab