From bd7a71dd2a52d40b4a6b0ee766e248f3603afd88 Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Sun, 29 Aug 2021 14:01:41 +0200 Subject: [PATCH 1/9] S5-214115rev1 Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 9355f53e9..20b71d0b1 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1206,6 +1206,10 @@ components: $ref: '#/components/schemas/TraceJob-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' + MnsRegistry: + type: array + items: + $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: @@ -1342,6 +1346,18 @@ components: TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' + MnsRegistry: + type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + mnsVersion: + type: string + mnsAddress: + type: string + #-------- Definition of concrete IOCs -------------------------------------------- VsDataContainer-Single: -- GitLab From 983ca34d083b54b671febbf4c219ae143f1a31fa Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Sun, 29 Aug 2021 14:03:23 +0200 Subject: [PATCH 2/9] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 20b71d0b1..0911920a2 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1208,8 +1208,8 @@ components: $ref: '#/components/schemas/AlarmList-Single' MnsRegistry: type: array - items: - $ref: '#/components/schemas/MnsRegistry' + items: + $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: -- GitLab From bf894d087a3a0db4bc09065e02f0c90cab875af9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Aug 2021 03:01:26 +0200 Subject: [PATCH 3/9] Update logicInterfaceId of EP_transport --- OpenAPI/sliceNrm.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 6e12a4d8b..18473078c 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -465,6 +465,18 @@ components: oneOf: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + + LogicInterfaceInfo: + type: object + properties: + logicalInterfceType: + type: string + enum: + - VLAN + - MPLS + - Segment + logicalInterfceId: + type: string ServiceProfileList: type: array @@ -549,8 +561,8 @@ components: properties: ipAddress: $ref: '#/components/schemas/IpAddress' - logicInterfaceId: - type: string + logicInterfaceInfo: + $ref: '#/components/schemas/LogicInterfaceInfo' nextHopInfo: type: string qosProfile: -- GitLab From c54b7ede5186deb353f3541592cace6c91862ba4 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Aug 2021 02:53:23 +0200 Subject: [PATCH 4/9] Fix the issue caused by the updated NetworkSliceSubnet inheritence relationship --- OpenAPI/sliceNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 18473078c..6c6f6a233 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -550,6 +550,18 @@ components: $ref: '#/components/schemas/SliceProfileList' epTransportRefList: $ref: 'genericNrm.yaml#/components/schemas/DnList' + priorityLabel: + type: integer + PerfMetricJob: + $ref: 'genericNrm.yaml#/components/schemas/PerfMetricJob-Multiple' + ThresholdMonitor: + $ref: 'genericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' + NtfSubscriptionControl: + $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' + TraceJob: + $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' + AlarmList: + $ref: 'genericNrm.yaml#/components/schemas/AlarmList-Single' EP_Transport-Single: allOf: -- GitLab From 04557f304d339bbe01564ceaa20b0be53e04f8d7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 24 Aug 2021 13:28:51 +0200 Subject: [PATCH 5/9] Update sliceNrm.yaml to remove AlarmList --- OpenAPI/sliceNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 6c6f6a233..156255cd0 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -560,8 +560,6 @@ components: $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' - AlarmList: - $ref: 'genericNrm.yaml#/components/schemas/AlarmList-Single' EP_Transport-Single: allOf: -- GitLab From e093170350edc052bd71bd1a1c27f246a956112f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 31 Aug 2021 06:06:51 +0200 Subject: [PATCH 6/9] Update sliceNrm.yaml to remove XXX Control IOC name contained by NetworkSliceSubnet --- OpenAPI/sliceNrm.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 156255cd0..046c85abe 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -552,14 +552,6 @@ components: $ref: 'genericNrm.yaml#/components/schemas/DnList' priorityLabel: type: integer - PerfMetricJob: - $ref: 'genericNrm.yaml#/components/schemas/PerfMetricJob-Multiple' - ThresholdMonitor: - $ref: 'genericNrm.yaml#/components/schemas/ThresholdMonitor-Multiple' - NtfSubscriptionControl: - $ref: 'genericNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple' - TraceJob: - $ref: 'genericNrm.yaml#/components/schemas/TraceJob-Multiple' EP_Transport-Single: allOf: -- GitLab From 43e7333f1ce4ebc7b90ad24789552f4d4730c8d8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 16 Aug 2021 11:22:08 +0200 Subject: [PATCH 7/9] Add YAML (Rest based) solution set for the CR S5-213508 which proposes to convert the 5QI characteristics datatype to IOC --- OpenAPI/5gcNrm.yaml | 51 ++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index fd61fca9d..50d31111a 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -265,26 +265,7 @@ components: type: integer exponent: type: integer - FiveQICharacteristics: - type: object - properties: - fiveQIValue: - type: integer - resourceType: - type: string - enum: - - GBR - - NonGBR - priorityLevel: - type: integer - packetDelayBudget: - type: integer - packetErrorRate: - $ref: '#/components/schemas/PacketErrorRate' - averagingWindow: - type: integer - maximumDataBurstVolume: - type: integer + GtpUPathDelayThresholdsType: @@ -1637,6 +1618,32 @@ components: items: $ref: '#/components/schemas/FiveQiDscpMapping' + FiveQICharacteristics-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + fiveQIValue: + type: integer + resourceType: + type: string + enum: + - GBR + - NonGBR + priorityLevel: + type: integer + packetDelayBudget: + type: integer + packetErrorRate: + $ref: '#/components/schemas/PacketErrorRate' + averagingWindow: + type: integer + maximumDataBurstVolume: + type: integer + FiveQICharacteristics-Multiple: + type: array + items: + $ref: '#/components/schemas/FiveQICharacteristics-Single' Configurable5QISet-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' @@ -1649,7 +1656,7 @@ components: configurable5QIs: type: array items: - $ref: '#/components/schemas/FiveQICharacteristics' + $ref: '#/components/schemas/FiveQICharacteristics-Multiple' Dynamic5QISet-Single: allOf: @@ -1663,7 +1670,7 @@ components: dynamic5QIs: type: array items: - $ref: '#/components/schemas/FiveQICharacteristics' + $ref: '#/components/schemas/FiveQICharacteristics-Multiple' GtpUPathQoSMonitoringControl-Single: allOf: -- GitLab From 54965ee45954807a4705045798f2fa83b09bc8d5 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:42:43 +0200 Subject: [PATCH 8/9] CR 0555 removing "isINEF" --- OpenAPI/5gcNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 50d31111a..042b94c04 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1082,8 +1082,6 @@ components: $ref: '#/components/schemas/ManagedNFProfile' capabilityList: $ref: '#/components/schemas/CapabilityList' - isINEF: - type: boolean isCAPIFSup: type: boolean - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' -- GitLab From f06f97ef1f112a422ca81c89368fa78b0eaa3534 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Aug 2021 13:45:44 +0200 Subject: [PATCH 9/9] CR 0555 removing isINEF --- yang-models/_3gpp-5gc-nrm-neffunction.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-neffunction.yang b/yang-models/_3gpp-5gc-nrm-neffunction.yang index fdb701ed4..7ab28015d 100755 --- a/yang-models/_3gpp-5gc-nrm-neffunction.yang +++ b/yang-models/_3gpp-5gc-nrm-neffunction.yang @@ -43,10 +43,6 @@ module _3gpp-5gc-nrm-neffunction { reference "3GPP TS 23.003"; type string; } - - leaf isINEF { - type boolean; - } leaf isCAPIFSup { type boolean; -- GitLab