From 42a08cd0a01959068c2da7d4d014ac9fa5d322e7 Mon Sep 17 00:00:00 2001 From: shumim Date: Wed, 5 Jan 2022 14:04:33 +0800 Subject: [PATCH 01/84] fix stage3 definition --- OpenAPI/5gcNrm.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index b36c96012..7e9c9debd 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1162,7 +1162,7 @@ components: DDNMFFunction-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1585,7 +1585,7 @@ components: type: boolean EP_N33-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1698,7 +1698,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_Npc4-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1712,7 +1712,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_Npc6-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1726,7 +1726,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_Npc7-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1740,7 +1740,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' EP_Npc8-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: @@ -1769,7 +1769,7 @@ components: FiveQICharacteristics-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object properties: fiveQIValue: @@ -2202,6 +2202,7 @@ components: - $ref: '#/components/schemas/ScpFunction-Single' - $ref: '#/components/schemas/NefFunction-Single' - $ref: '#/components/schemas/NsacfFunction-Single' + - $ref: '#/components/schemas/DDNMFFunction-Single' - $ref: '#/components/schemas/ExternalAmfFunction-Single' - $ref: '#/components/schemas/ExternalNrfFunction-Single' @@ -2242,6 +2243,11 @@ components: - $ref: '#/components/schemas/EP_N33-Single' - $ref: '#/components/schemas/EP_N60-Single' + - $ref: '#/components/schemas/EP_Npc4-Single' + - $ref: '#/components/schemas/EP_Npc6-Single' + - $ref: '#/components/schemas/EP_Npc7-Single' + - $ref: '#/components/schemas/EP_Npc8-Single' + - $ref: '#/components/schemas/EP_S5C-Single' - $ref: '#/components/schemas/EP_S5U-Single' - $ref: '#/components/schemas/EP_Rx-Single' -- GitLab From f210501bb59691b143f242493c289f2bbb7a7a80 Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 17 Jan 2022 10:35:17 +0000 Subject: [PATCH 02/84] 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 03/84] 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 04/84] 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 05/84] 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 06/84] 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 e395c510e5a468a847c15b6b230785cfbb8b3872 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Jan 2022 08:16:57 +0000 Subject: [PATCH 07/84] CR0670 Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 63 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 2f6304902..2379906ed 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -566,6 +566,34 @@ components: items: type: string + DnnSmfInfoItem: + type: object + properties: + dnn: + type: string + dnaiList: + type: array + items: string + + SNssaiSmfInfoItem: + type: object + properties: + sNSSAI: + $ref: 'nrNrm.yaml#/components/schemas/Snssai' + dnnSmfInfoList: + type: array + items: + $ref: '#/components/schemas/DnnSmfInfoItem' + + IpAddr: + type: object + properties: + ipv4Addr: + type: string + ipv6Addr: + type: string + ipv6Prefix: + type: string #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -769,14 +797,41 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - plmnIdList: - $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' + pLMNInfoList: + $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList' nRTACList: $ref: '#/components/schemas/TACList' sBIFqdn: type: string - snssaiList: - $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + sNssaiSmfInfoList: + type: array + items: + $ref: '#/components/schemas/SNssaiSmfInfoItem' + taiList: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/Tai' + taiRangeList: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/TaiRange' + pwgFqdn: + type: string + pgwAddrList: + type: array + items: + $ref: '#/components/schemas/IpAddr' + accessType: + type: enum + priority: + type: integer + cNSIIdList: + $ref: '#/components/schemas/CNSIIdList' + vsmfSupportInd: + type: boolean + pwgFqdnList: + type: array + items: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: -- GitLab From 2d860f55a99f3f622f6787e730242511c0c7cfa9 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Jan 2022 08:33:55 +0000 Subject: [PATCH 08/84] fix validation issue Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 2379906ed..5912c7bd0 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -573,7 +573,8 @@ components: type: string dnaiList: type: array - items: string + items: + type: string SNssaiSmfInfoItem: type: object @@ -820,7 +821,7 @@ components: pgwAddrList: type: array items: - $ref: '#/components/schemas/IpAddr' + $ref: '#/components/schemas/IpAddr' accessType: type: enum priority: @@ -831,7 +832,8 @@ components: type: boolean pwgFqdnList: type: array - items: string + items: + type: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: -- GitLab From dd0a03430800b4d8e59b3b64eee2eeae253a8acc Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Jan 2022 09:00:09 +0000 Subject: [PATCH 09/84] fix validation issue Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 5912c7bd0..24c3dfa77 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -595,6 +595,13 @@ components: type: string ipv6Prefix: type: string + + AccessType: + type: string + enum: + - 3GPP_ACCESS + - NON_3GPP_ACCESS + #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -823,7 +830,7 @@ components: items: $ref: '#/components/schemas/IpAddr' accessType: - type: enum + $ref: '#/components/schemas/AccessType' priority: type: integer cNSIIdList: -- GitLab From 785a37e202902a0b966db23a17958ca6c69b2014 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Jan 2022 09:27:10 +0000 Subject: [PATCH 10/84] fix validation issue by external reference Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 24c3dfa77..eec6a9e7b 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -596,12 +596,6 @@ components: ipv6Prefix: type: string - AccessType: - type: string - enum: - - 3GPP_ACCESS - - NON_3GPP_ACCESS - #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -830,7 +824,7 @@ components: items: $ref: '#/components/schemas/IpAddr' accessType: - $ref: '#/components/schemas/AccessType' + $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29571_CommonData.yaml#/components/schemas/AccessType' priority: type: integer cNSIIdList: -- GitLab From 91f21e3ddbabd4f371a03e4f51e0e8b99b26943a Mon Sep 17 00:00:00 2001 From: gautamd Date: Fri, 21 Jan 2022 15:56:33 +0000 Subject: [PATCH 11/84] 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 12/84] 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 13/84] 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 14/84] 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 15/84] 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 16/84] 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 17/84] Update EdgeNRM.yaml -- GitLab From 793b8d2581d199ea4491b04971e9ea0033f91b60 Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 26 Jan 2022 18:05:46 +0000 Subject: [PATCH 18/84] changes of S5-221408 --- OpenAPI/genericNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 7d4778a6f..d5b3aca20 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1351,6 +1351,8 @@ components: $ref: '#/components/schemas/tjTraceReference-Type' tjTraceRecordSessionReference: type: string + jobId: + type: string tjTraceReportingFormat: $ref: '#/components/schemas/tjTraceReportingFormat-Type' tjTraceTarget: -- GitLab From 40a9d01d38b7c5c078bb6b0564df96c1634ff5cc Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 26 Jan 2022 18:13:56 +0000 Subject: [PATCH 19/84] Update genericNrm.yaml -- GitLab From 21bd12fcbcedb2251c1d08392e526ac06d115591 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 28 Jan 2022 10:01:14 +0000 Subject: [PATCH 20/84] Update genericNrm.yaml -- GitLab From 34b02256d75cb21c749d0350afaeb9028e58f16c Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 26 Jan 2022 14:45:03 +0000 Subject: [PATCH 21/84] This reflects the changes of S5-221407. --- OpenAPI/genericNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 7d4778a6f..bf9ae22e5 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -729,6 +729,10 @@ components: - NO_IDENTITY - TAC_OF_IMEI + tjMDTBeamLevelMeasurement-Type: + description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40. + type: boolean + tjMDTCollectionPeriodRrmLte-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string @@ -1365,6 +1369,8 @@ components: type: array items: $ref: '#/components/schemas/AreaScope' + tjMDTBeamLevelMeasurement: + $ref: '#/components/schemas/tjMDTBeamLevelMeasurement-Type' tjMDTCollectionPeriodRrmLte: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type' tjMDTCollectionPeriodM6Lte: -- GitLab From 93bc4b0f1f5fb52b4700d3bef477cb75e9647866 Mon Sep 17 00:00:00 2001 From: Weihong Zhu Date: Fri, 21 Jan 2022 03:34:35 +0000 Subject: [PATCH 22/84] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 5ef76d430..783fa1812 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1017,6 +1017,8 @@ components: properties: cellLocalId: type: integer + administrativeState: + $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nrTac: -- GitLab From 8a5a75b75a9686818ae377d6d8d883f33b77a876 Mon Sep 17 00:00:00 2001 From: Weihong Zhu Date: Sat, 29 Jan 2022 15:53:50 +0000 Subject: [PATCH 23/84] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 783fa1812..53fdd7a8d 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1018,7 +1018,7 @@ components: cellLocalId: type: integer administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nrTac: -- GitLab From 28914ca0372bb7818063998d1441e092758e9048 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 28 Jan 2022 01:21:23 +0000 Subject: [PATCH 24/84] Upload New File --- OpenAPI/intentNrm.yaml | 383 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 383 insertions(+) create mode 100644 OpenAPI/intentNrm.yaml diff --git a/OpenAPI/intentNrm.yaml b/OpenAPI/intentNrm.yaml new file mode 100644 index 000000000..bc0093cb5 --- /dev/null +++ b/OpenAPI/intentNrm.yaml @@ -0,0 +1,383 @@ +openapi: 3.0.2 +info: + title: Intent NRM + description: OAS 3.0.1 specification of the Intent NRM + version: 17.0.0 +paths: {} +components: + schemas: + + Intent-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + userLabel: + type: string + intentExpectations: + type: array + items: + $ref: "#/components/schemas/IntentExpectation" + intentContexts: + type: array + items: + $ref: "#/components/schemas/IntentContext" + intentFulfilStatus: + $ref: "#/components/schemas/IntentFulfilStatus" + IntentExpectation: + type: object + properties: + expectationId: + type: string + expectationObjects: + type: array + items: + $ref: "#/components/schemas/ExpectationObject" + expectationTargets: + type: array + items: + $ref: "#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + items: + $ref: "#/components/schemas/ExpectationContext" + + ExpectationObject: + type: object + properties: + objectType: + type: string + enum: + - RAN_SubNetwrok #value for Radio Network Expectation--# + - TBD #-This will be added based on defined scenario specfic intent expectation-# + objectInstance: + $ref: "comDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + items: + $ref: "#/components/schemas/ObjectContext" + + ExpectationTarget: + oneOf: + #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # + - $ref: "#/components/schemas/WeakRSRPRatioTarget" + - $ref: "#/components/schemas/LowSINRRatioTarget" + - $ref: "#/components/schemas/AveULRANUEThptTarget" + - $ref: "#/components/schemas/AveDLRANUEThptTarget" + - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" + - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # + + #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# + #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# + + + ObjectContext: + oneOf: + #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# + - $ref: "#/components/schemas/CoverageAreaPolygonContext" + - $ref: "#/components/schemas/CoverageTACContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/NRFqBandContext" + - $ref: "#/components/schemas/RATContext" + #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# + + #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# + #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# + + + + ExpectationContext: + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number + + IntentContext: + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number + Condition: + type: string + enum: + - Is_equal_to + - Is_less_than + - Is_greater_than + - Is_within_the_range + + IntentFulfilStatus: + type: string + enum: + - FULFILLED + - NOT_FULFILLED + #-------Definition of the concrete ExpectationTarget dataType----------# + WeakRSRPRatioTarget: + type: object + properties: + targetName: + type: string + enum: + - WeakRSRPRatio + targetCondition: + type: string + enum: + - Is_less_than + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/WeakRSRPContext" + + WeakRSRPContext: + type: object + properties: + contextAttribute: + type: string + enum: + - WeakRSRPThreshold + contextCondition: + type: string + enum: + - Is_less_than + contextValueRange: + type: number + + LowSINRRatioTarget: + type: object + properties: + targetName: + type: string + enum: + - LowSINRRatio + targetCondition: + type: string + enum: + - Is_less_than + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowSINRContext" + + LowSINRContext: + type: object + properties: + contextAttribute: + type: string + enum: + - LowSINRThreshold + contextCondition: + type: string + enum: + - Is_less_than + contextValueRange: + type: integer + + AveULRANUEThptTarget: + type: object + properties: + targetName: + type: string + enum: + - AveULRANUEThpt + targetCondition: + type: string + enum: + - Is_greater_than + targetValueRange: + type: integer + + AveDLRANUEThptTarget: + type: object + properties: + targetName: + type: string + enum: + - AveDLRANUEThpt + targetCondition: + type: string + enum: + - Is_greater_than + targetValueRange: + type: integer + + LowULRANUEThptRatioTarget: + type: object + properties: + targetName: + type: string + enum: + - LowULRANUEThptRatio + targetCondition: + type: string + enum: + - Is_less_than + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowULRANUEThptContext" + + LowULRANUEThptContext: + type: object + properties: + contextAttribute: + type: string + enum: + - LowULRANUEThptThreshold + contextCondition: + type: string + enum: + - Is_less_than + contextValueRange: + type: number + + LowDLRANUEThptRatioTarget: + type: object + properties: + targetName: + type: string + enum: + - LowDLRANUEThptRatio + targetCondition: + type: string + enum: + - Is_less_than + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowDLRANUEThptContext" + + LowDLRANUEThptContext: + type: object + properties: + contextAttribute: + type: string + enum: + - LowDLRANUEThptThreshold + contextCondition: + type: string + enum: + - Is_less_than + contextValueRange: + type: number + #-------Definition of the concrete ExpectationTarget dataType----------# + + #-------Definition of the concrete ObjectTarget dataType----------------# + CoverageAreaPolygonContext: + type: object + properties: + contextAttribute: + type: string + enum: + - CoverageAreaPolygon + contextCondition: + type: string + enum: + - Is_within_the_range + contextValueRange: + type: array + items: + $ref: "#/components/schemas/CoverageArea" + CoverageArea: + type: string + CoverageTACContext: + type: object + properties: + contextAttribute: + type: string + enum: + - CoverageAreaTac + contextCondition: + type: string + enum: + - Is_within_the_range + contextValueRange: + type: array + items: + $ref: "nrNrm.yaml#/components/schemas/NrTac" + + PLMNContext: + type: object + properties: + contextAttribute: + type: string + enum: + - PLMN + contextCondition: + type: string + enum: + - Is_within_the_range + contextValueRange: + type: array + items: + $ref: "nrNrm.yaml#/components/schemas/PlmnId" + + NRFqBandContext: + type: object + properties: + contextAttribute: + type: string + enum: + - NRFqBand + contextCondition: + type: string + enum: + - Is_within_the_range + contextValueRange: + type: array + items: + type: string + + RATContext: + type: object + properties: + contextAttribute: + type: string + enum: + - RAT + contextCondition: + type: string + enum: + - Is_within_the_range + contextValueRange: + type: array + items: + type: string + enum: + - UTRAN + - EUTRAN + - NR + #-------Definition of the concrete ObjectTarget dataType----------------# + + #------Definition of JSON arrays for name-contained IOCs ---------------# + + Intent-Multiple: + type: array + items: + $ref: '#/components/schemas/Intent-Single' + #------Definition of JSON arrays for name-contained IOCs ---------------# + + #----- Definitions in TS 28.312 for TS 28.532 --------------------------# + resources-intentNrm: + oneOf: + - $ref: '#/components/schemas/Intent-Single' + #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From 1fda2bb3982a6d42c7409ca19c3ff374a7c20930 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 30 Jan 2022 02:38:57 +0000 Subject: [PATCH 25/84] Update intentNrm.yaml --- OpenAPI/intentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/intentNrm.yaml b/OpenAPI/intentNrm.yaml index bc0093cb5..34f2773d9 100644 --- a/OpenAPI/intentNrm.yaml +++ b/OpenAPI/intentNrm.yaml @@ -374,7 +374,7 @@ components: type: array items: $ref: '#/components/schemas/Intent-Single' - #------Definition of JSON arrays for name-contained IOCs ---------------# + #------Definition of JSON arrays for name-contained IOCs --------------# #----- Definitions in TS 28.312 for TS 28.532 --------------------------# resources-intentNrm: -- GitLab From 8454bc05ff6f864339e04f561793205c771de3b8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 30 Jan 2022 02:42:17 +0000 Subject: [PATCH 26/84] Update intentNrm.yaml -- GitLab From a8185b8b591e70ce204079a36512a0ec32cd30e1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 30 Jan 2022 02:42:35 +0000 Subject: [PATCH 27/84] Update intentNrm.yaml --- OpenAPI/intentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/intentNrm.yaml b/OpenAPI/intentNrm.yaml index 34f2773d9..04999cb3e 100644 --- a/OpenAPI/intentNrm.yaml +++ b/OpenAPI/intentNrm.yaml @@ -80,7 +80,7 @@ components: - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/NRFqBandContext" - $ref: "#/components/schemas/RATContext" - #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# + #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)------# #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# -- GitLab From f09233f221afa2c0e8f35519cca094844566d30f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 30 Jan 2022 02:49:35 +0000 Subject: [PATCH 28/84] Update intentNrm.yaml --- OpenAPI/intentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/intentNrm.yaml b/OpenAPI/intentNrm.yaml index 04999cb3e..5c28cc77a 100644 --- a/OpenAPI/intentNrm.yaml +++ b/OpenAPI/intentNrm.yaml @@ -48,7 +48,7 @@ components: objectType: type: string enum: - - RAN_SubNetwrok #value for Radio Network Expectation--# + - RAN_SubNetwrok #--value for Radio Network Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: $ref: "comDefs.yaml#/components/schemas/Dn" -- GitLab From e558aaef2d0ff3ce0a364617a05d49b584cbf1af Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Sun, 30 Jan 2022 02:59:07 +0000 Subject: [PATCH 29/84] 28.541 rel17 cr0651 update energy efficiency attribute --- OpenAPI/sliceNrm.yaml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 0fc9a4f80..28d96af94 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -232,19 +232,35 @@ components: nsName: type: string EmbbEEPerfReq: - type: integer + type: object + properties: + kpiType: + type: string + enum: + - NUMOFBITS + - NUMOFBITS_RANBASED + req: + type: number UrllcEEPerfReq: - type: integer + type: object + properties: + kpiType: + type: string + enum: + - INVOFLATENCY + - NUMOFBITS_MULTIPLIED_INVOFLATENCY + req: + type: number MIoTEEPerfReq: type: object properties: - KpiType: + kpiType: type: string enum: - MAXREGSUBS - MEANACTIVEUES - Req: - type: integer + req: + type: number EEPerfReq: oneOf: - $ref: '#/components/schemas/EmbbEEPerfReq' @@ -321,7 +337,7 @@ components: reliability: type: string energyEfficiency: - type: integer + type: number dLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: @@ -372,7 +388,7 @@ components: sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: - type: integer + type: number termDensity: $ref: '#/components/schemas/TermDensity' survivalTime: @@ -411,7 +427,7 @@ components: sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: - type: integer + $ref: '#/components/schemas/EnergyEfficiency' synchronicity: $ref: '#/components/schemas/Synchronicity' delayTolerance: -- GitLab From 2e2346eaf10d5f459323b6810bca93b59f6910b6 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 11:43:18 +0000 Subject: [PATCH 30/84] 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 31/84] 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 32/84] 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 33/84] 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 a54141bdd85088cd1e3d03f18af404bad0d9f7bf Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Thu, 10 Feb 2022 14:34:14 +0100 Subject: [PATCH 34/84] This commit corresponds to the YAML part of agreed CR S5-221517. --- OpenAPI/nrNrm.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 5ef76d430..a389c2276 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -255,7 +255,12 @@ components: NRPci: type: integer - MaximumDeviationHoTrigger: + MaximumDeviationHoTriggerLow: + type: integer + minimum: -20 + maximum: 20 + + MaximumDeviationHoTriggerHigh: type: integer minimum: -20 maximum: 20 @@ -1415,8 +1420,10 @@ components: properties: dmroControl: type: boolean - maximumDeviationHoTrigger: - $ref: '#/components/schemas/MaximumDeviationHoTrigger' + maximumDeviationHoTriggerLow: + $ref: '#/components/schemas/MaximumDeviationHoTriggerLow' + maximumDeviationHoTriggerHigh: + $ref: '#/components/schemas/MaximumDeviationHoTriggerHigh' minimumTimeBetweenHoTriggerChange: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' tstoreUEcntxt: -- GitLab From 925b9d9d012bc0673b7684735203992cad117683 Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Thu, 10 Feb 2022 14:34:14 +0100 Subject: [PATCH 35/84] This commit corresponds to the YAML part of agreed CR S5-221517. --- OpenAPI/nrNrm.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 53fdd7a8d..8dbd7a990 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -255,7 +255,12 @@ components: NRPci: type: integer - MaximumDeviationHoTrigger: + MaximumDeviationHoTriggerLow: + type: integer + minimum: -20 + maximum: 20 + + MaximumDeviationHoTriggerHigh: type: integer minimum: -20 maximum: 20 @@ -1417,8 +1422,10 @@ components: properties: dmroControl: type: boolean - maximumDeviationHoTrigger: - $ref: '#/components/schemas/MaximumDeviationHoTrigger' + maximumDeviationHoTriggerLow: + $ref: '#/components/schemas/MaximumDeviationHoTriggerLow' + maximumDeviationHoTriggerHigh: + $ref: '#/components/schemas/MaximumDeviationHoTriggerHigh' minimumTimeBetweenHoTriggerChange: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' tstoreUEcntxt: -- GitLab From 6d046e0af45c986d0bfa2ccfd9032cfa7f8ddf97 Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Thu, 10 Feb 2022 16:57:44 +0100 Subject: [PATCH 36/84] Corrected syntax. --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index a389c2276..57a365f14 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -260,7 +260,7 @@ components: minimum: -20 maximum: 20 - MaximumDeviationHoTriggerHigh: + MaximumDeviationHoTriggerHigh: type: integer minimum: -20 maximum: 20 -- GitLab From b7175e0dfd640f5263e456c92416b8e22926dd8f Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 10 Feb 2022 16:27:05 +0000 Subject: [PATCH 37/84] 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 38/84] 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 39/84] 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 40/84] 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 3246ccda6f7f6a793c0f0ff6ce0297c7350cf6cd Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Fri, 11 Feb 2022 10:30:21 +0100 Subject: [PATCH 41/84] Added old definition of type in order to preserve backwards compatability. --- OpenAPI/nrNrm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 69855683d..b2b96da65 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -255,6 +255,11 @@ components: NRPci: type: integer + MaximumDeviationHoTrigger: + type: integer + minimum: -20 + maximum: 20 + MaximumDeviationHoTriggerLow: type: integer minimum: -20 -- GitLab From 1234305ca6f583d0ffa4ed1516cd5a55d4fe16c5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 29 Jan 2022 03:48:52 +0000 Subject: [PATCH 42/84] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 66 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 53fdd7a8d..4b38218ec 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -629,7 +629,13 @@ components: - PRB_DL - RRC - DRB - + ParameterInfo: + type: object + properties: + maxValue: + type: integer + minValue: + type: integer #-------- Definition of abstract IOCs -------------------------------------------- RrmPolicy_-Attr: @@ -685,7 +691,8 @@ components: $ref: '#/components/schemas/RimRSGlobal-Single' Dynamic5QISet: $ref: '5gcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' - + CCOFunction: + $ref: '#/components/schemas/CCOFunction-Single' ManagedElement-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1799,6 +1806,57 @@ components: $ref: '#/components/schemas/LocalAddress' remoteAddress: $ref: '#/components/schemas/RemoteAddress' + CCOFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + cCOSwitch: + type: boolean + cCOWeakCoverageParameters: + $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + cCOPilotPollutionParameters: + $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' + cCOOvershootCoverageParameters-Single: + $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' + CCOParameters_-Attr: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + coverageShapeList: + type: integer + downlinkTransmitPowerInfo: + $ref: '#/components/schemas/ParameterInfo' + antennaTiltInfo: + $ref: '#/components/schemas/ParameterInfo' + antennaAzimuthInfo: + $ref: '#/components/schemas/ParameterInfo' + digitalTiltInfo: + $ref: '#/components/schemas/ParameterInfo' + digitalAzimuthInfo: + $ref: '#/components/schemas/ParameterInfo' + + CCOWeakCoverageParameters-Single: + allOf: + - $ref: '#/components/schemas/CCOParameters_-Attr' + - type: object + + CCOPilotPollutionParameters-Single: + allOf: + - $ref: '#/components/schemas/CCOParameters_-Attr' + - type: object + + CCOOvershootCoverageParameters-Single: + allOf: + - $ref: '#/components/schemas/CCOParameters_-Attr' + - type: object #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2018,3 +2076,7 @@ components: - $ref: '#/components/schemas/EP_NgU-Single' - $ref: '#/components/schemas/EP_X2U-Single' - $ref: '#/components/schemas/EP_S1U-Single' + - $ref: '#/components/schemas/CCOFunction-Single' + - $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + - $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' + - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' -- GitLab From 964a28db2487c2bc070ff8dff0802010870c893a Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 11 Feb 2022 06:20:48 +0000 Subject: [PATCH 43/84] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 4b38218ec..c672dfe1a 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -629,7 +629,7 @@ components: - PRB_DL - RRC - DRB - ParameterInfo: + ParameterRange: type: object properties: maxValue: @@ -1814,7 +1814,7 @@ components: attributes: type: object properties: - cCOSwitch: + cCOControl: type: boolean cCOWeakCoverageParameters: $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' @@ -1832,30 +1832,30 @@ components: properties: coverageShapeList: type: integer - downlinkTransmitPowerInfo: - $ref: '#/components/schemas/ParameterInfo' - antennaTiltInfo: - $ref: '#/components/schemas/ParameterInfo' - antennaAzimuthInfo: - $ref: '#/components/schemas/ParameterInfo' - digitalTiltInfo: - $ref: '#/components/schemas/ParameterInfo' - digitalAzimuthInfo: - $ref: '#/components/schemas/ParameterInfo' + downlinkTransmitPowerRange: + $ref: '#/components/schemas/ParameterRange' + antennaTiltRange: + $ref: '#/components/schemas/ParameterRange' + antennaAzimuthRange: + $ref: '#/components/schemas/ParameterRange' + digitalTiltRange: + $ref: '#/components/schemas/ParameterRange' + digitalAzimuthRange: + $ref: '#/components/schemas/ParameterRange' CCOWeakCoverageParameters-Single: allOf: - - $ref: '#/components/schemas/CCOParameters_-Attr' + - $ref: '#/components/schemas/CCOParameters-Attr' - type: object CCOPilotPollutionParameters-Single: allOf: - - $ref: '#/components/schemas/CCOParameters_-Attr' + - $ref: '#/components/schemas/CCOParameters-Attr' - type: object CCOOvershootCoverageParameters-Single: allOf: - - $ref: '#/components/schemas/CCOParameters_-Attr' + - $ref: '#/components/schemas/CCOParameters-Attr' - type: object #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From a3eaa17cbc3384d2d54d163de9664daa2fb63857 Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 11 Feb 2022 06:22:41 +0000 Subject: [PATCH 44/84] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index c672dfe1a..6bc664e55 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1822,7 +1822,7 @@ components: $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' cCOOvershootCoverageParameters-Single: $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' - CCOParameters_-Attr: + CCOParameters-Attr: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' - type: object -- GitLab From ab354778e6db6154530e00e249d660b6f32b2c5a Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 17 Jan 2022 10:35:17 +0000 Subject: [PATCH 45/84] 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 46/84] 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 47/84] 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 48/84] 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 49/84] 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 50/84] 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 51/84] 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 52/84] 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 53/84] 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 54/84] 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 55/84] 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 56/84] 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 57/84] 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 58/84] 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 59/84] 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 60/84] 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 61/84] 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 62/84] 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 63/84] 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 64/84] 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 From 35f627cac69d4eb4bf1c5c6b4f2624e05aeadbd2 Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Thu, 10 Feb 2022 14:34:14 +0100 Subject: [PATCH 65/84] This commit corresponds to the YAML part of agreed CR S5-221517. --- OpenAPI/nrNrm.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 6bc664e55..11ad3ce65 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -255,7 +255,12 @@ components: NRPci: type: integer - MaximumDeviationHoTrigger: + MaximumDeviationHoTriggerLow: + type: integer + minimum: -20 + maximum: 20 + + MaximumDeviationHoTriggerHigh: type: integer minimum: -20 maximum: 20 @@ -1424,8 +1429,10 @@ components: properties: dmroControl: type: boolean - maximumDeviationHoTrigger: - $ref: '#/components/schemas/MaximumDeviationHoTrigger' + maximumDeviationHoTriggerLow: + $ref: '#/components/schemas/MaximumDeviationHoTriggerLow' + maximumDeviationHoTriggerHigh: + $ref: '#/components/schemas/MaximumDeviationHoTriggerHigh' minimumTimeBetweenHoTriggerChange: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' tstoreUEcntxt: -- GitLab From 3a23f2fe29915a7b4501f1cd7bb36a3c1b0f37ed Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Thu, 10 Feb 2022 16:57:44 +0100 Subject: [PATCH 66/84] Corrected syntax. --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 11ad3ce65..eb02b498e 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -260,7 +260,7 @@ components: minimum: -20 maximum: 20 - MaximumDeviationHoTriggerHigh: + MaximumDeviationHoTriggerHigh: type: integer minimum: -20 maximum: 20 -- GitLab From 459805eaca202e79eae887d20781a45720038595 Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Fri, 11 Feb 2022 10:30:21 +0100 Subject: [PATCH 67/84] Added old definition of type in order to preserve backwards compatability. --- OpenAPI/nrNrm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index eb02b498e..cf4c79830 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -255,6 +255,11 @@ components: NRPci: type: integer + MaximumDeviationHoTrigger: + type: integer + minimum: -20 + maximum: 20 + MaximumDeviationHoTriggerLow: type: integer minimum: -20 -- GitLab From 6b5b52953935eec642a5476e7451efd946181abc Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 8 Feb 2022 10:35:55 +0000 Subject: [PATCH 68/84] CR0645 Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 28d96af94..2f43ddabd 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -365,8 +365,12 @@ components: type: integer activityFactor: type: integer + dLThptPerSliceSubnet: + $ref: '#/components/schemas/XLThpt' dLThptPerUE: $ref: '#/components/schemas/XLThpt' + uLThptPerSliceSubnet: + $ref: '#/components/schemas/XLThpt' uLThptPerUE: $ref: '#/components/schemas/XLThpt' uESpeed: -- GitLab From 988c66de086071215dc877dab89b30ca570331a7 Mon Sep 17 00:00:00 2001 From: Joey Chou Date: Wed, 16 Feb 2022 03:02:38 +0000 Subject: [PATCH 69/84] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 74 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 91383acfe..d27fb838e 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -562,6 +562,35 @@ components: type: array items: type: string + + 5GCNfConnEcmInfoList: + type: array + items: + $ref: '#/components/schemas/5GCNfConnEcmInfo' + 5GCNfConnEcmInfo: + type: object + description: 'Store the 5GC NF connection information' + properties: + 5GCNFType: + type: string + enum: + - PCF + - NEF + - SCEF + 5GCNFIpAddress: + type: string + 5GCNFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + + + UPFConnectionInfo: + type: object + properties: + uPFIpAddress: + type: string + uPFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + #-------- Definition of concrete IOCs -------------------------------------------- @@ -594,6 +623,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' ManagedElement-Single: allOf: @@ -646,6 +677,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' AmfFunction-Single: allOf: @@ -1300,6 +1333,40 @@ components: EP_Nxx: $ref: '#/components/schemas/EP_Nxx-Multiple' + EcmConnectionInfo-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eASServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eESServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eDNServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eASIpAddress: + type: string + eESIpAddress: + type: string + eCSIpAddress: + type: string + ednIdentifier: + type: string + ecmConnectionType: + type: string + enum: + - USERPLANE + - CONTROLPLANE + - BOTH + 5GCNfConnEcmInfoList: + $ref: '#/components/schemas/5GCNfConnEcmInfoList' + uPFConnectionInfo: + $ref: '#/components/schemas/UPFConnectionInfo' + ExternalAmfFunction-Single: allOf: @@ -2304,6 +2371,11 @@ components: type: array items: $ref: '#/components/schemas/Dynamic5QISet-Single' + EcmConnectionInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EcmConnectionInfo-Single' + @@ -2384,3 +2456,5 @@ components: - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' + - $ref: '#/components/schemas/EcmConnectionInfo-Single' + -- GitLab From 852a562506dbd20c5bdb257685b6d58f1d351720 Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Wed, 16 Feb 2022 08:24:44 +0000 Subject: [PATCH 70/84] S5-221598 Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index ce28bcaa0..da03cb107 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1673,6 +1673,11 @@ components: mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'comDefs.yaml#/components/schemas/Uri' + mnsScope: + description: List of top level addresses (Root DN) of the 3GPP models supported by the MnS + type: array + items: + type: $ref: 'comDefs.yaml#/components/schemas/Dn' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 24c93e75ae9b1bc8b3ffcec1e5bd4cbe57311cfd Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Wed, 16 Feb 2022 08:54:25 +0000 Subject: [PATCH 71/84] Fixed syntax error in genericNrm.yaml line 1680, removed "type:" --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index da03cb107..269ff20fa 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1677,7 +1677,7 @@ components: description: List of top level addresses (Root DN) of the 3GPP models supported by the MnS type: array items: - type: $ref: 'comDefs.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 1e5d9e014264cb52958af3bf46a74abc68397f09 Mon Sep 17 00:00:00 2001 From: Joey Chou Date: Wed, 16 Feb 2022 03:02:38 +0000 Subject: [PATCH 72/84] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 73 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index fdda9b660..0232281fc 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -593,6 +593,34 @@ components: ipv6Prefix: type: string + 5GCNfConnEcmInfoList: + type: array + items: + $ref: '#/components/schemas/5GCNfConnEcmInfo' + 5GCNfConnEcmInfo: + type: object + description: 'Store the 5GC NF connection information' + properties: + 5GCNFType: + type: string + enum: + - PCF + - NEF + - SCEF + 5GCNFIpAddress: + type: string + 5GCNFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + + + UPFConnectionInfo: + type: object + properties: + uPFIpAddress: + type: string + uPFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -624,6 +652,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' ManagedElement-Single: allOf: @@ -676,6 +706,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' AmfFunction-Single: allOf: @@ -1358,6 +1390,40 @@ components: EP_Nxx: $ref: '#/components/schemas/EP_Nxx-Multiple' + EcmConnectionInfo-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eASServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eESServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eDNServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eASIpAddress: + type: string + eESIpAddress: + type: string + eCSIpAddress: + type: string + ednIdentifier: + type: string + ecmConnectionType: + type: string + enum: + - USERPLANE + - CONTROLPLANE + - BOTH + 5GCNfConnEcmInfoList: + $ref: '#/components/schemas/5GCNfConnEcmInfoList' + uPFConnectionInfo: + $ref: '#/components/schemas/UPFConnectionInfo' + ExternalAmfFunction-Single: allOf: @@ -2362,6 +2428,11 @@ components: type: array items: $ref: '#/components/schemas/Dynamic5QISet-Single' + EcmConnectionInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EcmConnectionInfo-Single' + @@ -2448,3 +2519,5 @@ components: - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' + - $ref: '#/components/schemas/EcmConnectionInfo-Single' + -- GitLab From e3caf4ec8fb724d071e46545c8f1d16a09df015b Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 17 Feb 2022 09:30:48 +0800 Subject: [PATCH 73/84] manual fix of confliction --- OpenAPI/5gcNrm.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 9204d8482..0232281fc 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -563,7 +563,6 @@ components: items: type: string -<<<<<<< HEAD DnnSmfInfoItem: type: object properties: @@ -594,8 +593,6 @@ components: ipv6Prefix: type: string -======= ->>>>>>> 988c66de086071215dc877dab89b30ca570331a7 5GCNfConnEcmInfoList: type: array items: @@ -624,10 +621,6 @@ components: uPFRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' -<<<<<<< HEAD -======= - ->>>>>>> 988c66de086071215dc877dab89b30ca570331a7 #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: -- GitLab From 577b39fd0cc7edf4378574fc00cd1997ff55b37d Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 17 Feb 2022 01:36:03 +0000 Subject: [PATCH 74/84] comDefs.yaml is used for Dn as per change from 139/140 delivery Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 0232281fc..ea27ca8c0 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -610,7 +610,7 @@ components: 5GCNFIpAddress: type: string 5GCNFRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' UPFConnectionInfo: @@ -619,7 +619,7 @@ components: uPFIpAddress: type: string uPFRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' #-------- Definition of concrete IOCs -------------------------------------------- -- GitLab From 48d2ecc32f7586b033447ce5d28403128ff684de Mon Sep 17 00:00:00 2001 From: Joey Chou Date: Wed, 16 Feb 2022 03:02:38 +0000 Subject: [PATCH 75/84] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 73 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index fdda9b660..0232281fc 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -593,6 +593,34 @@ components: ipv6Prefix: type: string + 5GCNfConnEcmInfoList: + type: array + items: + $ref: '#/components/schemas/5GCNfConnEcmInfo' + 5GCNfConnEcmInfo: + type: object + description: 'Store the 5GC NF connection information' + properties: + 5GCNFType: + type: string + enum: + - PCF + - NEF + - SCEF + 5GCNFIpAddress: + type: string + 5GCNFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + + + UPFConnectionInfo: + type: object + properties: + uPFIpAddress: + type: string + uPFRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -624,6 +652,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' ManagedElement-Single: allOf: @@ -676,6 +706,8 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' + EcmConnectionInfo: + $ref: '#/components/schemas/EcmConnectionInfo-Multiple' AmfFunction-Single: allOf: @@ -1358,6 +1390,40 @@ components: EP_Nxx: $ref: '#/components/schemas/EP_Nxx-Multiple' + EcmConnectionInfo-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + eASServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eESServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eDNServiceArea: + $ref: 'EdgeNRM.yaml#/components/schemas/ServingLocation' + eASIpAddress: + type: string + eESIpAddress: + type: string + eCSIpAddress: + type: string + ednIdentifier: + type: string + ecmConnectionType: + type: string + enum: + - USERPLANE + - CONTROLPLANE + - BOTH + 5GCNfConnEcmInfoList: + $ref: '#/components/schemas/5GCNfConnEcmInfoList' + uPFConnectionInfo: + $ref: '#/components/schemas/UPFConnectionInfo' + ExternalAmfFunction-Single: allOf: @@ -2362,6 +2428,11 @@ components: type: array items: $ref: '#/components/schemas/Dynamic5QISet-Single' + EcmConnectionInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EcmConnectionInfo-Single' + @@ -2448,3 +2519,5 @@ components: - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' + - $ref: '#/components/schemas/EcmConnectionInfo-Single' + -- GitLab From 7cd5c5a7e9e3525236e5a820ca2b9cf887b7f548 Mon Sep 17 00:00:00 2001 From: Joey Chou Date: Wed, 16 Feb 2022 03:02:38 +0000 Subject: [PATCH 76/84] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 0232281fc..bc535ca90 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -612,7 +612,6 @@ components: 5GCNFRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' - UPFConnectionInfo: type: object properties: -- GitLab From ff22aeff9bcf7521e1dd66a5552bff636590af21 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 17 Feb 2022 01:36:03 +0000 Subject: [PATCH 77/84] comDefs.yaml is used for Dn as per change from 139/140 delivery Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index bc535ca90..6be793123 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -610,7 +610,7 @@ components: 5GCNFIpAddress: type: string 5GCNFRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' UPFConnectionInfo: type: object @@ -618,7 +618,7 @@ components: uPFIpAddress: type: string uPFRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' #-------- Definition of concrete IOCs -------------------------------------------- -- GitLab From b168c70c8c97632ec7794f5b5e3a0aef6bfa3bd9 Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Fri, 11 Feb 2022 15:26:26 +0000 Subject: [PATCH 78/84] Update OpenAPI/genericNrm.yaml --- OpenAPI/genericNrm.yaml | 105 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 269ff20fa..7123776ce 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -181,6 +181,80 @@ components: - BASE_SUBTREE scopeLevel: type: integer + ProcessMonitor: + description: >- + This data type is the "ProcessMonitor" data type without specialisations. + type: object + properties: + jobId: + type: string + status: + type: string + enum: + - NOT_STARTED + - RUNNING + - FINSHED + - FAILED + - PARTIALLY_FAILED + - CANCELLING + - CANCELLED + progressPercentage: + type: integer + minimum: 0 + maximum: 100 + progressStateInfo: + type: string + resultStateInfo: + type: string + startTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + endTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + timer: + type: integer + FileDownloadJobProcessMonitor: + description: >- + This data type is the "ProcessMonitor" data type with specialisations + for usage in the "FileDownloadJob". + type: object + properties: + jobId: + type: string + status: + type: string + enum: + - NOT_STARTED + - RUNNING + - FINSHED + - FAILED + - CANCELLING + - CANCELLED + progressPercentage: + type: integer + minimum: 0 + maximum: 100 + progressStateInfo: + type: string + resultStateInfo: + oneOf: + - type: string + enum: + - NULL + - UNKNOWN + - NO_STORAGE + - LOW_MEMROY + - NO_CONNECTION_TO_REMOTE_SERVER + - FILE_NOT_AVAILABLE + - DNS_CANNOT_BE_RESOLVED + - TIMER_EXPIRED + - OTHER + - type: string + startTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + endTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + timer: + type: integer AreaScope: oneOf: - type: array @@ -1282,6 +1356,8 @@ components: $ref: '#/components/schemas/TraceJob-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' MnsRegistry: $ref: '#/components/schemas/MnsRegistry-Single' ManagedElement-ncO: @@ -1299,6 +1375,8 @@ components: $ref: '#/components/schemas/TraceJob-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' + FileDownloadJob: + $ref: '#/components/schemas/FileDownloadJob-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- @@ -1655,7 +1733,25 @@ components: type: object additionalProperties: $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord' - + FileDownloadJob-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + fileLocation: + type: string + notificationRecipientAddress: + $ref: 'comDefs.yaml#/components/schemas/Uri' + cancelJob: + type: string + enum: + - TRUE + - FALSE + jobMonitor: + $ref: '#/components/schemas/FileDownloadJobProcessMonitor' MnsInfo-Single: type: object properties: @@ -1717,6 +1813,10 @@ components: type: array items: $ref: '#/components/schemas/NtfSubscriptionControl-Single' + FileDownloadJob-Multiple: + type: array + items: + $ref: '#/components/schemas/FileDownloadJob-Single' MnsInfo-Multiple: type: array items: @@ -1743,5 +1843,8 @@ components: - $ref: '#/components/schemas/HeartbeatControl-Single' - $ref: '#/components/schemas/AlarmList-Single' + + - $ref: '#/components/schemas/FileDownloadJob-Single' + - $ref: '#/components/schemas/MnsRegistry-Single' - $ref: '#/components/schemas/MnsInfo-Single' -- GitLab From 9d6720d9b1df46a3ed3e30426f8a6f13f91151d0 Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Mon, 7 Mar 2022 08:46:57 +0000 Subject: [PATCH 79/84] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 75 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 4 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 7d4778a6f..c83a6a5cd 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Generic NRM - version: 17.0.0 + version: 17.1.0 description: >- OAS 3.0.1 definition of the Generic NRM - © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM @@ -1278,6 +1278,8 @@ components: $ref: '#/components/schemas/TraceJob-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' + Files: + $ref: '#/components/schemas/Files-Multiple' MnsRegistry: $ref: '#/components/schemas/MnsRegistry-Single' ManagedElement-ncO: @@ -1295,6 +1297,8 @@ components: $ref: '#/components/schemas/TraceJob-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' + Files: + $ref: '#/components/schemas/Files-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- @@ -1556,6 +1560,8 @@ components: $ref: 'comDefs.yaml#/components/schemas/DnList' reportingCtrl: $ref: '#/components/schemas/ReportingCtrl' + Files: + $ref: '#/components/schemas/Files-Multiple' ThresholdMonitor-Single: allOf: - $ref: '#/components/schemas/Top' @@ -1623,7 +1629,8 @@ components: properties: attributes: $ref: '#/components/schemas/TraceJob-Attr' - + Files: + $ref: '#/components/schemas/Files-Multiple' AlarmList-Single: allOf: - $ref: '#/components/schemas/Top' @@ -1647,7 +1654,55 @@ components: type: object additionalProperties: $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord' - + Files-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + numberOfFiles: + type: integer + jobRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' + jobId: + type: string + File: + $ref: '#/components/schemas/File-Multiple' + File-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + fileLocation: + $ref: 'comDefs.yaml#/components/schemas/Uri' + fileCompression: + type: string + fileSize: + type: integer + fileDataType: + type: string + enum: + - PERFORMANCE + - TRACE + - ANALYTICS + - PROPRIETARY + fileFormat: + type: string + fileReadyTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileExpirationTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileContent: + type: string + jobRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' + jobId: + type: string MnsInfo-Single: type: object properties: @@ -1704,6 +1759,14 @@ components: type: array items: $ref: '#/components/schemas/NtfSubscriptionControl-Single' + Files-Multiple: + type: array + items: + $ref: '#/components/schemas/Files-Single' + File-Multiple: + type: array + items: + $ref: '#/components/schemas/File-Single' MnsInfo-Multiple: type: array items: @@ -1730,5 +1793,9 @@ components: - $ref: '#/components/schemas/HeartbeatControl-Single' - $ref: '#/components/schemas/AlarmList-Single' + + - $ref: '#/components/schemas/Files-Single' + - $ref: '#/components/schemas/File-Single' + - $ref: '#/components/schemas/MnsRegistry-Single' - $ref: '#/components/schemas/MnsInfo-Single' -- GitLab From e086e0c69c818e79b7e0d3aa76bf98f68a06fc77 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 7 Mar 2022 08:48:46 +0000 Subject: [PATCH 80/84] CR0644 Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 6be793123..5473710bd 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -727,21 +727,29 @@ components: interPlmnFQDN: type: string taiList: - $ref: 'nrNrm.yaml#/components/schemas/Tai' + $ref: 'nrNrm.yaml#/components/schemas/TaiList' taiRangeList: - $ref: 'nrNrm.yaml#/components/schemas/TaiRange' + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/TaiRange' weightFactor: $ref: '#/components/schemas/WeightFactor' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - gUAMIdList: - $ref: '#/components/schemas/GUAMInfo' + gUAMIdList: + type: array + items: + $ref: '#/components/schemas/GUAMInfo' backupInfoAmfFailure: - $ref: '#/components/schemas/GUAMInfo' + type: array + items: + $ref: '#/components/schemas/GUAMInfo' backupInfoAmfRemoval: - $ref: '#/components/schemas/GUAMInfo' + type: array + items: + $ref: '#/components/schemas/GUAMInfo' amfSetRef: $ref: 'comDefs.yaml#/components/schemas/Dn' managedNFProfile: -- GitLab From 51bd50dcfff8363d952e4343fd6881c65f5a1e00 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Tue, 8 Mar 2022 00:46:05 +0000 Subject: [PATCH 81/84] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index ad5068132..8e3015099 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -42,6 +42,9 @@ components: $ref: 'comDefs.yaml#/components/schemas/Latitude' siteLongitude: $ref: 'comDefs.yaml#/components/schemas/Longitude' + siteAltitude: + type: number + format: float equipmentType: type: string environmentType: -- GitLab From 7950f24ec35da1bc5397a089239c154ac12b5232 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 21 Mar 2022 14:06:31 +0000 Subject: [PATCH 82/84] update version to 17.6.0 Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 5473710bd..623d9bdc3 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 17.5.0 + version: 17.6.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 3c4ca1b6a4f305c1ffaabb649926c4853ddd08b3 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 21 Mar 2022 14:07:10 +0000 Subject: [PATCH 83/84] update version to 17.6.0 Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index cf4c79830..ed8431de4 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 17.5.0 + version: 17.6.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From ca515b75bc68cc2f0bd35228bec7e306001e080e Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 21 Mar 2022 14:07:59 +0000 Subject: [PATCH 84/84] update version to 17.6.0 Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 2f43ddabd..ed6dfb941 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 17.5.0 + version: 17.6.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab