From 1e7096ac1837c2512d81f7dd3bc394d3d2b821ad Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 15 Feb 2023 12:51:36 +0000 Subject: [PATCH 1/6] TS28.623 CR0214 Rel-18 Add data type AvailabilityStatus --- OpenAPI/TS28623_ComDefs.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index c54fc8107..e0a125724 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -166,6 +166,18 @@ components: - IDEL - ACTIVE - BUSY + AvailabilityStatus: + type: string + enum: + - IN_TEST + - FAILED + - POWER_OFF + - OFF_LINE + - OFF_DUTY + - DEPENDENCY + - DEGRADED + - NOT_INSTALLED + - LOG_FULL AttributeNameValuePairSet: description: >- -- GitLab From aa666e18f2ac12a256db394f5f239272e9eb9075 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 15 Feb 2023 12:57:58 +0000 Subject: [PATCH 2/6] TS28.541 CR0800 Add NetworkSliceController and NetworkSliceSubnetController IOCs --- OpenAPI/TS28541_SliceNrm.yaml | 62 +++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 0833703e6..569d14de9 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -690,6 +690,10 @@ components: $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple' FeasibilityCheckAndReservationJob: $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple' + NetworkSliceController: + $ref: '#/components/schemas/NetworkSliceController-Multiple' + NetworkSliceSubnetController: + $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple' NetworkSlice-Single: @@ -815,6 +819,47 @@ components: recommendedRequirements: $ref: '#/components/schemas/RecommendedRequirements' + NetworkSliceController-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + serviceProfile: + $ref: '#/components/schemas/ServiceProfile' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + availabilityStatus: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AvailabilityStatus' + processMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + networkSliceRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + + NetworkSliceSubnetController-Single: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + sliceProfile: + $ref: '#/components/schemas/SliceProfile' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + availabilityStatus: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AvailabilityStatus' + processMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + networkSliceSubnetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: type: array @@ -844,7 +889,17 @@ components: type: array items: $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' - + + NetworkSliceController-Multiple: + type: array + items: + $ref: '#/components/schemas/NetworkSliceController-Single' + + NetworkSliceSubnetController-Multiple: + type: array + items: + $ref: '#/components/schemas/NetworkSliceSubnetController-Single' + #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-sliceNrm: @@ -856,4 +911,7 @@ components: - $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/EP_Transport-Single' - $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single' - - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' + - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' + - $ref: '#/components/schemas/NetworkSliceController-Single' + - $ref: '#/components/schemas/NetworkSliceSubnetController-Single' + -- GitLab From 1b3010d909f27412932a72a28a8858cc571b6f3a Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 15 Feb 2023 13:09:09 +0000 Subject: [PATCH 3/6] TS28.541 CR0800 Add NetworkSliceController and NetworkSliceSubnetController IOCs. Correction to NetworkSliceSubnetController-Single definition --- OpenAPI/TS28541_SliceNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 569d14de9..b9e99bee3 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -841,6 +841,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' NetworkSliceSubnetController-Single: + allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: -- GitLab From 47b9fd21f69252f0728d078e18cab0d052ea58b9 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 11 May 2023 11:17:24 +0000 Subject: [PATCH 4/6] CR0800 NetworkSliceController-Single: updated to add inputServiceProfile and serviceProfileId. NetworkSliceSubnetController-Single updated to add inputSliceProfile and sliceProfileId. NetworkSlice-Single updated to add networkSliceControllerRefList. NetworkSliceSubnet-Single updated to add networkSliceSubnetControllerRefList. --- OpenAPI/TS28541_SliceNrm.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index b9e99bee3..98a25464d 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -713,6 +713,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' + networkSliceControllerRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' NetworkSliceSubnet-Single: allOf: @@ -745,6 +747,8 @@ components: - TOP_SLICESUBNET - RAN_SLICESUBNET - CN_SLICESUBNET + networkSliceSubnetControllerRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' EP_Transport-Single: allOf: @@ -827,8 +831,10 @@ components: attributes: type: object properties: - serviceProfile: + inputServiceProfile: $ref: '#/components/schemas/ServiceProfile' + serviceProfileId: + type: string operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: @@ -848,8 +854,10 @@ components: attributes: type: object properties: - sliceProfile: + inputSliceProfile: $ref: '#/components/schemas/SliceProfile' + sliceProfileId: + type: string operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' administrativeState: -- GitLab From 7df15dec74e370ee8b41c88f12615a5ece9aefca Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 17 May 2023 13:35:02 +0000 Subject: [PATCH 5/6] CR0800: Correcting data type for networkSliceControllerRefList, networkSliceSubnetControllerRefList, networkSliceRef and networkSliceSubnetRef --- OpenAPI/TS28541_SliceNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 98a25464d..71e75a965 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -714,7 +714,7 @@ components: serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' networkSliceControllerRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' NetworkSliceSubnet-Single: allOf: @@ -748,7 +748,7 @@ components: - RAN_SLICESUBNET - CN_SLICESUBNET networkSliceSubnetControllerRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' EP_Transport-Single: allOf: @@ -844,7 +844,7 @@ components: processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' networkSliceRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' NetworkSliceSubnetController-Single: allOf: @@ -867,7 +867,7 @@ components: processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' networkSliceSubnetRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: -- GitLab From e6691004eaa86d2fe6c5f9f124b457953462d1b1 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Thu, 25 May 2023 19:08:01 +0000 Subject: [PATCH 6/6] Incorporating review comments. Updating networkSliceSubnetControllerRefList to networkSliceSubnetControllerRef and networkSliceControllerRefList to networkSliceControllerRef. --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 71e75a965..f38138861 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -713,7 +713,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' - networkSliceControllerRefList: + networkSliceControllerRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' NetworkSliceSubnet-Single: @@ -747,7 +747,7 @@ components: - TOP_SLICESUBNET - RAN_SLICESUBNET - CN_SLICESUBNET - networkSliceSubnetControllerRefList: + networkSliceSubnetControllerRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' EP_Transport-Single: -- GitLab