From f210501bb59691b143f242493c289f2bbb7a7a80 Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 17 Jan 2022 10:35:17 +0000 Subject: [PATCH 01/40] Edge NRM --- OpenAPI/EdgeNRM | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 OpenAPI/EdgeNRM diff --git a/OpenAPI/EdgeNRM b/OpenAPI/EdgeNRM new file mode 100644 index 000000000..c7f72e43a --- /dev/null +++ b/OpenAPI/EdgeNRM @@ -0,0 +1,99 @@ +openapi: 3.0.1 +info: + title: 3GPP Edge NRM + version: 17.1.0 + description: >- + OAS 3.0.1 specification of the Edge NRM + © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.538; Edge NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.538/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + EASRequirements: + type: object + properties: + requiredEASservingLocation: + $ref: '#/components/schemas/ServingLocation' + ServingLocation: + type: object + properties: + geographicalLocation: + $ref: '#/components/schemas/GeoLoc' + tAi: + $ref: 'genericNrm.yaml#/components/schemas/TAI ' + GeoLoc: + type: object + properties: + civicAddress: + Type: String + lat: + type: float + long: + type: float + EDNConnectionInfo: + type: object + properties: + dNN: + Type: String + eDNServiceArea: + $ref: '#/components/schemas/ServingLocation' + + +#-------- Definition of concrete IOCs -------------------------------------------- + + SubNetwork-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + - type: object + properties: + DNFunction: + $ref: '5GCNrm.yaml#/components/schemas/DNFunction' + EASFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eASIdentifier: + Type: string + eASRequirements: + $ref: '#/components/schemas/EASRequirements' + ECSFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eCSAddress: + Type: string + providerIdentifier: + Type: string + eDNConnectionInfo: + $ref: '#/components/schemas/EASRequirements' +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + EASFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/EASFunction-Single' + ECSFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/ECSFunction-Single' -- GitLab From cea06ecb0c513037a3e8b6950048669e62a51257 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 17 Jan 2022 12:37:22 +0000 Subject: [PATCH 02/40] correct the file name --- OpenAPI/{EdgeNRM => EdgeNRM.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename OpenAPI/{EdgeNRM => EdgeNRM.yaml} (100%) diff --git a/OpenAPI/EdgeNRM b/OpenAPI/EdgeNRM.yaml similarity index 100% rename from OpenAPI/EdgeNRM rename to OpenAPI/EdgeNRM.yaml -- GitLab From 9b654229d196b7cb9a091779325ffd6a37709e18 Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 17 Jan 2022 13:19:11 +0000 Subject: [PATCH 03/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index c7f72e43a..caf9b1ce4 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -25,21 +25,21 @@ components: geographicalLocation: $ref: '#/components/schemas/GeoLoc' tAi: - $ref: 'genericNrm.yaml#/components/schemas/TAI ' + $ref: 'genericNrm.yaml#/components/schemas/TAI' GeoLoc: type: object properties: civicAddress: - Type: String + type: string lat: - type: float + type: integer long: - type: float + type: integer EDNConnectionInfo: type: object properties: dNN: - Type: String + type: string eDNServiceArea: $ref: '#/components/schemas/ServingLocation' @@ -69,7 +69,7 @@ components: - type: object properties: eASIdentifier: - Type: string + type: string eASRequirements: $ref: '#/components/schemas/EASRequirements' ECSFunction-Single: @@ -82,9 +82,9 @@ components: - type: object properties: eCSAddress: - Type: string + type: string providerIdentifier: - Type: string + type: string eDNConnectionInfo: $ref: '#/components/schemas/EASRequirements' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -96,4 +96,4 @@ components: ECSFunction-Multiple: type: array items: - $ref: '#/components/schemas/ECSFunction-Single' + $ref: '#/components/schemas/ECSFunction-Single' -- GitLab From bff6b3adc74bbb6cd33aeb7bab0afa452daeee6c Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 20 Jan 2022 10:55:07 +0000 Subject: [PATCH 04/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 55 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index caf9b1ce4..4eb36f6da 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -14,11 +14,6 @@ components: schemas: #-------- Definition of types----------------------------------------------------- - EASRequirements: - type: object - properties: - requiredEASservingLocation: - $ref: '#/components/schemas/ServingLocation' ServingLocation: type: object properties: @@ -57,38 +52,44 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' - type: object properties: - DNFunction: - $ref: '5GCNrm.yaml#/components/schemas/DNFunction' + Subnetwork: + $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Multiple' EASFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - attributes: - allOf: - - type: object - properties: - eASIdentifier: - type: string - eASRequirements: - $ref: '#/components/schemas/EASRequirements' + eASIdentifier: + type: string + eASRequirements: + $ref: '#/components/schemas/EASRequirements' ECSFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - attributes: - allOf: - - type: object - properties: - eCSAddress: - type: string - providerIdentifier: - type: string - eDNConnectionInfo: - $ref: '#/components/schemas/EASRequirements' + eCSAddress: + type: string + providerIdentifier: + type: string + eDNConnectionInfo: + $ref: '#/components/schemas/EDNConnectionInfo' + EASRequirements: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + requiredEASservingLocation: + $ref: '#/components/schemas/ServingLocation' + + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' + EASFunction-Multiple: type: array items: -- GitLab From 7c030fbd03a314046aa4a8b09d20232976bcdc3f Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 20 Jan 2022 17:23:19 +0000 Subject: [PATCH 05/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 98 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 82 insertions(+), 16 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 4eb36f6da..a9ce08cfe 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -1,3 +1,10 @@ +P.1 General +This annex contains the OpenAPI definition of the Edge NRM in YAML format. +The Information Service (IS) of the Edge NRM is defined in clause 6. +Mapping rules to produce the OpenAPI definition based on the IS are defined in TS 32.160 [10]. +P.2 Solution Set (SS) definitions +P.2.1 OpenAPI document "edgeNrm.yml" + openapi: 3.0.1 info: title: 3GPP Edge NRM @@ -11,8 +18,8 @@ externalDocs: url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.538/ paths: {} components: - schemas: - + schemas: + #-------- Definition of types----------------------------------------------------- ServingLocation: type: object @@ -49,31 +56,73 @@ components: attributes: allOf: - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' - type: object properties: Subnetwork: $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Multiple' + ECSFunction: + $ref: '#/components/schemas/ECSFunction-Multiple' + EdgeDataNetwork: + $ref: '#/components/schemas/EdgeDataNetwork-Multiple' + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + + EdgeDataNetwork-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + EASFunction: + $ref: '#/components/schemas/EASFunction-Multiple' + EESFunction: + $ref: '#/components/schemas/EESFunction-Multiple' + EASFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: - eASIdentifier: - type: string - eASRequirements: - $ref: '#/components/schemas/EASRequirements' + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + eASIdentifier: + type: string + eASRequirementsRef: + $ref: '#/components/schemas/EASRequirements' + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + EESFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + eESIdentifier: + type: string + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + ECSFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: - eCSAddress: - type: string - providerIdentifier: - type: string - eDNConnectionInfo: - $ref: '#/components/schemas/EDNConnectionInfo' + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + eCSAddress: + type: string + providerIdentifier: + type: string + eDNConnectionInfo: + $ref: '#/components/schemas/EDNConnectionInfo' + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + EASRequirements: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -89,7 +138,6 @@ components: type: array items: $ref: '#/components/schemas/SubNetwork-Single' - EASFunction-Multiple: type: array items: @@ -98,3 +146,21 @@ components: type: array items: $ref: '#/components/schemas/ECSFunction-Single' + EESFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/EESFunction-Single' + EdgeDataNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/EdgeDataNetwork-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-edgeNrm: + oneOf: + - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/EASFunction-Single' + - $ref: '#/components/schemas/ECSFunction-Single' + - $ref: '#/components/schemas/EESFunction-Single' + - $ref: '#/components/schemas/EdgeDataNetwork-Single' -- GitLab From 91f21e3ddbabd4f371a03e4f51e0e8b99b26943a Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 21 Jan 2022 15:56:33 +0000 Subject: [PATCH 06/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index a9ce08cfe..de614631e 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -1,10 +1,3 @@ -P.1 General -This annex contains the OpenAPI definition of the Edge NRM in YAML format. -The Information Service (IS) of the Edge NRM is defined in clause 6. -Mapping rules to produce the OpenAPI definition based on the IS are defined in TS 32.160 [10]. -P.2 Solution Set (SS) definitions -P.2.1 OpenAPI document "edgeNrm.yml" - openapi: 3.0.1 info: title: 3GPP Edge NRM -- GitLab From 26dba66627749f9d63ce7523cb8a7b09205eebd1 Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 24 Jan 2022 12:47:32 +0000 Subject: [PATCH 07/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index de614631e..632b937e3 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -37,6 +37,21 @@ components: type: string eDNServiceArea: $ref: '#/components/schemas/ServingLocation' + AffinityAntiAffinity: + type: object + properties: + affinityEAS: + type: string + antiAffinityEAS: + type: string + VirtualResource: + type: object + properties: + virtualMemory: + type: integer + virtualDisk: + type: integer + #-------- Definition of concrete IOCs -------------------------------------------- @@ -81,6 +96,8 @@ components: properties: eASIdentifier: type: string + eESAddress: + type: string eASRequirementsRef: $ref: '#/components/schemas/EASRequirements' - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' @@ -123,6 +140,12 @@ components: properties: requiredEASservingLocation: $ref: '#/components/schemas/ServingLocation' + affinityAntiAffinity: + $ref: '#/components/schemas/AffinityAntiAffinity' + serviceContinuity: + type: boolean + virtualResource: + $ref: '#/components/schemas/VirtualResource' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From 662135b9229a12ae52fc2cf1938963386a9f30d7 Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 25 Jan 2022 05:05:42 +0000 Subject: [PATCH 08/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 632b937e3..8d333a06f 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -20,7 +20,7 @@ components: geographicalLocation: $ref: '#/components/schemas/GeoLoc' tAi: - $ref: 'genericNrm.yaml#/components/schemas/TAI' + $ref: 'genericNrm.yaml#/components/schemas/Tai' GeoLoc: type: object properties: @@ -99,7 +99,7 @@ components: eESAddress: type: string eASRequirementsRef: - $ref: '#/components/schemas/EASRequirements' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' EESFunction-Single: allOf: -- GitLab From 5d2bed674d37ea576b4fe0cbc9791fa7c4f48e2f Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 25 Jan 2022 06:38:22 +0000 Subject: [PATCH 09/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 8d333a06f..deb0c92ce 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 17.1.0 + version: 17.0.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -20,7 +20,7 @@ components: geographicalLocation: $ref: '#/components/schemas/GeoLoc' tAi: - $ref: 'genericNrm.yaml#/components/schemas/Tai' + $ref: 'nrNrm.yaml#/components/schemas/Tai' GeoLoc: type: object properties: @@ -100,7 +100,7 @@ components: type: string eASRequirementsRef: $ref: 'comDefs.yaml#/components/schemas/Dn' - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EESFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -113,7 +113,7 @@ components: properties: eESIdentifier: type: string - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: allOf: @@ -131,9 +131,9 @@ components: type: string eDNConnectionInfo: $ref: '#/components/schemas/EDNConnectionInfo' - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - EASRequirements: + EASRequirements-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object @@ -180,3 +180,4 @@ components: - $ref: '#/components/schemas/ECSFunction-Single' - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' + - $ref: '#/components/schemas/EASRequirements-Single' -- GitLab From 11585817972f1053147f3830317db9762d21b93b Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 25 Jan 2022 06:47:22 +0000 Subject: [PATCH 10/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index deb0c92ce..ea32406e8 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -67,7 +67,7 @@ components: - type: object properties: Subnetwork: - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Multiple' + $ref: '#/components/schemas/SubNetwork-Multiple' ECSFunction: $ref: '#/components/schemas/ECSFunction-Multiple' EdgeDataNetwork: -- GitLab From cf27b6b7dfd9ac069f82e83c0b5c72283b685461 Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 25 Jan 2022 09:00:01 +0000 Subject: [PATCH 11/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index ea32406e8..62606bd06 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -37,22 +37,6 @@ components: type: string eDNServiceArea: $ref: '#/components/schemas/ServingLocation' - AffinityAntiAffinity: - type: object - properties: - affinityEAS: - type: string - antiAffinityEAS: - type: string - VirtualResource: - type: object - properties: - virtualMemory: - type: integer - virtualDisk: - type: integer - - #-------- Definition of concrete IOCs -------------------------------------------- @@ -140,13 +124,6 @@ components: properties: requiredEASservingLocation: $ref: '#/components/schemas/ServingLocation' - affinityAntiAffinity: - $ref: '#/components/schemas/AffinityAntiAffinity' - serviceContinuity: - type: boolean - virtualResource: - $ref: '#/components/schemas/VirtualResource' - #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From 4742cb5de5de2dae0b4e3ebe5c50799b0ba330c1 Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 25 Jan 2022 09:09:14 +0000 Subject: [PATCH 12/40] Update EdgeNRM.yaml -- GitLab From 2e2346eaf10d5f459323b6810bca93b59f6910b6 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 11:43:18 +0000 Subject: [PATCH 13/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 62606bd06..35310a13f 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -37,6 +37,20 @@ components: type: string eDNServiceArea: $ref: '#/components/schemas/ServingLocation' + AffinityAntiAffinity: + type: object + properties: + affinityEAS: + type: string + antiAffinityEAS: + type: string + VirtualResource: + type: object + properties: + virtualMemory: + type: integer + virtualDisk: + type: integer #-------- Definition of concrete IOCs -------------------------------------------- @@ -84,6 +98,8 @@ components: type: string eASRequirementsRef: $ref: 'comDefs.yaml#/components/schemas/Dn' + eASAddress: + type: string - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EESFunction-Single: allOf: @@ -124,6 +140,13 @@ components: properties: requiredEASservingLocation: $ref: '#/components/schemas/ServingLocation' + affinityAntiAffinity: + $ref: '#/components/schemas/AffinityAntiAffinity' + serviceContinuity: + type: boolean + virtualResource: + $ref: '#/components/schemas/VirtualResource' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From 7ad8bebd4a7703079a983775c1109292daa100a4 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 11:55:41 +0000 Subject: [PATCH 14/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 35310a13f..f14533af5 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -131,6 +131,8 @@ components: type: string eDNConnectionInfo: $ref: '#/components/schemas/EDNConnectionInfo' + eESFuncitonRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASRequirements-Single: -- GitLab From c5a2776a9562bd30dc1ea1d22350adbb38bc1105 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 12:06:41 +0000 Subject: [PATCH 15/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index f14533af5..a7a7cfddc 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -51,6 +51,16 @@ components: type: integer virtualDisk: type: integer + SoftwareImageInfo: + type: object + properties: + minimumDisk: + type: integer + minimumRAM: + type: integer + swImageRef: + type: string + #-------- Definition of concrete IOCs -------------------------------------------- @@ -113,7 +123,17 @@ components: properties: eESIdentifier: type: string - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' + eESServingLocation: + $ref: '#/components/schemas/ServingLocation' + eESAddress: + type: string + softwareImageInfo: + $ref: '#/components/schemas/SoftwareImageInfo' + serviceContinuitySupport: + type: boolean + eASFunctonRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: allOf: -- GitLab From 3cc58f2146b89576b86e5b01725c201a21682ace Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 12:11:04 +0000 Subject: [PATCH 16/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index a7a7cfddc..71f5b67e8 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -133,7 +133,7 @@ components: type: boolean eASFunctonRef: $ref: 'comDefs.yaml#/components/schemas/Dn' - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: allOf: -- GitLab From b7175e0dfd640f5263e456c92416b8e22926dd8f Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 16:27:05 +0000 Subject: [PATCH 17/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 71f5b67e8..126a3e6dd 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -19,16 +19,30 @@ components: properties: geographicalLocation: $ref: '#/components/schemas/GeoLoc' - tAi: + topologicalLocation: + $ref: '#/components/schemas/TopologicalServiceArea' + TopologicalServiceArea: + type: object + properties: + cellIdList: + type: integer + trackingAreaIdList: $ref: 'nrNrm.yaml#/components/schemas/Tai' + servingPLMN: + $ref: 'nrNrm.yaml#/components/schemas/PLMNId' GeoLoc: type: object properties: - civicAddress: + geographicalCoordinates: + $ref: '#/components/schemas/GeographicalCoordinates' + civicLocation: type: string - lat: + GeographicalCoordinates: + type: object + properties: + lattitude: type: integer - long: + longitude: type: integer EDNConnectionInfo: type: object @@ -85,6 +99,12 @@ components: EdgeDataNetwork-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + ednIdentifier: + type: string + eDNConnectionInfo: + $ref: '#/components/schemas/EDNConnectionInfo' - type: object properties: EASFunction: @@ -132,7 +152,7 @@ components: serviceContinuitySupport: type: boolean eASFunctonRef: - $ref: 'comDefs.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/DnList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: @@ -149,10 +169,12 @@ components: type: string providerIdentifier: type: string - eDNConnectionInfo: - $ref: '#/components/schemas/EDNConnectionInfo' + edgeDataNetworkRef: + $ref: '#/components/schemas/DnList' eESFuncitonRef: $ref: 'comDefs.yaml#/components/schemas/Dn' + softwareImageInfo: + $ref: '#/components/schemas/SoftwareImageInfo' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASRequirements-Single: @@ -168,7 +190,8 @@ components: type: boolean virtualResource: $ref: '#/components/schemas/VirtualResource' - + softwareImageInfo: + $ref: '#/components/schemas/SoftwareImageInfo' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From 4b038a2ee28b63c007dfc10e5f7f3b3c88f3cc2e Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 16:28:40 +0000 Subject: [PATCH 18/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 126a3e6dd..3a6d74edd 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -170,7 +170,7 @@ components: providerIdentifier: type: string edgeDataNetworkRef: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' eESFuncitonRef: $ref: 'comDefs.yaml#/components/schemas/Dn' softwareImageInfo: -- GitLab From 79675cc405b2f30f416295984429310d32a5abd9 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 16:34:53 +0000 Subject: [PATCH 19/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 3a6d74edd..d811e1e5a 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -29,7 +29,7 @@ components: trackingAreaIdList: $ref: 'nrNrm.yaml#/components/schemas/Tai' servingPLMN: - $ref: 'nrNrm.yaml#/components/schemas/PLMNId' + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' GeoLoc: type: object properties: -- GitLab From e341e177e97401d0d5cfd76c55923d87a79d4592 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 16:46:25 +0000 Subject: [PATCH 20/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index d811e1e5a..d1d712a62 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -152,7 +152,7 @@ components: serviceContinuitySupport: type: boolean eASFunctonRef: - $ref: 'comDefs.yaml#/components/schemas/DnList' + $ref: 'genericNrm.yaml#/components/schemas/DnList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: @@ -170,7 +170,7 @@ components: providerIdentifier: type: string edgeDataNetworkRef: - $ref: 'comDefs.yaml#/components/schemas/DnList' + $ref: 'genericNrm.yaml#/components/schemas/DnList' eESFuncitonRef: $ref: 'comDefs.yaml#/components/schemas/Dn' softwareImageInfo: -- GitLab From ab354778e6db6154530e00e249d660b6f32b2c5a Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 17 Jan 2022 10:35:17 +0000 Subject: [PATCH 21/40] Edge NRM --- OpenAPI/EdgeNRM | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 OpenAPI/EdgeNRM diff --git a/OpenAPI/EdgeNRM b/OpenAPI/EdgeNRM new file mode 100644 index 000000000..c7f72e43a --- /dev/null +++ b/OpenAPI/EdgeNRM @@ -0,0 +1,99 @@ +openapi: 3.0.1 +info: + title: 3GPP Edge NRM + version: 17.1.0 + description: >- + OAS 3.0.1 specification of the Edge NRM + © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.538; Edge NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.538/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + EASRequirements: + type: object + properties: + requiredEASservingLocation: + $ref: '#/components/schemas/ServingLocation' + ServingLocation: + type: object + properties: + geographicalLocation: + $ref: '#/components/schemas/GeoLoc' + tAi: + $ref: 'genericNrm.yaml#/components/schemas/TAI ' + GeoLoc: + type: object + properties: + civicAddress: + Type: String + lat: + type: float + long: + type: float + EDNConnectionInfo: + type: object + properties: + dNN: + Type: String + eDNServiceArea: + $ref: '#/components/schemas/ServingLocation' + + +#-------- Definition of concrete IOCs -------------------------------------------- + + SubNetwork-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + - type: object + properties: + DNFunction: + $ref: '5GCNrm.yaml#/components/schemas/DNFunction' + EASFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eASIdentifier: + Type: string + eASRequirements: + $ref: '#/components/schemas/EASRequirements' + ECSFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eCSAddress: + Type: string + providerIdentifier: + Type: string + eDNConnectionInfo: + $ref: '#/components/schemas/EASRequirements' +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + EASFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/EASFunction-Single' + ECSFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/ECSFunction-Single' -- GitLab From 4341b1e1a1bc4eab29e1045204e55890b578e8f5 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 17 Jan 2022 12:37:22 +0000 Subject: [PATCH 22/40] correct the file name --- OpenAPI/{EdgeNRM => EdgeNRM.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename OpenAPI/{EdgeNRM => EdgeNRM.yaml} (100%) diff --git a/OpenAPI/EdgeNRM b/OpenAPI/EdgeNRM.yaml similarity index 100% rename from OpenAPI/EdgeNRM rename to OpenAPI/EdgeNRM.yaml -- GitLab From 0aa8ae0d18bbea49239eb29c66d31289a1a917d8 Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 17 Jan 2022 13:19:11 +0000 Subject: [PATCH 23/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index c7f72e43a..caf9b1ce4 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -25,21 +25,21 @@ components: geographicalLocation: $ref: '#/components/schemas/GeoLoc' tAi: - $ref: 'genericNrm.yaml#/components/schemas/TAI ' + $ref: 'genericNrm.yaml#/components/schemas/TAI' GeoLoc: type: object properties: civicAddress: - Type: String + type: string lat: - type: float + type: integer long: - type: float + type: integer EDNConnectionInfo: type: object properties: dNN: - Type: String + type: string eDNServiceArea: $ref: '#/components/schemas/ServingLocation' @@ -69,7 +69,7 @@ components: - type: object properties: eASIdentifier: - Type: string + type: string eASRequirements: $ref: '#/components/schemas/EASRequirements' ECSFunction-Single: @@ -82,9 +82,9 @@ components: - type: object properties: eCSAddress: - Type: string + type: string providerIdentifier: - Type: string + type: string eDNConnectionInfo: $ref: '#/components/schemas/EASRequirements' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -96,4 +96,4 @@ components: ECSFunction-Multiple: type: array items: - $ref: '#/components/schemas/ECSFunction-Single' + $ref: '#/components/schemas/ECSFunction-Single' -- GitLab From ffbf0d48f026e794e22206c465146efc38e1e70d Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 20 Jan 2022 10:55:07 +0000 Subject: [PATCH 24/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 55 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index caf9b1ce4..4eb36f6da 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -14,11 +14,6 @@ components: schemas: #-------- Definition of types----------------------------------------------------- - EASRequirements: - type: object - properties: - requiredEASservingLocation: - $ref: '#/components/schemas/ServingLocation' ServingLocation: type: object properties: @@ -57,38 +52,44 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' - type: object properties: - DNFunction: - $ref: '5GCNrm.yaml#/components/schemas/DNFunction' + Subnetwork: + $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Multiple' EASFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - attributes: - allOf: - - type: object - properties: - eASIdentifier: - type: string - eASRequirements: - $ref: '#/components/schemas/EASRequirements' + eASIdentifier: + type: string + eASRequirements: + $ref: '#/components/schemas/EASRequirements' ECSFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - attributes: - allOf: - - type: object - properties: - eCSAddress: - type: string - providerIdentifier: - type: string - eDNConnectionInfo: - $ref: '#/components/schemas/EASRequirements' + eCSAddress: + type: string + providerIdentifier: + type: string + eDNConnectionInfo: + $ref: '#/components/schemas/EDNConnectionInfo' + EASRequirements: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + requiredEASservingLocation: + $ref: '#/components/schemas/ServingLocation' + + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' + EASFunction-Multiple: type: array items: -- GitLab From 8f8329d9f1ab31fc4852c46d37451ec076b97de3 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 20 Jan 2022 17:23:19 +0000 Subject: [PATCH 25/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 98 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 82 insertions(+), 16 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 4eb36f6da..a9ce08cfe 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -1,3 +1,10 @@ +P.1 General +This annex contains the OpenAPI definition of the Edge NRM in YAML format. +The Information Service (IS) of the Edge NRM is defined in clause 6. +Mapping rules to produce the OpenAPI definition based on the IS are defined in TS 32.160 [10]. +P.2 Solution Set (SS) definitions +P.2.1 OpenAPI document "edgeNrm.yml" + openapi: 3.0.1 info: title: 3GPP Edge NRM @@ -11,8 +18,8 @@ externalDocs: url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.538/ paths: {} components: - schemas: - + schemas: + #-------- Definition of types----------------------------------------------------- ServingLocation: type: object @@ -49,31 +56,73 @@ components: attributes: allOf: - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr' - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' - type: object properties: Subnetwork: $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Multiple' + ECSFunction: + $ref: '#/components/schemas/ECSFunction-Multiple' + EdgeDataNetwork: + $ref: '#/components/schemas/EdgeDataNetwork-Multiple' + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + + EdgeDataNetwork-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + EASFunction: + $ref: '#/components/schemas/EASFunction-Multiple' + EESFunction: + $ref: '#/components/schemas/EESFunction-Multiple' + EASFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: - eASIdentifier: - type: string - eASRequirements: - $ref: '#/components/schemas/EASRequirements' + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + eASIdentifier: + type: string + eASRequirementsRef: + $ref: '#/components/schemas/EASRequirements' + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + EESFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + eESIdentifier: + type: string + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + ECSFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: - eCSAddress: - type: string - providerIdentifier: - type: string - eDNConnectionInfo: - $ref: '#/components/schemas/EDNConnectionInfo' + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + eCSAddress: + type: string + providerIdentifier: + type: string + eDNConnectionInfo: + $ref: '#/components/schemas/EDNConnectionInfo' + - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + EASRequirements: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -89,7 +138,6 @@ components: type: array items: $ref: '#/components/schemas/SubNetwork-Single' - EASFunction-Multiple: type: array items: @@ -98,3 +146,21 @@ components: type: array items: $ref: '#/components/schemas/ECSFunction-Single' + EESFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/EESFunction-Single' + EdgeDataNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/EdgeDataNetwork-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-edgeNrm: + oneOf: + - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/EASFunction-Single' + - $ref: '#/components/schemas/ECSFunction-Single' + - $ref: '#/components/schemas/EESFunction-Single' + - $ref: '#/components/schemas/EdgeDataNetwork-Single' -- GitLab From ddf038f204b40d45594db53632731e2b915a7df3 Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 21 Jan 2022 15:56:33 +0000 Subject: [PATCH 26/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index a9ce08cfe..de614631e 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -1,10 +1,3 @@ -P.1 General -This annex contains the OpenAPI definition of the Edge NRM in YAML format. -The Information Service (IS) of the Edge NRM is defined in clause 6. -Mapping rules to produce the OpenAPI definition based on the IS are defined in TS 32.160 [10]. -P.2 Solution Set (SS) definitions -P.2.1 OpenAPI document "edgeNrm.yml" - openapi: 3.0.1 info: title: 3GPP Edge NRM -- GitLab From 0e7052a227a3f7e3821ffec1c9d04ae17f3be873 Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 24 Jan 2022 12:47:32 +0000 Subject: [PATCH 27/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index de614631e..632b937e3 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -37,6 +37,21 @@ components: type: string eDNServiceArea: $ref: '#/components/schemas/ServingLocation' + AffinityAntiAffinity: + type: object + properties: + affinityEAS: + type: string + antiAffinityEAS: + type: string + VirtualResource: + type: object + properties: + virtualMemory: + type: integer + virtualDisk: + type: integer + #-------- Definition of concrete IOCs -------------------------------------------- @@ -81,6 +96,8 @@ components: properties: eASIdentifier: type: string + eESAddress: + type: string eASRequirementsRef: $ref: '#/components/schemas/EASRequirements' - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' @@ -123,6 +140,12 @@ components: properties: requiredEASservingLocation: $ref: '#/components/schemas/ServingLocation' + affinityAntiAffinity: + $ref: '#/components/schemas/AffinityAntiAffinity' + serviceContinuity: + type: boolean + virtualResource: + $ref: '#/components/schemas/VirtualResource' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From af4ad9c229616f9e72696faaf70137571822cfd8 Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 25 Jan 2022 05:05:42 +0000 Subject: [PATCH 28/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 632b937e3..8d333a06f 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -20,7 +20,7 @@ components: geographicalLocation: $ref: '#/components/schemas/GeoLoc' tAi: - $ref: 'genericNrm.yaml#/components/schemas/TAI' + $ref: 'genericNrm.yaml#/components/schemas/Tai' GeoLoc: type: object properties: @@ -99,7 +99,7 @@ components: eESAddress: type: string eASRequirementsRef: - $ref: '#/components/schemas/EASRequirements' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' EESFunction-Single: allOf: -- GitLab From d16abea4f39eeb618216bd5328b3013cd92f72cf Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 25 Jan 2022 06:38:22 +0000 Subject: [PATCH 29/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 8d333a06f..deb0c92ce 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 17.1.0 + version: 17.0.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -20,7 +20,7 @@ components: geographicalLocation: $ref: '#/components/schemas/GeoLoc' tAi: - $ref: 'genericNrm.yaml#/components/schemas/Tai' + $ref: 'nrNrm.yaml#/components/schemas/Tai' GeoLoc: type: object properties: @@ -100,7 +100,7 @@ components: type: string eASRequirementsRef: $ref: 'comDefs.yaml#/components/schemas/Dn' - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EESFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -113,7 +113,7 @@ components: properties: eESIdentifier: type: string - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: allOf: @@ -131,9 +131,9 @@ components: type: string eDNConnectionInfo: $ref: '#/components/schemas/EDNConnectionInfo' - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - EASRequirements: + EASRequirements-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object @@ -180,3 +180,4 @@ components: - $ref: '#/components/schemas/ECSFunction-Single' - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' + - $ref: '#/components/schemas/EASRequirements-Single' -- GitLab From 4f320ced900f458318e33468b4fdcd2643a1a075 Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 25 Jan 2022 06:47:22 +0000 Subject: [PATCH 30/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index deb0c92ce..ea32406e8 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -67,7 +67,7 @@ components: - type: object properties: Subnetwork: - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Multiple' + $ref: '#/components/schemas/SubNetwork-Multiple' ECSFunction: $ref: '#/components/schemas/ECSFunction-Multiple' EdgeDataNetwork: -- GitLab From 22a8cba613f55d2f0fa8db7d8ef300aa25c836d3 Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 25 Jan 2022 09:00:01 +0000 Subject: [PATCH 31/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index ea32406e8..62606bd06 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -37,22 +37,6 @@ components: type: string eDNServiceArea: $ref: '#/components/schemas/ServingLocation' - AffinityAntiAffinity: - type: object - properties: - affinityEAS: - type: string - antiAffinityEAS: - type: string - VirtualResource: - type: object - properties: - virtualMemory: - type: integer - virtualDisk: - type: integer - - #-------- Definition of concrete IOCs -------------------------------------------- @@ -140,13 +124,6 @@ components: properties: requiredEASservingLocation: $ref: '#/components/schemas/ServingLocation' - affinityAntiAffinity: - $ref: '#/components/schemas/AffinityAntiAffinity' - serviceContinuity: - type: boolean - virtualResource: - $ref: '#/components/schemas/VirtualResource' - #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From d13f0f183696253feb660dcae38036d5384f3d9b Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 11:43:18 +0000 Subject: [PATCH 32/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 62606bd06..35310a13f 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -37,6 +37,20 @@ components: type: string eDNServiceArea: $ref: '#/components/schemas/ServingLocation' + AffinityAntiAffinity: + type: object + properties: + affinityEAS: + type: string + antiAffinityEAS: + type: string + VirtualResource: + type: object + properties: + virtualMemory: + type: integer + virtualDisk: + type: integer #-------- Definition of concrete IOCs -------------------------------------------- @@ -84,6 +98,8 @@ components: type: string eASRequirementsRef: $ref: 'comDefs.yaml#/components/schemas/Dn' + eASAddress: + type: string - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EESFunction-Single: allOf: @@ -124,6 +140,13 @@ components: properties: requiredEASservingLocation: $ref: '#/components/schemas/ServingLocation' + affinityAntiAffinity: + $ref: '#/components/schemas/AffinityAntiAffinity' + serviceContinuity: + type: boolean + virtualResource: + $ref: '#/components/schemas/VirtualResource' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From de56e64446fe76a26fdf46f0355894929ed1435e Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 11:55:41 +0000 Subject: [PATCH 33/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 35310a13f..f14533af5 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -131,6 +131,8 @@ components: type: string eDNConnectionInfo: $ref: '#/components/schemas/EDNConnectionInfo' + eESFuncitonRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASRequirements-Single: -- GitLab From 8913ca5aad8d93cc9ebffcc4feb133ac935bbbb6 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 12:06:41 +0000 Subject: [PATCH 34/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index f14533af5..a7a7cfddc 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -51,6 +51,16 @@ components: type: integer virtualDisk: type: integer + SoftwareImageInfo: + type: object + properties: + minimumDisk: + type: integer + minimumRAM: + type: integer + swImageRef: + type: string + #-------- Definition of concrete IOCs -------------------------------------------- @@ -113,7 +123,17 @@ components: properties: eESIdentifier: type: string - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' + eESServingLocation: + $ref: '#/components/schemas/ServingLocation' + eESAddress: + type: string + softwareImageInfo: + $ref: '#/components/schemas/SoftwareImageInfo' + serviceContinuitySupport: + type: boolean + eASFunctonRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: allOf: -- GitLab From b63c3d164b6196f4174a7f9e5e7b1588dad59d27 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 12:11:04 +0000 Subject: [PATCH 35/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index a7a7cfddc..71f5b67e8 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -133,7 +133,7 @@ components: type: boolean eASFunctonRef: $ref: 'comDefs.yaml#/components/schemas/Dn' - - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: allOf: -- GitLab From fcb6d58fc1cb6c5c9d4e06622a480156b7cd7e44 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 16:27:05 +0000 Subject: [PATCH 36/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 71f5b67e8..126a3e6dd 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -19,16 +19,30 @@ components: properties: geographicalLocation: $ref: '#/components/schemas/GeoLoc' - tAi: + topologicalLocation: + $ref: '#/components/schemas/TopologicalServiceArea' + TopologicalServiceArea: + type: object + properties: + cellIdList: + type: integer + trackingAreaIdList: $ref: 'nrNrm.yaml#/components/schemas/Tai' + servingPLMN: + $ref: 'nrNrm.yaml#/components/schemas/PLMNId' GeoLoc: type: object properties: - civicAddress: + geographicalCoordinates: + $ref: '#/components/schemas/GeographicalCoordinates' + civicLocation: type: string - lat: + GeographicalCoordinates: + type: object + properties: + lattitude: type: integer - long: + longitude: type: integer EDNConnectionInfo: type: object @@ -85,6 +99,12 @@ components: EdgeDataNetwork-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + ednIdentifier: + type: string + eDNConnectionInfo: + $ref: '#/components/schemas/EDNConnectionInfo' - type: object properties: EASFunction: @@ -132,7 +152,7 @@ components: serviceContinuitySupport: type: boolean eASFunctonRef: - $ref: 'comDefs.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/DnList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: @@ -149,10 +169,12 @@ components: type: string providerIdentifier: type: string - eDNConnectionInfo: - $ref: '#/components/schemas/EDNConnectionInfo' + edgeDataNetworkRef: + $ref: '#/components/schemas/DnList' eESFuncitonRef: $ref: 'comDefs.yaml#/components/schemas/Dn' + softwareImageInfo: + $ref: '#/components/schemas/SoftwareImageInfo' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASRequirements-Single: @@ -168,7 +190,8 @@ components: type: boolean virtualResource: $ref: '#/components/schemas/VirtualResource' - + softwareImageInfo: + $ref: '#/components/schemas/SoftwareImageInfo' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From 2cd920b2951e0f6dabcc48c3d84615aabf464ce5 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 16:28:40 +0000 Subject: [PATCH 37/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 126a3e6dd..3a6d74edd 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -170,7 +170,7 @@ components: providerIdentifier: type: string edgeDataNetworkRef: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' eESFuncitonRef: $ref: 'comDefs.yaml#/components/schemas/Dn' softwareImageInfo: -- GitLab From f0d449479b32d8a49fdfe1f3c274a5c31ca08283 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 16:34:53 +0000 Subject: [PATCH 38/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index 3a6d74edd..d811e1e5a 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -29,7 +29,7 @@ components: trackingAreaIdList: $ref: 'nrNrm.yaml#/components/schemas/Tai' servingPLMN: - $ref: 'nrNrm.yaml#/components/schemas/PLMNId' + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' GeoLoc: type: object properties: -- GitLab From a6baeae8d3fb500eb554be04ee72527158c417f0 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 16:46:25 +0000 Subject: [PATCH 39/40] Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index d811e1e5a..d1d712a62 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -152,7 +152,7 @@ components: serviceContinuitySupport: type: boolean eASFunctonRef: - $ref: 'comDefs.yaml#/components/schemas/DnList' + $ref: 'genericNrm.yaml#/components/schemas/DnList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: @@ -170,7 +170,7 @@ components: providerIdentifier: type: string edgeDataNetworkRef: - $ref: 'comDefs.yaml#/components/schemas/DnList' + $ref: 'genericNrm.yaml#/components/schemas/DnList' eESFuncitonRef: $ref: 'comDefs.yaml#/components/schemas/Dn' softwareImageInfo: -- GitLab From e9e3c045f4a4cc21989fc4d5aa3cbcacf61ac8be Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 15 Feb 2022 02:58:19 +0000 Subject: [PATCH 40/40] after rebase, DnList is moved to comDefs.yaml, hence Update EdgeNRM.yaml --- OpenAPI/EdgeNRM.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml index d1d712a62..d811e1e5a 100644 --- a/OpenAPI/EdgeNRM.yaml +++ b/OpenAPI/EdgeNRM.yaml @@ -152,7 +152,7 @@ components: serviceContinuitySupport: type: boolean eASFunctonRef: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: @@ -170,7 +170,7 @@ components: providerIdentifier: type: string edgeDataNetworkRef: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' eESFuncitonRef: $ref: 'comDefs.yaml#/components/schemas/Dn' softwareImageInfo: -- GitLab