From 3c357066126673c2c687c2e4c06dc0566e8a6f4d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Oct 2021 17:12:54 +0200 Subject: [PATCH 001/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 850106631..87c0a499f 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -592,6 +592,12 @@ components: properties: resourceType: type: string + enum: + - PRB + - PRB_UL + - PRB_DL + - RRC + - DRB rRMPolicyMemberList: $ref: '#/components/schemas/RrmPolicyMemberList' -- GitLab From 066b37664c6f97a247ee544bee36c35158f7ac25 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Oct 2021 17:17:20 +0200 Subject: [PATCH 002/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 87c0a499f..be42e57f0 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -583,7 +583,14 @@ components: type: array items: $ref: '#/components/schemas/TceMappingInfo' - + ResourceType: + type: string + enum: + - PRB + - PRB_UL + - PRB_DL + - RRC + - DRB #-------- Definition of abstract IOCs -------------------------------------------- @@ -591,13 +598,7 @@ components: type: object properties: resourceType: - type: string - enum: - - PRB - - PRB_UL - - PRB_DL - - RRC - - DRB + $ref: '#/components/schemas/ResourceType' rRMPolicyMemberList: $ref: '#/components/schemas/RrmPolicyMemberList' -- GitLab From ead49c14fbf9f3a1b0aae7343c8639e10825564e Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 12:15:09 +0200 Subject: [PATCH 003/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e4c4b2619..2de797b5d 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1105,6 +1105,8 @@ components: type: array items: $ref: '#/components/schemas/NsacfInfoSnssai' + taiList： + $ref: 'nrNrm.yaml#/components/schemas/Tai' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 71c6bfa98fc8776a94a6f91149072b32850d1afb Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 12:23:01 +0200 Subject: [PATCH 004/268] 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 2de797b5d..8234b2489 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1106,7 +1106,7 @@ components: items: $ref: '#/components/schemas/NsacfInfoSnssai' taiList： - $ref: 'nrNrm.yaml#/components/schemas/Tai' + $ref: '#/components/schemas/Tailist' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 9f80f4aee97e91296bb5812a02ff4fa7760df3e2 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 12:26:14 +0200 Subject: [PATCH 005/268] 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 8234b2489..2de797b5d 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1106,7 +1106,7 @@ components: items: $ref: '#/components/schemas/NsacfInfoSnssai' taiList： - $ref: '#/components/schemas/Tailist' + $ref: 'nrNrm.yaml#/components/schemas/Tai' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 5fe90e9ae04f07b5ff38d8b3a49b6e4520b871b0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 18 Oct 2021 13:40:14 +0200 Subject: [PATCH 006/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 2de797b5d..15088b4b1 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1105,8 +1105,10 @@ components: type: array items: $ref: '#/components/schemas/NsacfInfoSnssai' - taiList： - $ref: 'nrNrm.yaml#/components/schemas/Tai' + taiList: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/Tai' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From f25802de3ebc94b59b537c06091524b46e493367 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 17:51:29 +0200 Subject: [PATCH 007/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e4c4b2619..3a6ba3ca4 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -463,7 +463,27 @@ components: type: array items: type: string - + + NRTACRange: + type: object + properties: + nRTACstart: + type: string + nRTACend: + type: string + nRTACpattern: + type: string + + TaiRange: + type: object + properties: + plmnId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' + nRTACRangelist: + type: array + items: + $ref: '#/components/schemas/NRTACRange' + #-------- Definition of concrete IOCs -------------------------------------------- @@ -1084,6 +1104,17 @@ components: $ref: '#/components/schemas/CapabilityList' isCAPIFSup: type: boolean + taiList: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/Tai' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + dnai: + type: string + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 10f4dc673a7e57cb3759e8252602df4494167255 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:08:34 +0200 Subject: [PATCH 008/268] 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 3a6ba3ca4..74c16b91e 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -478,7 +478,7 @@ components: type: object properties: plmnId: - $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' nRTACRangelist: type: array items: -- GitLab From 4953c8f33fe1c6e820b06a25fe036c5bcb44bad7 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:10:47 +0200 Subject: [PATCH 009/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 850106631..aa60042b9 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -120,6 +120,10 @@ components: $ref: '#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' + TaiList: + type: array + items: + $ref: '#/components/schemas/Tai' BackhaulAddress: type: object -- GitLab From bf418a438e70748acfdb8ee2efa7ea3ed0ddeb85 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:14:35 +0200 Subject: [PATCH 010/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 74c16b91e..a3da040c8 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1105,9 +1105,8 @@ components: isCAPIFSup: type: boolean taiList: - type: array items: - $ref: 'nrNrm.yaml#/components/schemas/Tai' + $ref: 'nrNrm.yaml#/components/schemas/TaiList' taiRangeList: type: array items: -- GitLab From ab5109435bd4b3b1fbb25b319643e11f526072d8 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:15:39 +0200 Subject: [PATCH 011/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 15088b4b1..c00bb4015 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1106,9 +1106,8 @@ components: items: $ref: '#/components/schemas/NsacfInfoSnssai' taiList: - type: array items: - $ref: 'nrNrm.yaml#/components/schemas/Tai' + $ref: 'nrNrm.yaml#/components/schemas/TaiList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 42a917073008338ffbdfe92be4d69d71956005a3 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:28:39 +0200 Subject: [PATCH 012/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 850106631..33e89980a 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -120,6 +120,10 @@ components: $ref: '#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' + TaiList: + type: array + items: + $ref: '#/components/schemas/Tai' BackhaulAddress: type: object -- GitLab From 0dcd113bae16594b2208225d26ce77b5b500e217 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:30:00 +0200 Subject: [PATCH 013/268] Update 5gcNrm.yaml -- GitLab From 6c40d6e26c0762bcfe8b826372d251fc00a67c9b Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:31:27 +0200 Subject: [PATCH 014/268] Update 5gcNrm.yaml -- GitLab From 1d040773f3d6f17e52de335035e58eaf3f6a6390 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:34:44 +0200 Subject: [PATCH 015/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index c00bb4015..687f64773 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1105,9 +1105,7 @@ components: type: array items: $ref: '#/components/schemas/NsacfInfoSnssai' - taiList: - items: - $ref: 'nrNrm.yaml#/components/schemas/TaiList' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From aea62c08129402350b04c7f61d4c45bc4ac47780 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:37:10 +0200 Subject: [PATCH 016/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 687f64773..c00bb4015 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1105,7 +1105,9 @@ components: type: array items: $ref: '#/components/schemas/NsacfInfoSnssai' - + taiList: + items: + $ref: 'nrNrm.yaml#/components/schemas/TaiList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 50fb368d560dccbb13a2d338c59bb217527c04da Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 17 Nov 2021 20:56:22 +0100 Subject: [PATCH 017/268] Correct attribute nRFrequencyRef to nRFreqRelationRef in IOC NRCellRelation --- OpenAPI/nrNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 850106631..d4993ba31 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1104,7 +1104,7 @@ components: $ref: '#/components/schemas/CellIndividualOffset' adjacentNRCellRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' - nRFrequencyRef: + nRFreqRelationRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' isRemoveAllowed: type: boolean @@ -1139,13 +1139,13 @@ components: properties: offsetMO: $ref: '#/components/schemas/QOffsetRangeList' - blackListEntry: + blockListEntry: type: array items: type: integer minimum: 0 maximum: 1007 - blackListEntryIdleMode: + blockListEntryIdleMode: type: integer cellReselectionPriority: type: integer -- GitLab From 87f32d12340c11145d3560553543987a6f0127a1 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Fri, 19 Nov 2021 16:45:42 +0100 Subject: [PATCH 018/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e4c4b2619..080dfdb99 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -464,6 +464,10 @@ components: items: type: string + SupportedBMOList: + type: array + items: + type: string #-------- Definition of concrete IOCs -------------------------------------------- @@ -707,8 +711,8 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' - commModelList: - $ref: '#/components/schemas/CommModelList' + supportedBMOList: + $ref: '#/components/schemas/SupportedBMOList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -767,6 +771,8 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' + supportedBMOList: + $ref: '#/components/schemas/SupportedBMOList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object -- GitLab From 623af0d088ab5edf07c6f004030a8ec7098ab249 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 5 Oct 2021 03:24:03 +0200 Subject: [PATCH 019/268] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index bf6b4d71c..201537f03 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -581,6 +581,12 @@ components: $ref: 'genericNrm.yaml#/components/schemas/DnList' priorityLabel: type: integer + networkSliceSubnetType: + type: integer + enum: + - TopSliceSubnet + - RANSliceSubnet + - CNSliceSubnet EP_Transport-Single: allOf: -- GitLab From 8496ae87b3fbbc7f5fd9feccadcda522a364e405 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 13 Oct 2021 06:48:57 +0200 Subject: [PATCH 020/268] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 201537f03..67bfbe5a6 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -582,11 +582,11 @@ components: priorityLabel: type: integer networkSliceSubnetType: - type: integer + type: string enum: - - TopSliceSubnet - - RANSliceSubnet - - CNSliceSubnet + - TOP_SLICESUBNET + - RAN_SLICESUBNET + - CN_SLICESUBNET EP_Transport-Single: allOf: -- GitLab From dfb4155d7ef77c5dfaadef9aea2a98ab9a31ece5 Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Sat, 9 Oct 2021 09:23:40 +0200 Subject: [PATCH 021/268] Update latency to support UL and DL requirements --- OpenAPI/sliceNrm.yaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 67bfbe5a6..f7652ecac 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -262,7 +262,9 @@ components: properties: maxNumberofUEs: type: integer - latency: + dLLatency: + type: integer + uLLatency: type: integer dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' @@ -303,6 +305,10 @@ components: properties: coverageAreaTAList: type: integer + dLLatency: + type: integer + uLLatency: + type: integer uEMobilityLevel: $ref: '#/components/schemas/MobilityLevel' resourceSharingLevel: @@ -348,7 +354,9 @@ components: TopSliceSubnetProfile: type: object properties: - latency: + dLLatency: + type: integer + uLLatency: type: integer maxNumberofUEs: type: integer @@ -410,7 +418,9 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: type: number - latency: + dLLatency: + type: number + uLLatency: type: number uEMobilityLevel: $ref: '#/components/schemas/MobilityLevel' -- GitLab From 18ac7809c2660fc784ee1e6255d157777c984e0b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 9 Nov 2021 08:37:21 +0100 Subject: [PATCH 022/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index d4993ba31..49db64394 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -709,6 +709,23 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' + + OperatorDu-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + gnbId: + $ref: '#/components/schemas/GnbId' + gnbIdLength: + $ref: '#/components/schemas/GnbIdLength' + - type: object + properties: + EP_F1C: + $ref: '#/components/schemas/EP_F1C-Single' + EP_F1U: + $ref: '#/components/schemas/EP_F1U-Multiple' + GnbCuUpFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -936,6 +953,18 @@ components: DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' + NrOperatorCellDu-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + cellLocalId: + type: integer + plmnInfoList: + $ref: '#/components/schemas/PlmnInfoList' + nrTac: + $ref: '#/components/schemas/NrTac' + NRFrequency-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1712,6 +1741,10 @@ components: type: array items: $ref: '#/components/schemas/GnbDuFunction-Single' + OperatorDu-Multiple: + type: array + items: + $ref: '#/components/schemas/OperatorDu-Single' GnbCuUpFunction-Multiple: type: array items: @@ -1725,6 +1758,12 @@ components: type: array items: $ref: '#/components/schemas/NrCellDu-Single' + + NrOperatorCellDu-Multiple: + type: array + items: + $ref: '#/components/schemas/NrOperatorCellDu-Single' + NrCellCu-Multiple: type: array items: @@ -1857,9 +1896,11 @@ components: - $ref: '#/components/schemas/GnbDuFunction-Single' - $ref: '#/components/schemas/GnbCuUpFunction-Single' - $ref: '#/components/schemas/GnbCuCpFunction-Single' + - $ref: '#/components/schemas/OperatorDu-Single' - $ref: '#/components/schemas/NrCellCu-Single' - $ref: '#/components/schemas/NrCellDu-Single' + - $ref: '#/components/schemas/NrOperatorCellDu-Single' - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' -- GitLab From a6a30df0a04381d0a1e314dcf90a022d44127657 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 13:25:46 +0100 Subject: [PATCH 023/268] Rel17 CR0624 removing extra '"', Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 49db64394..e0fe8fbe0 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -65,7 +65,7 @@ components: PlmnInfo: type: object properties: - plmnId": + plmnId: $ref: '#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' @@ -80,7 +80,7 @@ components: NpnIdentity: type: object properties: - plmnId": + plmnId: $ref: '#/components/schemas/PlmnId' cagidList: $ref: '#/components/schemas/cagId' -- GitLab From bba333dd9f5a053917d70e48f2560a46af904c6c Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 13:29:35 +0100 Subject: [PATCH 024/268] Rel17_CR0627 NS specific authentication, Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index bf6b4d71c..48d584283 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -298,6 +298,8 @@ components: $ref: '#/components/schemas/DeterministicComm' survivalTime: type: string + nSSAA: + $ref: '#/components/schemas/Nssaa' RANSliceSubnetProfile: type: object properties: @@ -476,6 +478,8 @@ components: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: $ref: '#/components/schemas/EnergyEfficiency' + nSSAA: + $ref: '#/components/schemas/Nssaa' SliceProfile: type: object properties: @@ -517,6 +521,12 @@ components: items: $ref: '#/components/schemas/SliceProfile' + Nssaa: + type: string + enum: + - NOT SUPPORTED + - SUPPORTED + #------------ Definition of concrete IOCs ---------------------------------------- SubNetwork-Single: allOf: -- GitLab From 532cbc40408229a48a6481c944875b6db07559de Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 Nov 2021 02:45:51 +0100 Subject: [PATCH 025/268] 28.541 Rel17 CR0627 NS specific authentication Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 48d584283..ad349f244 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -257,6 +257,13 @@ components: $ref: '#/components/schemas/ServAttrCom' performance: $ref: '#/components/schemas/EEPerfReq' + NSSAASupport: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + support: + $ref: '#/components/schemas/Support' CNSliceSubnetProfile: type: object properties: @@ -298,8 +305,8 @@ components: $ref: '#/components/schemas/DeterministicComm' survivalTime: type: string - nSSAA: - $ref: '#/components/schemas/Nssaa' + nssaaSupport: + $ref: '#/components/schemas/NSSAASupport’ RANSliceSubnetProfile: type: object properties: @@ -478,8 +485,8 @@ components: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: $ref: '#/components/schemas/EnergyEfficiency' - nSSAA: - $ref: '#/components/schemas/Nssaa' + nssaaSupport: + $ref: '#/components/schemas/NSSAASupport’ SliceProfile: type: object properties: @@ -521,12 +528,6 @@ components: items: $ref: '#/components/schemas/SliceProfile' - Nssaa: - type: string - enum: - - NOT SUPPORTED - - SUPPORTED - #------------ Definition of concrete IOCs ---------------------------------------- SubNetwork-Single: allOf: -- GitLab From 3171f2449abb899c06892d15f5e4c4637e01da5d Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 Nov 2021 02:58:01 +0100 Subject: [PATCH 026/268] fix ' at the end of $ref --- OpenAPI/sliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index ad349f244..0948ef91d 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -306,7 +306,7 @@ components: survivalTime: type: string nssaaSupport: - $ref: '#/components/schemas/NSSAASupport’ + $ref: '#/components/schemas/NSSAASupport' RANSliceSubnetProfile: type: object properties: @@ -486,7 +486,7 @@ components: energyEfficiency: $ref: '#/components/schemas/EnergyEfficiency' nssaaSupport: - $ref: '#/components/schemas/NSSAASupport’ + $ref: '#/components/schemas/NSSAASupport' SliceProfile: type: object properties: -- GitLab From d2872fb7062a5525732f2465062386f457134054 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 15:01:02 +0100 Subject: [PATCH 027/268] Rel17_CR0626 NS protection on N6 Protection TrafficControlData: Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e4c4b2619..71b238711 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -382,6 +382,8 @@ components: $ref: '#/components/schemas/SteeringMode' mulAccCtrl: $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/MulticastAccessControl' + snssaiList: + $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' TrafficControlDataList: type: array -- GitLab From 25cdbb06d40a3a126fb263ef038e36347e80c2d2 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 15:31:26 +0100 Subject: [PATCH 028/268] Rel17 CR0626 NS protection on N6 Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index bf6b4d71c..26da19480 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -257,6 +257,27 @@ components: $ref: '#/components/schemas/ServAttrCom' performance: $ref: '#/components/schemas/EEPerfReq' + SecFunc: + type: object + properties: + secFunId: + type: integer + secFunType: + type: string + secRules: + type: array + items: + type: string + N6Protection: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + secFuncList: + type: array + items: + $ref: '#/components/schemas/SecFunc' + CNSliceSubnetProfile: type: object properties: @@ -298,6 +319,8 @@ components: $ref: '#/components/schemas/DeterministicComm' survivalTime: type: string + n6Protection: + $ref: '#/components/schemas/N6Protection' RANSliceSubnetProfile: type: object properties: @@ -476,6 +499,8 @@ components: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: $ref: '#/components/schemas/EnergyEfficiency' + n6Protection: + $ref: '#/components/schemas/N6Protection' SliceProfile: type: object properties: -- GitLab From 2aad923ccf77c1481e45fa720d85a3a2d92a516c Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 16:20:36 +0100 Subject: [PATCH 029/268] 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 26da19480..df35db02d 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -261,7 +261,7 @@ components: type: object properties: secFunId: - type: integer + type: string secFunType: type: string secRules: -- GitLab From 3375522253f4f16a2b5fb4f30c830e3cc7c5dfa9 Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Wed, 3 Nov 2021 19:21:49 +0100 Subject: [PATCH 030/268] This commit corresponds to S5-216053 --- OpenAPI/nrNrm.yaml | 2 ++ yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index e0fe8fbe0..924d98a1c 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -801,6 +801,8 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' + dDAPSHOControl: + type: boolean - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 04122e97f..8906880d9 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -15,6 +15,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2020-11-05 { reference "CR-0611" ; } revision 2020-10-02 { reference CR-0384 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-03 { reference "CR-0321"; } @@ -114,6 +115,12 @@ module _3gpp-nr-nrm-gnbcucpfunction { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBCUCPFunction supports (is associated to)."; } + + leaf dDAPSHOControl { + type boolean; + description "This attribute determines whether the DAPS handover function + is enabled or disabled."; + } } augment "/me3gpp:ManagedElement" { @@ -129,4 +136,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} -- GitLab From 05fba37ea3d3db4a70ca8c143d18f6f7c7c16f6d Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Fri, 1 Oct 2021 10:58:57 +0200 Subject: [PATCH 031/268] S5-215263 Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 0911920a2..b4712edfd 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1210,6 +1210,10 @@ components: type: array items: $ref: '#/components/schemas/MnsRegistry' + MnsRegistry: + type: array + items: + $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: @@ -1353,6 +1357,11 @@ components: type: string mnsType: type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS mnsVersion: type: string mnsAddress: -- GitLab From 9217760115c8db26679a09b2adfbac05cd96acc3 Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Fri, 1 Oct 2021 10:59:48 +0200 Subject: [PATCH 032/268] S5-215263 Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index b4712edfd..2b46aa48c 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1210,10 +1210,6 @@ components: type: array items: $ref: '#/components/schemas/MnsRegistry' - MnsRegistry: - type: array - items: - $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: -- GitLab From d5ae0af16496bff952da90eb587aa2d776dc1acd Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Fri, 1 Oct 2021 11:02:22 +0200 Subject: [PATCH 033/268] S5-215263 Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 2783fd385..5471937f0 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -28,9 +28,10 @@ module _3gpp-common-mnsregistry { leaf mnsType { description "Type of management service."; type enumeration { - enum PROVISIONING; - enum FAULT_SUPERVISION; - enum PERFORMANCE_ASSURANCE; + enum ProvMnS; + enum FaultSupervisionMnS; + enum StreamingDataReportingMnS; + enum FileDataReportingMnS; } } -- GitLab From 43753f6a78787bc80446af1c55d0a47231c1c464 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:23:40 +0200 Subject: [PATCH 034/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 5471937f0..9489507ae 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -14,11 +14,7 @@ module _3gpp-common-mnsregistry { revision 2021-08-29 { reference "Initial revision, S5-214388"; } - grouping MNSRegistryGrp { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; - + grouping MNSInfoGrp { leaf mnsLabel { description "Human-readable name of management service."; mandatory true; @@ -45,6 +41,14 @@ module _3gpp-common-mnsregistry { mandatory true; type string; } + + } + + grouping MNSRegistryGrp { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.541"; + uses top3gpp:Top_Grp; + uses MNSInfoGrp; } augment "/subnet3gpp:SubNetwork" { -- GitLab From a33c92748d9a9c338aa809f1102947140bd9e34e Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:41:57 +0200 Subject: [PATCH 035/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 9489507ae..719d8bfd6 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -29,7 +29,6 @@ module _3gpp-common-mnsregistry { enum StreamingDataReportingMnS; enum FileDataReportingMnS; } - } leaf mnsVersion { description "Version of management service."; @@ -44,11 +43,23 @@ module _3gpp-common-mnsregistry { } + augment "/subnet3gpp:SubNetwork" { + list MNSInfo { + description "Represents the MNSInfo IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; + } + } + grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.541"; uses top3gpp:Top_Grp; - uses MNSInfoGrp; + container attributes { + uses MNSInfoGrp; + }; } augment "/subnet3gpp:SubNetwork" { @@ -60,5 +71,6 @@ module _3gpp-common-mnsregistry { uses MNSRegistryGrp; } } + } } } \ No newline at end of file -- GitLab From d9eb9e2005483fa2cb17ddaed6c00198ad424686 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:47:18 +0200 Subject: [PATCH 036/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 719d8bfd6..14b220ec8 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -15,6 +15,8 @@ module _3gpp-common-mnsregistry { revision 2021-08-29 { reference "Initial revision, S5-214388"; } grouping MNSInfoGrp { + description "Represents the MNSInfo IOC."; + reference "3GPP TS 28.622"; leaf mnsLabel { description "Human-readable name of management service."; mandatory true; @@ -43,19 +45,19 @@ module _3gpp-common-mnsregistry { } - augment "/subnet3gpp:SubNetwork" { - list MNSInfo { - description "Represents the MNSInfo IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } + augment "mnsregist3gpp:MNSRegistry" { + list MNSInfo { + description "Represents the MNSInfo IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; + } + } grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.541"; + reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; container attributes { uses MNSInfoGrp; -- GitLab From b304c3c4c29dd5fea83a24f8e6ea953e18a390e1 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:47:55 +0200 Subject: [PATCH 037/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 14b220ec8..d3e59ac3d 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -61,7 +61,7 @@ module _3gpp-common-mnsregistry { uses top3gpp:Top_Grp; container attributes { uses MNSInfoGrp; - }; + } } augment "/subnet3gpp:SubNetwork" { -- GitLab From 6219915a55ea9a8cd916af023e746456657cb9fc Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:50:23 +0200 Subject: [PATCH 038/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index d3e59ac3d..60f82942c 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -42,7 +42,6 @@ module _3gpp-common-mnsregistry { mandatory true; type string; } - } augment "mnsregist3gpp:MNSRegistry" { @@ -54,6 +53,7 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } + } grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; -- GitLab From 07bfccb25695e8f1c70fe562ca0352020f442c4d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:57:29 +0200 Subject: [PATCH 039/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 40 +++++++++++------------ 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 60f82942c..0e7166c8e 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -43,17 +43,6 @@ module _3gpp-common-mnsregistry { type string; } } - - augment "mnsregist3gpp:MNSRegistry" { - list MNSInfo { - description "Represents the MNSInfo IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } - } grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; @@ -62,17 +51,26 @@ module _3gpp-common-mnsregistry { container attributes { uses MNSInfoGrp; } - } + } - augment "/subnet3gpp:SubNetwork" { - list MNSRegistry { - description "Represents the MNSRegistry IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSRegistryGrp; - } - } + augment "mnsregist3gpp:MNSRegistry" { + list MNSInfo { + description "Represents the MNSInfo IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; } + } + + augment "/subnet3gpp:SubNetwork" { + description "Represents the MNSRegistry IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + } } + + } \ No newline at end of file -- GitLab From f766d12648ce8149417b93663c133dd29d098a3b Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 15:02:31 +0200 Subject: [PATCH 040/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 0e7166c8e..f5a68fa30 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -62,6 +62,7 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } + } augment "/subnet3gpp:SubNetwork" { description "Represents the MNSRegistry IOC."; @@ -69,8 +70,6 @@ module _3gpp-common-mnsregistry { uses top3gpp:Top_Grp; container attributes { uses MNSRegistryGrp; + } } - } - - } \ No newline at end of file -- GitLab From 8bdb0010c6fdabda75d903e9e93e5f61aeebba47 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 15:55:18 +0200 Subject: [PATCH 041/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index f5a68fa30..1585140a9 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -31,6 +31,7 @@ module _3gpp-common-mnsregistry { enum StreamingDataReportingMnS; enum FileDataReportingMnS; } + } leaf mnsVersion { description "Version of management service."; -- GitLab From 3e3b1724f8881a033394c52d105da3ee82bd18e9 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:02:01 +0200 Subject: [PATCH 042/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 1585140a9..2af524bf0 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -54,7 +54,7 @@ module _3gpp-common-mnsregistry { } } - augment "mnsregist3gpp:MNSRegistry" { + augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { description "Represents the MNSInfo IOC."; key id; @@ -67,10 +67,6 @@ module _3gpp-common-mnsregistry { augment "/subnet3gpp:SubNetwork" { description "Represents the MNSRegistry IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSRegistryGrp; - } + uses top3gpp:Top_Grp; } } \ No newline at end of file -- GitLab From 3ba896c6e9b4523776bca904332ea6fdbe775946 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:04:23 +0200 Subject: [PATCH 043/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 2af524bf0..e36b8cb41 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -53,7 +53,8 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - + } + augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { description "Represents the MNSInfo IOC."; @@ -63,8 +64,6 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - } - augment "/subnet3gpp:SubNetwork" { description "Represents the MNSRegistry IOC."; uses top3gpp:Top_Grp; -- GitLab From b444d79b03a8d6570c1c50520fd4c82e760efa61 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:10:46 +0200 Subject: [PATCH 044/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index e36b8cb41..dfc756948 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -64,8 +64,11 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } + } + augment "/subnet3gpp:SubNetwork" { description "Represents the MNSRegistry IOC."; uses top3gpp:Top_Grp; } + } \ No newline at end of file -- GitLab From a992bc8afd0b8409c2bb59f6c10c8dcabedf56b0 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:13:12 +0200 Subject: [PATCH 045/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index dfc756948..f8c6ec145 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -53,7 +53,6 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - } augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { -- GitLab From 57c72bda362d1747f8e262b6b0040db5c31d2dd6 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:47:18 +0200 Subject: [PATCH 046/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 30 ++++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index f8c6ec145..adce96bb4 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -53,21 +53,27 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - + augment "/mnsregist3gpp:MNSRegistry" { - list MNSInfo { - description "Represents the MNSInfo IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; + list MNSInfo { + description "Represents the MNS Registry."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; + } } - } } - + augment "/subnet3gpp:SubNetwork" { - description "Represents the MNSRegistry IOC."; + description "Represents the MNS Registry IOC."; + reference "3GPP TS 28.622"; + key id; uses top3gpp:Top_Grp; - } - + container attributes { + uses MNSRegistryGrp; + } + } + } \ No newline at end of file -- GitLab From 2a661b04cd4a4786f0e329646a597f86424a505d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:48:59 +0200 Subject: [PATCH 047/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index adce96bb4..fe778553d 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -71,9 +71,7 @@ module _3gpp-common-mnsregistry { reference "3GPP TS 28.622"; key id; uses top3gpp:Top_Grp; - container attributes { - uses MNSRegistryGrp; - } + uses MNSRegistryGrp; } } \ No newline at end of file -- GitLab From c0b21f74f693c62b67a304f7bec39cf35be0c145 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:51:56 +0200 Subject: [PATCH 048/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 -- 1 file changed, 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index fe778553d..1ac406b73 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -69,8 +69,6 @@ module _3gpp-common-mnsregistry { augment "/subnet3gpp:SubNetwork" { description "Represents the MNS Registry IOC."; reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; uses MNSRegistryGrp; } -- GitLab From e27b56221a54b00c2b9fb3df844450a17a07f48c Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:55:24 +0200 Subject: [PATCH 049/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 1ac406b73..18387a8e2 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -46,24 +46,21 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistryGrp { + list MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; + key id; uses top3gpp:Top_Grp; container attributes { uses MNSInfoGrp; } + } } - augment "/mnsregist3gpp:MNSRegistry" { - list MNSInfo { - description "Represents the MNS Registry."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } + augment "/mnsregist3gpp:MNSRegistryGrp" { + description "Represents the MNS Registry."; + reference "3GPP TS 28.622"; + uses MNSInfoGrp; } augment "/subnet3gpp:SubNetwork" { -- GitLab From c947d37e6d5a665792244bd1ec55ebc0f5292c1b Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:58:25 +0200 Subject: [PATCH 050/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 18387a8e2..64cbd0e67 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -45,19 +45,19 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistryGrp { + grouping MNSRegistry { list MNSInfo { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; + } } } - augment "/mnsregist3gpp:MNSRegistryGrp" { + augment "/mnsregist3gpp:MNSRegistry" { description "Represents the MNS Registry."; reference "3GPP TS 28.622"; uses MNSInfoGrp; -- GitLab From cb4ab0eaaf1bcd9f42c066b17a0b842a772dd983 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:59:54 +0200 Subject: [PATCH 051/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 64cbd0e67..a28997d3d 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -45,7 +45,7 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistry { + grouping MNSRegistryGrp { list MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; @@ -57,7 +57,7 @@ module _3gpp-common-mnsregistry { } } - augment "/mnsregist3gpp:MNSRegistry" { + augment "/mnsregist3gpp:MNSRegistryGrp" { description "Represents the MNS Registry."; reference "3GPP TS 28.622"; uses MNSInfoGrp; -- GitLab From a1573793bedb0c15e89181477886e2098656f23d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:05:46 +0200 Subject: [PATCH 052/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index a28997d3d..f1a3c5e84 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -46,27 +46,21 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistryGrp { - list MNSInfo { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; } } augment "/mnsregist3gpp:MNSRegistryGrp" { - description "Represents the MNS Registry."; - reference "3GPP TS 28.622"; uses MNSInfoGrp; } augment "/subnet3gpp:SubNetwork" { - description "Represents the MNS Registry IOC."; - reference "3GPP TS 28.622"; uses MNSRegistryGrp; - } + } } \ No newline at end of file -- GitLab From 513268203c5811e8e064ec63755a7d8658c6d039 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:08:25 +0200 Subject: [PATCH 053/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index f1a3c5e84..bbb3db917 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -45,7 +45,7 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistryGrp { + grouping MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; key id; @@ -54,6 +54,17 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } + + grouping MNSRegistryGrp { + list MNSInfo { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfo; + } + } + } augment "/mnsregist3gpp:MNSRegistryGrp" { uses MNSInfoGrp; -- GitLab From 1fa8825079cd7eaa6833e611e0d8d4dc6c08d0a5 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:14:39 +0200 Subject: [PATCH 054/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 24 +++++------------------ 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index bbb3db917..5fda6eaca 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -45,33 +45,19 @@ module _3gpp-common-mnsregistry { } } - grouping MNSInfo { + grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; - key id; uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } - - grouping MNSRegistryGrp { list MNSInfo { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfo; + uses MNSInfoGroup; + key "mnsType mnsVersion"; } } } - - augment "/mnsregist3gpp:MNSRegistryGrp" { - uses MNSInfoGrp; - } - + augment "/subnet3gpp:SubNetwork" { - uses MNSRegistryGrp; + uses MNSRegistry; } } \ No newline at end of file -- GitLab From 98957bb6946e119d29194806664bb7a5fb019074 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:21:02 +0200 Subject: [PATCH 055/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 5fda6eaca..3d61c6b06 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -45,19 +45,29 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistry { - description "Represents the MNSRegistry IOC."; + grouping MNSInfo { + list MNSInfo { + description "Represents the MNSInfo IOC."; reference "3GPP TS 28.622"; + key "mnsType mnsVersion"; uses top3gpp:Top_Grp; - list MNSInfo { + container attributes { uses MNSInfoGroup; - key "mnsType mnsVersion"; + } } + + grouping MNSRegistry { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; } - } augment "/subnet3gpp:SubNetwork" { uses MNSRegistry; } + + augment "/mnsregist3gpp:MNSRegistry" { + uses MNSInfo; + } } \ No newline at end of file -- GitLab From 37c0e7ae556ba528709a2e6f949ba953952ff910 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:22:13 +0200 Subject: [PATCH 056/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 3d61c6b06..c8ffbdbb5 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -55,6 +55,7 @@ module _3gpp-common-mnsregistry { uses MNSInfoGroup; } } + } grouping MNSRegistry { description "Represents the MNSRegistry IOC."; -- GitLab From 56e03099bbb8fd48cc0a778414c2f998e95aa02d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:25:02 +0200 Subject: [PATCH 057/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 26 ++++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index c8ffbdbb5..5553f6c0d 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -44,19 +44,7 @@ module _3gpp-common-mnsregistry { type string; } } - - grouping MNSInfo { - list MNSInfo { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; - key "mnsType mnsVersion"; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGroup; - } - } - } - + grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; @@ -68,7 +56,15 @@ module _3gpp-common-mnsregistry { } augment "/mnsregist3gpp:MNSRegistry" { - uses MNSInfo; + list MNSInfo { + description "Represents the MNSInfo IOC."; + reference "3GPP TS 28.622"; + key "mnsType mnsVersion"; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGroup; + } + } } - + } \ No newline at end of file -- GitLab From 732b5e37c43088767743624b1b04ce3952784b69 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:33:15 +0200 Subject: [PATCH 058/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 29 ++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 5553f6c0d..fa6887fa7 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -45,26 +45,39 @@ module _3gpp-common-mnsregistry { } } + grouping MNSInfo { + description "Represents the MNSInfo IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + key "mnsType mnsVersion mnsAddress"; + container attributes { + uses MNSInfoGrp; + } + } + grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; - } - - augment "/subnet3gpp:SubNetwork" { - uses MNSRegistry; } augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { - description "Represents the MNSInfo IOC."; + description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; - key "mnsType mnsVersion"; uses top3gpp:Top_Grp; container attributes { - uses MNSInfoGroup; - } + uses MNSInfo; } + } + } + + augment "/subnet3gpp:SubNetwork" { + uses MNSRegistry; + } + + augment "/mnsregist3gpp:MNSRegistry" { + uses MNSInfo; } } \ No newline at end of file -- GitLab From d0e06bca5f9af0b08c6cffa96c962c77f0ab2c5b Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:36:11 +0200 Subject: [PATCH 059/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index fa6887fa7..65f2366b1 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -49,7 +49,6 @@ module _3gpp-common-mnsregistry { description "Represents the MNSInfo IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; - key "mnsType mnsVersion mnsAddress"; container attributes { uses MNSInfoGrp; } @@ -62,13 +61,12 @@ module _3gpp-common-mnsregistry { } augment "/mnsregist3gpp:MNSRegistry" { - list MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; - container attributes { + list MNSInfo { uses MNSInfo; - } + key "mnsType mnsVersion mnsAddress"; } } -- GitLab From aa535cf4c2aa885a432948d259e3252fecbd9568 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:40:08 +0200 Subject: [PATCH 060/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 65f2366b1..3d7dce15c 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -54,12 +54,22 @@ module _3gpp-common-mnsregistry { } } + grouping MNSRegistryGrp { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + } + grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + } } + augment "/mnsregist3gpp:MNSRegistry" { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; -- GitLab From 8c02491ab8e3c2d33545de4d496d53edc58a6b05 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:46:37 +0200 Subject: [PATCH 061/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 3d7dce15c..684f23277 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -53,30 +53,13 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - - grouping MNSRegistryGrp { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - } grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; container attributes { - uses MNSRegistryGrp; - } - } - - - augment "/mnsregist3gpp:MNSRegistry" { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - list MNSInfo { uses MNSInfo; - key "mnsType mnsVersion mnsAddress"; } } -- GitLab From a8250ac1c52e52640ec0ba9cdc0ff8347c60d7ff Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:49:54 +0200 Subject: [PATCH 062/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 684f23277..2db2da6c4 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -54,7 +54,7 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistry { + grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; @@ -63,6 +63,14 @@ module _3gpp-common-mnsregistry { } } + grouping MNSRegistry { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + uses MNSRegistryGrp; + } + + augment "/subnet3gpp:SubNetwork" { uses MNSRegistry; } -- GitLab From 9046bef22da6b569269941d048178b41b427f5b8 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:51:48 +0200 Subject: [PATCH 063/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 2db2da6c4..fa6bfea3a 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -72,11 +72,11 @@ module _3gpp-common-mnsregistry { augment "/subnet3gpp:SubNetwork" { - uses MNSRegistry; + uses MNSRegistryGrp; } augment "/mnsregist3gpp:MNSRegistry" { - uses MNSInfo; + uses MNSInfoGrp; } } \ No newline at end of file -- GitLab From 0167c6823e53bdc964abfbd86dae92e1e8ba0fa3 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:57:25 +0200 Subject: [PATCH 064/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index fa6bfea3a..221181eef 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -66,7 +66,6 @@ module _3gpp-common-mnsregistry { grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; uses MNSRegistryGrp; } -- GitLab From 059f8c8c1b3e6324eb8025576d739f92ce5fe15b Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:59:18 +0200 Subject: [PATCH 065/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 221181eef..9bdef8c8e 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -71,11 +71,11 @@ module _3gpp-common-mnsregistry { augment "/subnet3gpp:SubNetwork" { - uses MNSRegistryGrp; + uses MNSRegistry; } augment "/mnsregist3gpp:MNSRegistry" { - uses MNSInfoGrp; + uses MNSInfo; } } \ No newline at end of file -- GitLab From 128c18d62b1622da5b66e0e54d3d7f1d7fa9b66a Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:07:22 +0200 Subject: [PATCH 066/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 9bdef8c8e..254968881 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -75,6 +75,14 @@ module _3gpp-common-mnsregistry { } augment "/mnsregist3gpp:MNSRegistry" { + list MNSInfo { + description "Represents the MNS Registry."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses AMFFunctionGrp; + } uses MNSInfo; } -- GitLab From 94c591c13327290ff8a96fffdb81a776e198a49c Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:08:42 +0200 Subject: [PATCH 067/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 254968881..1de7de4e5 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -76,14 +76,15 @@ module _3gpp-common-mnsregistry { augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { - description "Represents the MNS Registry."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses AMFFunctionGrp; + description "Represents the MNS Registry."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses AMFFunctionGrp; } - uses MNSInfo; - } + uses MNSInfo; + } + } } \ No newline at end of file -- GitLab From 09ee7bc225410e49a0732b1b3c69e1af9a9b1790 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:12:36 +0200 Subject: [PATCH 068/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 1de7de4e5..f8205b55b 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -64,9 +64,14 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistry { + list MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; - uses MNSRegistryGrp; + uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + key "mnsType mnsVersion mnsAddress"; + } } @@ -75,16 +80,7 @@ module _3gpp-common-mnsregistry { } augment "/mnsregist3gpp:MNSRegistry" { - list MNSInfo { - description "Represents the MNS Registry."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses AMFFunctionGrp; - } uses MNSInfo; - } } } \ No newline at end of file -- GitLab From be2df06f18cf15923847aa8b0141bfb2a2c7667a Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:13:40 +0200 Subject: [PATCH 069/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index f8205b55b..bdb694c90 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -73,7 +73,7 @@ module _3gpp-common-mnsregistry { key "mnsType mnsVersion mnsAddress"; } } - + } augment "/subnet3gpp:SubNetwork" { uses MNSRegistry; -- GitLab From a3e77ca00861dd443ad29e4ee43d990f3fa946c9 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:15:43 +0200 Subject: [PATCH 070/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index bdb694c90..ba0365739 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -68,9 +68,9 @@ module _3gpp-common-mnsregistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; + key "mnsType mnsVersion mnsAddress"; container attributes { uses MNSRegistryGrp; - key "mnsType mnsVersion mnsAddress"; } } } -- GitLab From 39ecd3f4cfcdf98439e64eeac14d1ec7fe75c9a4 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:18:35 +0200 Subject: [PATCH 071/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index ba0365739..0b3f08b84 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -64,7 +64,7 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistry { - list MNSInfo { + list MNSInfoGrp { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; @@ -79,8 +79,8 @@ module _3gpp-common-mnsregistry { uses MNSRegistry; } - augment "/mnsregist3gpp:MNSRegistry" { - uses MNSInfo; + augment "/mnsregist3gpp:MNSRegistryGrp" { + uses MNSInfoGrp; } } \ No newline at end of file -- GitLab From 7c5fd9dd3830f9df3b187a1a2cf5c3a3917283aa Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:22:15 +0200 Subject: [PATCH 072/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 0b3f08b84..37694f194 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -64,13 +64,13 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistry { - list MNSInfoGrp { + list MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; key "mnsType mnsVersion mnsAddress"; container attributes { - uses MNSRegistryGrp; + uses MNSInfo; } } } -- GitLab From 1499743ec1fae646e7b5d46bfb89f3b65dc12b87 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:41:27 +0200 Subject: [PATCH 073/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 37694f194..f712d4cd6 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -58,19 +58,16 @@ module _3gpp-common-mnsregistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; - container attributes { - uses MNSInfo; - } } grouping MNSRegistry { - list MNSRegistry { + list mnsRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; key "mnsType mnsVersion mnsAddress"; container attributes { - uses MNSInfo; + uses MNSInfoGrp; } } } -- GitLab From 9210de595f8c1fdced2ca675b073383d8538579d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:43:16 +0200 Subject: [PATCH 074/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index f712d4cd6..f3f305021 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -73,10 +73,10 @@ module _3gpp-common-mnsregistry { } augment "/subnet3gpp:SubNetwork" { - uses MNSRegistry; + uses MNSRegistryGrp; } - augment "/mnsregist3gpp:MNSRegistryGrp" { + augment "/mnsregist3gpp:MNSRegistry" { uses MNSInfoGrp; } -- GitLab From 77fb5ebda4c9a9ac03f3fa3c19d129e5ed6146be Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:45:31 +0200 Subject: [PATCH 075/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index f3f305021..3fecd1d18 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -76,7 +76,7 @@ module _3gpp-common-mnsregistry { uses MNSRegistryGrp; } - augment "/mnsregist3gpp:MNSRegistry" { + augment "/mnsregist3gpp:MNSRegistryGrp" { uses MNSInfoGrp; } -- GitLab From b2572d4c7daef694eb157a175e447a9f4a519ba9 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:46:45 +0200 Subject: [PATCH 076/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 3fecd1d18..845342116 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -76,8 +76,4 @@ module _3gpp-common-mnsregistry { uses MNSRegistryGrp; } - augment "/mnsregist3gpp:MNSRegistryGrp" { - uses MNSInfoGrp; - } - } \ No newline at end of file -- GitLab From 1736381a004c9abeaad56540c07fa9692f9b38d3 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 19:54:44 +0200 Subject: [PATCH 077/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 845342116..27fd8a713 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -13,6 +13,7 @@ module _3gpp-common-mnsregistry { reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; revision 2021-08-29 { reference "Initial revision, S5-214388"; } + revision 2021-10-18 { reference "Update, S5-215263"; } grouping MNSInfoGrp { description "Represents the MNSInfo IOC."; -- GitLab From bbd553d6541f59acbb422372e64b5db4112472dc Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 20:00:09 +0200 Subject: [PATCH 078/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 27fd8a713..52163902b 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -12,9 +12,9 @@ module _3gpp-common-mnsregistry { Class (IOC) that is part of the Generic Network Resource Model (NRM)."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } - revision 2021-10-18 { reference "Update, S5-215263"; } - + grouping MNSInfoGrp { description "Represents the MNSInfo IOC."; reference "3GPP TS 28.622"; -- GitLab From 5bf1f95fca4935fda6a5c30bfde29d0181771094 Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Tue, 19 Oct 2021 11:33:35 +0200 Subject: [PATCH 079/268] S5-215266rev2 genericNrm.yaml --- OpenAPI/genericNrm.yaml | 46 ++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 2b46aa48c..864d5427a 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1207,9 +1207,8 @@ components: AlarmList: $ref: '#/components/schemas/AlarmList-Single' MnsRegistry: - type: array - items: - $ref: '#/components/schemas/MnsRegistry' + $ref: '#/components/schemas/MnsRegistry-Single' + ManagedElement-ncO: type: object properties: @@ -1346,22 +1345,11 @@ components: TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' - MnsRegistry: + MnsRegistry-Single: type: object properties: - mnsLabel: - type: string - mnsType: - type: string - enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS - mnsVersion: - type: string - mnsAddress: - type: string + MnsInfo: + $ref: '#/components/schemas/MnsInfo-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- @@ -1552,6 +1540,24 @@ components: additionalProperties: $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord' + MnsInfo-Single: + type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS + mnsVersion: + type: string + mnsAddress: + description: Resource URI as defined in the relevant Technical Specification + $ref: 'comDefs.yaml#/components/schemas/Uri' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -1586,6 +1592,10 @@ components: type: array items: $ref: '#/components/schemas/TraceJob-Single' + MnsInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/MnsInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -1609,3 +1619,5 @@ components: - $ref: '#/components/schemas/TraceJob-Single' - $ref: '#/components/schemas/AlarmList-Single' + - $ref: '#/components/schemas/MnsRegistry-Single' + - $ref: '#/components/schemas/MnsInfo-Single' -- GitLab From b3ba4cab37aa78a32dba7934f5da97edf9b3df8e Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 4 Nov 2021 10:51:25 +0100 Subject: [PATCH 080/268] This is referred to S5-216066 --- OpenAPI/5gcNrm.yaml | 50 +++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e4c4b2619..72aec4330 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1132,12 +1132,14 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - EP_N64: - $ref: '#/components/schemas/EP_N64-Multiple' - EP_N65: - $ref: '#/components/schemas/EP_N65-Multiple' - EP_N66: - $ref: '#/components/schemas/EP_N66-Multiple' + EP_Npc4: + $ref: '#/components/schemas/EP_Npc4-Multiple' + EP_Npc6: + $ref: '#/components/schemas/EP_Npc6-Multiple' + EP_Npc7: + $ref: '#/components/schemas/EP_Npc7-Multiple' + EP_Npc8: + $ref: '#/components/schemas/EP_Npc8-Multiple' ExternalAmfFunction-Single: allOf: @@ -1645,7 +1647,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - EP_N64-Single: + EP_Npc4-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object @@ -1659,7 +1661,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - EP_N65-Single: + EP_Npc6-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object @@ -1673,7 +1675,21 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - EP_N66-Single: + EP_Npc7-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + EP_Npc8-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object @@ -2085,18 +2101,22 @@ components: type: array items: $ref: '#/components/schemas/EP_N60-Single' - EP_N64-Multiple: + EP_Npc4-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_Npc4-Single' + EP_Npc6-Multiple: type: array items: - $ref: '#/components/schemas/EP_N64-Single' - EP_N65-Multiple: + $ref: '#/components/schemas/EP_Npc6-Single' + EP_Npc7-Multiple: type: array items: - $ref: '#/components/schemas/EP_N65-Single' - EP_N66-Multiple: + $ref: '#/components/schemas/EP_Npc7-Single' + EP_Npc8-Multiple: type: array items: - $ref: '#/components/schemas/EP_N66-Single' + $ref: '#/components/schemas/EP_Npc8-Single' Configurable5QISet-Multiple: type: array items: -- GitLab From f86a0d1b69f6beba53064a27c527ccb7376f4114 Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Wed, 3 Nov 2021 16:46:12 +0100 Subject: [PATCH 081/268] This commit reflects S5-216051 --- OpenAPI/nrNrm.yaml | 2 ++ yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index e0fe8fbe0..35ead708f 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -801,6 +801,8 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' + dCHOControl: + type: boolean - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 04122e97f..ecce855d6 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -15,6 +15,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; + revision 2021-11-05 { reference "CR-XXXX"; } revision 2020-10-02 { reference CR-0384 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-03 { reference "CR-0321"; } @@ -100,7 +101,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf-list xnHOBlackList { type string; description "List of nodes to which handovers over Xn are prohibited."; - } + } + leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBCUCPFunction supports (is associated to)."; @@ -110,10 +112,16 @@ module _3gpp-nr-nrm-gnbcucpfunction { type string; description "List of nodes to which handovers over X2 are prohibited."; } + leaf dynamic5QISetRef { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBCUCPFunction supports (is associated to)."; } + + leaf dCHOControl { + type boolean; + description "This attribute determines whether the CHO function is enabled or disabled."; + } } augment "/me3gpp:ManagedElement" { @@ -129,4 +137,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} -- GitLab From 5e19b3cc9abc2c814dda11f23c4a6606ec31bb0c Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Wed, 3 Nov 2021 17:13:46 +0100 Subject: [PATCH 082/268] Corrected CR number in description of revision. --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index ecce855d6..4ba821028 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -15,7 +15,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2021-11-05 { reference "CR-XXXX"; } + revision 2021-11-05 { reference "CR-0609"; } revision 2020-10-02 { reference CR-0384 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-03 { reference "CR-0321"; } -- GitLab From 7b20583cf2c9bd2d81a45ce8b60bf8c1bf64e178 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 23 Dec 2021 10:54:00 +0000 Subject: [PATCH 083/268] Update 5gcNrm.yaml for CR0637 TS28.541 --- OpenAPI/5gcNrm.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index b676afe78..726707974 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -173,6 +173,32 @@ components: - $ref: '#/components/schemas/UpfInfo' - $ref: '#/components/schemas/AmfInfo' - $ref: '#/components/schemas/Udrinfo' + NotificationType: + type: string + enum: + - N1_MESSAGES + - N2_INFORMATION + - LOCATION_NOTIFICATION + - DATA_REMOVAL_NOTIFICATION + - DATA_CHANGE_NOTIFICATION + - LOCATION_UPDATE_NOTIFICATION + - NSSAA_REAUTH_NOTIFICATION + - NSSAA_REVOC_NOTIFICATION + DefaultNotificationSubscription: + type: object + properties: + notificationType: + $ref: '#/components/schemas/NotificationType' + callbackURI: + type: string + n1MessageClass: + type: boolean + n2InfroamtionClass: + type: boolean + versions: + type: string + binding: + type: string ManagedNFProfile: type: object properties: @@ -180,6 +206,8 @@ components: type: string nfType: $ref: 'genericNrm.yaml#/components/schemas/NFType' + heartbeatTimer: + type: integer authzInfo: type: string hostAddr: -- GitLab From 0ae8bf978e8ac28f024c335151a2e568b64786c8 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 23 Dec 2021 11:06:20 +0000 Subject: [PATCH 084/268] fix syntax issue Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 726707974..d7497dc28 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -184,21 +184,21 @@ components: - LOCATION_UPDATE_NOTIFICATION - NSSAA_REAUTH_NOTIFICATION - NSSAA_REVOC_NOTIFICATION - DefaultNotificationSubscription: - type: object - properties: - notificationType: - $ref: '#/components/schemas/NotificationType' - callbackURI: - type: string - n1MessageClass: - type: boolean - n2InfroamtionClass: - type: boolean - versions: - type: string - binding: - type: string + DefaultNotificationSubscription: + type: object + properties: + notificationType: + $ref: '#/components/schemas/NotificationType' + callbackURI: + type: string + n1MessageClass: + type: boolean + n2InfroamtionClass: + type: boolean + versions: + type: string + binding: + type: string ManagedNFProfile: type: object properties: -- GitLab From 64c1f05261d0e9441679d94d211efa4644b99e2d Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 15 Oct 2021 05:37:24 +0200 Subject: [PATCH 085/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index d7497dc28..e8685f21c 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -599,7 +599,7 @@ components: $ref: '#/components/schemas/WeightFactor' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' - amfSet: + amfSetRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' @@ -650,6 +650,10 @@ components: $ref: '#/components/schemas/AmfSetId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + aMFRegionRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + aMFSetMemberListRef: + $ref: 'genericNrm.yaml#/components/schemas/DnList' AmfRegion-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -668,6 +672,8 @@ components: $ref: '#/components/schemas/AmfRegionId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + aMFSetListRef: + $ref: 'genericNrm.yaml#/components/schemas/DnList' SmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' -- GitLab From 1afab58155213665fd8fab02303f06836196f95c Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 15 Oct 2021 08:16:00 +0200 Subject: [PATCH 086/268] 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 e8685f21c..20f279e88 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -652,7 +652,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' aMFRegionRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' - aMFSetMemberListRef: + aMFSetMemberList: $ref: 'genericNrm.yaml#/components/schemas/DnList' AmfRegion-Single: allOf: -- GitLab From 627abeadce48a23f3b69547d9db343c470026a7d Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 12:06:30 +0200 Subject: [PATCH 087/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e4c4b2619..069fa158d 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -463,7 +463,8 @@ components: type: array items: type: string - + maxNumberofPDUSessions: + type: integer #-------- Definition of concrete IOCs -------------------------------------------- -- GitLab From db1819be92e208d41fa80209633f667517030ec6 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 03:55:01 +0200 Subject: [PATCH 088/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 46 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 069fa158d..475ddb8da 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1140,6 +1140,31 @@ components: EP_N66: $ref: '#/components/schemas/EP_N66-Multiple' + EASDFFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + serverAddr: + type: string + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_Nxx: + $ref: '#/components/schemas/EP_Nxx-Multiple' + + ExternalAmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1688,7 +1713,22 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - + + EP_Nxx-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + FiveQiDscpMappingSet-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -2098,6 +2138,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N66-Single' + EP_Nxx-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_Nxx-Single' Configurable5QISet-Multiple: type: array items: -- GitLab From 2225499f923dfb0c1cfca3fb694b89bf3739020d Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 05:17:37 +0200 Subject: [PATCH 089/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 475ddb8da..56ced5922 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -2217,6 +2217,7 @@ components: - $ref: '#/components/schemas/EP_N32-Single' - $ref: '#/components/schemas/EP_N33-Single' - $ref: '#/components/schemas/EP_N60-Single' + - $ref: '#/components/schemas/EP_Nxx-Single' - $ref: '#/components/schemas/EP_S5C-Single' - $ref: '#/components/schemas/EP_S5U-Single' -- GitLab From 1958ff5289e2663e8c142688d4e46ac046640bdb Mon Sep 17 00:00:00 2001 From: sunxixi Date: Fri, 19 Nov 2021 17:38:44 +0100 Subject: [PATCH 090/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 20f279e88..d8e400073 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -867,6 +867,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + eCSAddrConfigInfo: + type: string - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 7ffe1480e0f83538ed40687e01a4c400a9b33984 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 22 Nov 2021 03:55:46 +0100 Subject: [PATCH 091/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index d8e400073..ad4dc15c3 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -493,7 +493,12 @@ components: type: array items: type: string - + + ECSAddrConfigInfo: + type: array + items: + type: string + #-------- Definition of concrete IOCs -------------------------------------------- @@ -868,7 +873,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' eCSAddrConfigInfo: - type: string + $ref: '#/components/schemas/ECSAddrConfigInfo' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From cdbae5fc65576087ea2df217185dfa1832394388 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 24 Dec 2021 10:35:09 +0000 Subject: [PATCH 092/268] 28.541_Rel17_CR0601 Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 67 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e4c4b2619..44add0c8d 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -144,11 +144,6 @@ components: properties: smfServingAreas: type: string - AmfInfo: - type: object - properties: - priority: - type: integer SupportedDataSetId: type: string description: any of enumrated value @@ -171,7 +166,6 @@ components: - $ref: '#/components/schemas/UdmInfo' - $ref: '#/components/schemas/AusfInfo' - $ref: '#/components/schemas/UpfInfo' - - $ref: '#/components/schemas/AmfInfo' - $ref: '#/components/schemas/Udrinfo' ManagedNFProfile: type: object @@ -184,12 +178,46 @@ components: type: string hostAddr: $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + allowedPLMNs: + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/PlmnId' + allowedSNPNs: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/SnpnInfo' + allowedNfTypes: + type: array + items: + $ref: 'genericNrm.yaml#/components/schemas/NFType' + allowedNfDomains: + type: array + items: string + allowedNSSAIs: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/Snssai' locality: type: string nFInfo: $ref: '#/components/schemas/NFInfo' capacity: type: integer + nfSetIdList: + type: array + items: string + servingScope: + type: array + items: string + nfSetRecoveryTimeList: + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + scpDomains: + type: array + items: string + vendorId: + type: string SEPPType: type: string description: any of enumrated value @@ -463,7 +491,14 @@ components: type: array items: type: string - + + GUAMInfo: + type: object + properties: + pLMNId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + aMFIdentifier: + type: integer #-------- Definition of concrete IOCs -------------------------------------------- @@ -548,7 +583,7 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' - + AmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -565,10 +600,22 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string + interPlmnFQDN: + type: string + taiList: + $ref: 'nrNrm.yaml#/components/schemas/Tai' + taiRangeList: + $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' + backupInfoAmfFailure: + $ref: '#/components/schemas/GUAMInfo' + backupInfoAmfRemoval: + $ref: '#/components/schemas/GUAMInfo' amfSet: $ref: 'genericNrm.yaml#/components/schemas/Dn' managedNFProfile: -- GitLab From 2cab45c80612c182aa7cf0561cb6672cbeef00f7 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 24 Dec 2021 10:40:39 +0000 Subject: [PATCH 093/268] 28.541_Rel17_CR0602 Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 850106631..6c30ea673 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -73,6 +73,22 @@ components: type: array items: $ref: '#/components/schemas/PlmnInfo' + SnpnId: + type: object + properties: + mcc: + $ref: 'genericNrm.yaml#/components/schemas/Mcc' + mnc: + $ref: '#/components/schemas/Mnc' + nid: + type: string + SnpnInfo: + type: object + properties: + snpnId: + $ref: '#/components/schemas/SnpnId' + snssai: + $ref: '#/components/schemas/Snssai' cagId: type: string nid: @@ -120,6 +136,24 @@ components: $ref: '#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' + NrtacRange: + type: object + properties: + nRTACstart: + type: string + nRTACend: + type: string + nRTACpattern: + type: string + TaiRange: + type: object + properties: + plmnId: + $ref: '#/components/schemas/PlmnId' + nRTACRangeList: + type: array + items: + $ref: '#/components/schemas/NrtacRange' BackhaulAddress: type: object -- GitLab From 6e568488a8b42fe648f6632b3a85b10329a4deff Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 24 Dec 2021 14:38:57 +0000 Subject: [PATCH 094/268] update version to 17.5.0 for 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 21249959e..b36c96012 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From cd8e9e3d7cb30b28c9a8cb0062fcb0df9b150fd2 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Dec 2021 07:58:23 +0000 Subject: [PATCH 095/268] update version to 17.5.0 for nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index ad666127d..4dfb1e61d 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From f5b7d390222397b7dc2594de84d84db45c2f57c8 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Dec 2021 07:59:06 +0000 Subject: [PATCH 096/268] update version to 17.5.0 for sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 048da8df8..babd2c83b 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From de43f0cd78e966c1f4149a24dd7b1216774448a0 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 3 Jan 2022 03:16:06 +0000 Subject: [PATCH 097/268] Revert "Merge branch '28.623_Rel-17_CR0140_Add_support_for_MnS_Discovery' into..." This reverts merge request !206 --- OpenAPI/genericNrm.yaml | 41 +++++----------- yang-models/_3gpp-common-mnsregistry.yang | 59 ++++++++--------------- 2 files changed, 31 insertions(+), 69 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 864d5427a..0911920a2 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1207,8 +1207,9 @@ components: AlarmList: $ref: '#/components/schemas/AlarmList-Single' MnsRegistry: - $ref: '#/components/schemas/MnsRegistry-Single' - + type: array + items: + $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: @@ -1345,11 +1346,17 @@ components: TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' - MnsRegistry-Single: + MnsRegistry: type: object properties: - MnsInfo: - $ref: '#/components/schemas/MnsInfo-Multiple' + mnsLabel: + type: string + mnsType: + type: string + mnsVersion: + type: string + mnsAddress: + type: string #-------- Definition of concrete IOCs -------------------------------------------- @@ -1540,24 +1547,6 @@ components: additionalProperties: $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord' - MnsInfo-Single: - type: object - properties: - mnsLabel: - type: string - mnsType: - type: string - enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS - mnsVersion: - type: string - mnsAddress: - description: Resource URI as defined in the relevant Technical Specification - $ref: 'comDefs.yaml#/components/schemas/Uri' - #-------- Definition of JSON arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -1592,10 +1581,6 @@ components: type: array items: $ref: '#/components/schemas/TraceJob-Single' - MnsInfo-Multiple: - type: array - items: - $ref: '#/components/schemas/MnsInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -1619,5 +1604,3 @@ components: - $ref: '#/components/schemas/TraceJob-Single' - $ref: '#/components/schemas/AlarmList-Single' - - $ref: '#/components/schemas/MnsRegistry-Single' - - $ref: '#/components/schemas/MnsInfo-Single' diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 52163902b..2783fd385 100644 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -12,12 +12,13 @@ module _3gpp-common-mnsregistry { Class (IOC) that is part of the Generic Network Resource Model (NRM)."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; - revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } - - grouping MNSInfoGrp { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; + + grouping MNSRegistryGrp { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.541"; + uses top3gpp:Top_Grp; + leaf mnsLabel { description "Human-readable name of management service."; mandatory true; @@ -27,10 +28,9 @@ module _3gpp-common-mnsregistry { leaf mnsType { description "Type of management service."; type enumeration { - enum ProvMnS; - enum FaultSupervisionMnS; - enum StreamingDataReportingMnS; - enum FileDataReportingMnS; + enum PROVISIONING; + enum FAULT_SUPERVISION; + enum PERFORMANCE_ASSURANCE; } } @@ -44,37 +44,16 @@ module _3gpp-common-mnsregistry { mandatory true; type string; } - } - - grouping MNSInfo { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; } - } - - grouping MNSRegistryGrp { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - } - - grouping MNSRegistry { - list mnsRegistry { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - key "mnsType mnsVersion mnsAddress"; - container attributes { - uses MNSInfoGrp; + + augment "/subnet3gpp:SubNetwork" { + list MNSRegistry { + description "Represents the MNSRegistry IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + } } - } - } - - augment "/subnet3gpp:SubNetwork" { - uses MNSRegistryGrp; - } - + } } \ No newline at end of file -- GitLab From 7170cbb9c8711cc32efd6ca28c66fde5608154e5 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 4 Jan 2022 12:22:55 +0000 Subject: [PATCH 098/268] validation check. Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 44add0c8d..c8d8ae3f1 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -491,7 +491,6 @@ components: type: array items: type: string - GUAMInfo: type: object properties: -- GitLab From c6d471f51eb828001578d03a6f23d67ce79ae5f6 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 4 Jan 2022 12:36:25 +0000 Subject: [PATCH 099/268] adding the missing space. try to re-validate. Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index c8d8ae3f1..1d835b8f5 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -491,6 +491,7 @@ components: type: array items: type: string + GUAMInfo: type: object properties: -- GitLab From be4f3d58f7f81e34de1a2df28b584e70e767fbfd Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 12 Jan 2022 03:20:27 +0000 Subject: [PATCH 100/268] fix validation issue Update 5gcNrm.yaml (no definition of PlmnId in comDefs, should be nrNrm.yaml) --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 2df9cef24..214e7cd52 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -181,7 +181,7 @@ components: allowedPLMNs: type: array items: - $ref: 'comDefs.yaml#/components/schemas/PlmnId' + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' allowedSNPNs: type: array items: -- GitLab From a8fdc36f7f30cadbeaa2463de746e80afa5cb0db Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 12 Jan 2022 03:35:37 +0000 Subject: [PATCH 101/268] fix compilation issue for EASDFFunction stage 3 implementation Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 214e7cd52..524639059 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -2310,3 +2310,4 @@ components: - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' + - $ref: '#/components/schemas/EASDFFunction-Single -- GitLab From 51e81c7f92067bd17e7dbaad96340bcc7a04758d Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 12 Jan 2022 03:38:49 +0000 Subject: [PATCH 102/268] fix validation issue EASDFFunction 2nd 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 524639059..9413e8172 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -2310,4 +2310,4 @@ components: - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' - - $ref: '#/components/schemas/EASDFFunction-Single + - $ref: '#/components/schemas/EASDFFunction-Single' -- GitLab From 9f53d2b1a22bcfa42af2e96fb75a98b1201337e4 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 12 Jan 2022 13:48:11 +0000 Subject: [PATCH 103/268] fix validation issue "items: string" Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index ef6a600b4..2f6304902 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -220,7 +220,8 @@ components: $ref: 'genericNrm.yaml#/components/schemas/NFType' allowedNfDomains: type: array - items: string + items: + type: string allowedNSSAIs: type: array items: @@ -233,17 +234,20 @@ components: type: integer nfSetIdList: type: array - items: string + items: + type: string servingScope: type: array - items: string + items: + type: string nfSetRecoveryTimeList: type: array items: $ref: 'comDefs.yaml#/components/schemas/DateTime' scpDomains: type: array - items: string + items: + type: string vendorId: type: string SEPPType: -- GitLab From 0a48090e0702b8b9a47b2b585375c29789774e2f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 21 Oct 2021 09:16:19 +0200 Subject: [PATCH 104/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index fc74e258d..7c628a2ac 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -671,6 +671,8 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' DPCIConfigurationFunction: $ref: '#/components/schemas/DPCIConfigurationFunction-Single' CPCIConfigurationFunction: @@ -706,6 +708,8 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' DPCIConfigurationFunction: $ref: '#/components/schemas/DPCIConfigurationFunction-Single' CPCIConfigurationFunction: @@ -873,6 +877,8 @@ components: $ref: '#/components/schemas/DESManagementFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' NrCellCu-Single: allOf: @@ -907,6 +913,8 @@ components: $ref: '#/components/schemas/DESManagementFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' CESManagementFunction: $ref: '#/components/schemas/CESManagementFunction-Single' DPCIConfigurationFunction: @@ -1413,6 +1421,20 @@ components: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' + DLBOFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + dlboControl: + type: boolean + maximumDeviationHoTrigger: + $ref: '#/components/schemas/MaximumDeviationHoTrigger' + minimumTimeBetweenHoTriggerChange: + $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' DPCIConfigurationFunction-Single: allOf: @@ -1969,6 +1991,7 @@ components: - $ref: '#/components/schemas/DESManagementFunction-Single' - $ref: '#/components/schemas/DRACHOptimizationFunction-Single' - $ref: '#/components/schemas/DMROFunction-Single' + - $ref: '#/components/schemas/DLBOFunction-Single' - $ref: '#/components/schemas/DPCIConfigurationFunction-Single' - $ref: '#/components/schemas/CPCIConfigurationFunction-Single' - $ref: '#/components/schemas/CESManagementFunction-Single' -- GitLab From 4acb09a28b3d7f1f36697767bbec2049a7df8259 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 13 Jan 2022 07:05:11 +0000 Subject: [PATCH 105/268] try to update to rel16 latest version for 17.0.0: Update comDefs.yaml --- OpenAPI/comDefs.yaml | 158 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 128 insertions(+), 30 deletions(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index 04ab65161..f9d90b78f 100644 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -1,76 +1,174 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 16.3.0 + version: 16.8.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623 V16.3.0; Generic NRM, Common Type Definitions + description: 3GPP TS 28.623; Generic NRM; Common type definitions url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: schemas: - Long: - type: string - format: long + Float: - type: string + type: number format: float DateTime: type: string - format: date-Time + format: date-time + Latitude: + type: number + format: float + minimum: -90 + maximum: 90 + Longitude: + type: number + format: float + minimum: -180 + maximum: 180 + Dn: type: string + DnList: + type: array + items: + $ref: '#/components/schemas/Dn' + + Mcc: + type: string + pattern: '^[0-9]{3}$' + Mnc: + type: string + pattern: '^[0-9]{2,3}$' + Nid: + type: string + pattern: '^[A-Fa-f0-9]{11}$' + PlmnId: + type: object + properties: + mcc: + $ref: '#/components/schemas/Mcc' + mnc: + $ref: '#/components/schemas/Mnc' + Tac: + type: string + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + EutraCellId: + type: string + pattern: '^[A-Fa-f0-9]{7}$' + NrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + + Fqdn: + type: string + Ipv4Addr: + type: string + pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' + example: '198.51.100.1' + Ipv6Addr: + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' + example: '2001:db8:85a3::8a2e:370:7334' + Ipv6Prefix: + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' + example: '2001:db8:abcd:12::0/64' + IpAddr: + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + HostAddr: + # This definition will be deprecated, when all occurances of HostAddr + # are replaced by Host. + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + - $ref: '#/components/schemas/Fqdn' + Host: + oneOf: + - $ref: '#/components/schemas/IpAddr' + - $ref: '#/components/schemas/Fqdn' Uri: type: string + + AdministrativeState: + type: string + enum: + - LOCKED + - UNLOCKED + OperationalState: + type: string + enum: + - ENABLED + - DISABLED + UsageState: + type: string + enum: + - IDEL + - ACTIVE + - BUSY + AttributeNameValuePairSet: + description: >- + The key of this map is the attribute name, and the value the attribute value. type: object minProperties: 1 + additionalProperties: + nullable: true AttributeValueChangeSet: description: >- - The key in this map is the attribute name. The value of each key is an array. - When only one item is present in the array, it carries the new attribute - value. If two items are present, then the first item carries the old value - and the second item the new value. The items can be of any type including null. - type: object - additionalProperties: - type: array + The first array item contains the attribute name value pairs with the new values, + and the second array item the attribute name value pairs with the optional old values. + type: array + items: + $ref: '#/components/schemas/AttributeNameValuePairSet' minItems: 1 maxItems: 2 - items: - nullable: true + Filter: + description: >- + The filter format shall be compliant to XPath 1.0. type: string SystemDN: type: string + NotificationId: type: integer + NotificationType: + oneOf: + - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes' + - $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' + - $ref: 'perfMnS.yaml#/components/schemas/PerfNotificationTypes' + - $ref: 'heartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes' + - $ref: 'fileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes' NotificationHeader: - description: >- - Header used for all notifications types type: object - required: - - uri - - notificationId - - notificationType - - eventTime - - systemDn properties: - uri: + href: $ref: '#/components/schemas/Uri' notificationId: $ref: '#/components/schemas/NotificationId' notificationType: - oneOf: - - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes' - #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' - # more to be added + $ref: '#/components/schemas/NotificationType' eventTime: $ref: '#/components/schemas/DateTime' systemDN: $ref: '#/components/schemas/SystemDN' + required: + - href + - notificationId + - notificationType + - eventTime + - systemDN + ErrorResponse: description: >- Default schema for the response message body in case the request -- GitLab From 86c5e116ddd80f0835812752e4e1135e11e0ce52 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 13 Jan 2022 07:10:33 +0000 Subject: [PATCH 106/268] try to use rel16 latest version for rel17 first version: Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 954 +++++++++++++++++++++++----------------- 1 file changed, 541 insertions(+), 413 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 0911920a2..fd690eb91 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.4.0 + version: 16.9.0 description: >- - OAS 3.0.1 specification of the Generic NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + OAS 3.0.1 definition of the Generic NRM + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623 V16.4.0; Generic NRM + description: 3GPP TS 28.623; Generic NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: @@ -15,53 +15,11 @@ components: #-------- Definition of types----------------------------------------------------- - DateTime: - type: string - format: date-time - Dn: - type: string - maxLength: 400 - DnList: - type: array - items: - $ref: '#/components/schemas/Dn' - Mcc: - type: string - pattern: '^[0-9]{3}$' - Mnc: - type: string - pattern: '^[0-9]{2,3}$' - AdministrativeState: - type: string - enum: - - LOCKED - - UNLOCKED - OperationalState: - type: string - enum: - - ENABLED - - DISABLED - UsageState: - type: string - enum: - - IDEL - - ACTIVE - - BUSY RegistrationState: type: string enum: - REGISTERED - DEREGISTERED - SetOfMcc: - type: array - items: - $ref: '#/components/schemas/Mcc' - ManagedElementType: - type: string - ManagedElementTypeList: - type: array - items: - $ref: '#/components/schemas/ManagedElementType' VnfParameter: type: object properties: @@ -73,20 +31,6 @@ components: type: string autoScalable: type: boolean - VnfParametersList: - type: array - items: - $ref: '#/components/schemas/VnfParameter' - SiteLatitude: - type: number - format: float - minimum: -90 - maximum: 90 - SiteLongitude: - type: number - format: float - minimum: -180 - maximum: 180 PeeParameter: type: object properties: @@ -95,53 +39,35 @@ components: siteDescription: type: string siteLatitude: - $ref: '#/components/schemas/SiteLatitude' + $ref: 'comDefs.yaml#/components/schemas/Latitude' siteLongitude: - $ref: '#/components/schemas/SiteLongitude' + $ref: 'comDefs.yaml#/components/schemas/Longitude' equipmentType: type: string environmentType: type: string powerInterface: type: string - PeeParametersList: - type: array - items: - $ref: '#/components/schemas/PeeParameter' - MonitoringGPList: - type: array - items: - type: integer - ThresholdInfoList: - type: array - items: - $ref: '#/components/schemas/ThresholdInfo' ThresholdInfo: type: object properties: - measurementType: + thresholdDirection: type: string - direction: - $ref: '#/components/schemas/Direction' - thresholdPack: - $ref: '#/components/schemas/ThresholdPack' - Direction: - enum: - - Increasing - - Decreasing - ThresholdPack: - type: array - items: - $ref: '#/components/schemas/ThresholdPackElement' - ThresholdPackElement: - type: object - properties: - thresholdLevel: - type: integer + enum: + - UP + - DOWN + - UP_AND_DOWN thresholdValue: - type: number + oneOf: + - type: integer + - $ref: 'comDefs.yaml#/components/schemas/Float' hysteresis: - type: number + oneOf: + - type: integer + minimum: 0 + - type: number + format: float + minimum: 0 Operation: type: object properties: @@ -151,10 +77,6 @@ components: $ref: '#/components/schemas/NFType' operationSemantics: $ref: '#/components/schemas/OperationSemantics' - OperationList: - type: array - items: - $ref: '#/components/schemas/Operation' NFType: type: string description: ' NF name defined in TS 23.501' @@ -178,8 +100,6 @@ components: - AF - UDSF - DN - Fqdn: - type: string OperationSemantics: type: string enum: @@ -189,7 +109,7 @@ components: type: object properties: host: - $ref: '#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' port: type: integer NFServiceType: @@ -202,41 +122,6 @@ components: - Nsmf_PDUSession - Nsmf_EventExposure - Others - HostAddr: - oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' - - $ref: '#/components/schemas/Fqdn' - Ipv4Addr: - type: string - pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' - example: '198.51.100.1' - Ipv4AddrRm: - type: string - pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' - example: '198.51.100.1' - nullable: true - Ipv6Addr: - type: string - allOf: - - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' - - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' - example: '2001:db8:85a3::8a2e:370:7334' - Ipv6AddrRm: - type: string - allOf: - - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' - - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' - example: '2001:db8:85a3::8a2e:370:7334' - nullable: true - Ipv6Prefix: - type: string - allOf: - - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' - - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' - example: '2001:db8:abcd:12::0/64' - Uri: - type: string TransportProtocol: anyOf: - type: string @@ -260,9 +145,14 @@ components: items: type: string enum: - - FILE_BASED_LOC_SET_BY_PRODUCER - - FILE_BASED_LOC_SET_BY_CONSUMER - - STREAM_BASED + - FILE_BASED_LOC_SET_BY_PRODUCER + - FILE_BASED_LOC_SET_BY_CONSUMER + - STREAM_BASED + monitorGranularityPeriods: + type: array + items: + type: integer + minimum: 1 ReportingCtrl: oneOf: - type: object @@ -274,11 +164,11 @@ components: fileReportingPeriod: type: integer fileLocation: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' - type: object properties: streamTarget: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' Scope: type: object properties: @@ -291,28 +181,71 @@ components: - BASE_SUBTREE scopeLevel: type: integer - NotificationType: + AreaScope: + oneOf: + - type: array + items: + $ref: '#/components/schemas/EutraCellId' + - type: array + items: + $ref: '#/components/schemas/NrCellId' + - type: array + items: + $ref: '#/components/schemas/Tac' + - type: array + items: + $ref: '#/components/schemas/Tai' + Tai: + type: object + properties: + mcc: + $ref: 'comDefs.yaml#/components/schemas/Mcc' + mnc: + $ref: 'comDefs.yaml#/components/schemas/Mnc' + tac: + $ref: '#/components/schemas/Tac' + AreaConfig: + type: object + properties: + freqInfo: + $ref: '#/components/schemas/FreqInfo' + pciList: + type: array + items: + type: integer + FreqInfo: + description: specifies the carrier frequency and bands used in a cell. + type: object + properties: + arfcn: + type: integer + freqBands: + type: array + items: + type: integer + MbsfnArea: + type: object + properties: + mbsfnAreaId: + type: integer + minimum: 1 + earfcn: + type: integer + minimum: 1 + Tac: type: string - enum: - - notifyMOICreation - - notifyMOIDeletion - - notifyMOIAttributeValueChanges - - notifyEvent - - notifyNewAlarm - - notifyChangedAlarm - - notifyAckStateChanged - - notifyComments - - notifyCorrelatedNotificationChanged - - notifyChangedAlarmGeneral - - notifyAlarmListRebuilt - - notifyPotentialFaultyAlarmList - - notifyFileReady - - notifyFilePreparationError - - notifyThresholdCrossing - NotificationTypes: - type: array - items: - $ref: '#/components/schemas/NotificationType' + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + EutraCellId: + type: string + pattern: '^[A-Fa-f0-9]{7}$' + NrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + IpAddr: + oneOf: + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' + #-------- Definition of types used in Trace control NRM fragment------------------ @@ -476,6 +409,9 @@ components: - S6d - S6a - Sh + - N70 + - N71 + - NU1 EIRInterfaces: type: array items: @@ -618,6 +554,7 @@ components: - N10 - N13 - N21 + - NU1 UPFInterfaces: type: array items: @@ -676,30 +613,27 @@ components: - GNB_CU_CP - GNB_CU_UP - GNB_DU + - AMF + - PCF + - SMF + - UPF + - AUSF + - SMSF + - HSS + - UDM - tjPLMNTaget-Type: + tjPLMNTarget-Type: type: object description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details. properties: mcc: - $ref: '#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: - $ref: '#/components/schemas/Mnc' + $ref: 'comDefs.yaml#/components/schemas/Mnc' required: - mcc - mnc - tjStreamingTraceConsumerURI-Type: - type: string - description: The URI of the Trace Reporting MnS consumer (see 3GPP TS 28.532) to which the Trace records shall be sent. See 3GPP TS 32.422 clause 5.9 for additional details. - format: uri - - tjTraceCollectionEntityAddress-Type: - description: The IP address to which the Trace records shall be transferred. See 3GPP TS 32.422 clause 5.9 for additional details. - oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' - tjTraceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. type: string @@ -716,11 +650,11 @@ components: description: The Trace Reference parameter shall be globally unique, therefore the Trace Reference shall compose as follows - MCC+MNC+Trace ID, where the MCC and MNC are coming with the Trace activation request from the management system to identify one PLMN containing the management system, and Trace ID is a 3 byte Octet String. See 3GPP TS 32.422 clause 5.6 for additional details. properties: mcc: - $ref: '#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: - $ref: '#/components/schemas/Mnc' + $ref: 'comDefs.yaml#/components/schemas/Mnc' traceId: - type: integer + type: string required: - mcc - mnc @@ -734,19 +668,28 @@ components: - STREAMING tjTraceTarget-Type: - type: string - description: Type of trace target. For additional details see 3GPP TS 32.422. - enum: - - IMSI - - IMEI - - IMEISV - - PUBLIC_ID - - UTRAN_CELL - - E-UTRAN_CELL - - NG-RAN_CELL - - eNB - - RNC - - gNB + type: object + description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422 + properties: + TargetIdType: + type: string + enum: + - IMSI + - IMEI + - IMEISV + - PUBLIC_ID + - UTRAN_CELL + - E-UTRAN_CELL + - NG-RAN_CELL + - eNB + - RNC + - gNB + - SUPI + TargetIdValue: + type: string + required: + - TargetIdType + - TargetIdValue tjTriggeringEvent-Type: type: object @@ -767,6 +710,12 @@ components: - SMF - PCF - UPF + - AUSF + - NEF + - NRF + - NSSF + - SMSF + - UDM EventBitmap: type: integer required: @@ -780,26 +729,41 @@ components: - NO_IDENTITY - TAC_OF_IMEI - tjMDTAreaConfigurationForNeighCell-Type: - description: Used for logged NR MDT and defines the area for which UE is requested to perform measurement logging for neighbour cells which have list of frequencies. For additional details see 3GPP TS 32.422 clause 5.10.26. - type: array - items: - type: object - properties: - frequency: - type: string - cell: - type: string - - tjMDTAreaScope-Type: - description: defines the area in terms or Cells or Tracking Area/Routing Area/Location Area where the MDT data collection shall take place. For additional details see 3GPP TS 32.422 clause 5.10.2. - allOf: - - $ref: '#/components/schemas/DnList' - tjMDTCollectionPeriodRrmLte-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: + - 100ms + - 1000ms + - 1024ms + - 1280ms + - 2048ms + - 2560ms + - 5120ms + - 10000ms + - 10240ms + - 60000ms + + tjMDTCollectionPeriodM6Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.32. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + + tjMDTCollectionPeriodM7Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.33. + type: integer + minimum: 1 + maximum: 60 + + tjMDTCollectionPeriodRrmUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.21. + type: string + enum: + - 100ms - 250ms - 500ms - 1000ms @@ -807,27 +771,42 @@ components: - 3000ms - 4000ms - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms + + tjMDTCollectionPeriodRrmNR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.30. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms - tjMDTCollectionPeriodRrmUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.21. + tjMDTCollectionPeriodM6NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: + - 120ms + - 240ms + - 480ms + - 640ms - 1024ms - - 1280ms - 2048ms - - 2560ms - 5120ms - 10240ms + - 20480ms + - 40960ms - 1min - + - 6min + - 12min + - 30min + + tjMDTCollectionPeriodM7NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.35. + type: integer + minimum: 1 + maximum: 60 + tjMDTEventListForTriggeredMeasurement-Type: description: See details in 3GPP TS 32.422 clause 5.10.28. type: string @@ -840,13 +819,21 @@ components: type: object properties: EventThresholdRSRP: - type: integer - minimum: 0 - maximum: 97 + oneOf: + - type: integer + minimum: 0 + maximum: 97 + - type: integer + minimum: 0 + maximum: 127 EventThresholdRSRQ: - type: integer - minimum: 0 - maximum: 34 + oneOf: + - type: integer + minimum: 0 + maximum: 34 + - type: integer + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: @@ -912,6 +899,7 @@ components: - M5 - M6 - M7 + - M1_EVENT_TRIGGERED - M8 - M9 @@ -928,41 +916,97 @@ components: tjMDTLoggingInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.8. + type: object + properties: + UMTS: + type: array + items: + type: string + enum: + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + LTE: + type: array + items: + type: string + enum: + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + NR: + type: array + items: + type: string + enum: + - 0.32s + - 0.64s + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + - INFINITY + + tjMDTLoggingEventThreshold-Type: + description: See details in 3GPP TS 32.422 clause 5.10.X. + type: object + properties: + RSRP: + type: integer + minimum: 0 + maximum: 127 + RSRQ: + type: integer + minimum: 0 + maximum: 127 + + tjMDTLoggingHysteresis-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Y. + type: integer + minimum: 0 + maximum: 30 + + tjMDTLoggingTimeToTrigger-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Z. type: string enum: - - 1.28s - - 2.56s - - 5.12s - - 10.24s - - 20.48s - - 30.72s - - 40.96s - - 61.44s - - tjMDTMBSFNAreaList-Type: - description: See details in 3GPP TS 32.422 clause 5.10.25. - type: array - items: - type: object - properties: - mbsfnAreaId: - type: integer - minimum: 1 - earfcn: - type: integer - minimum: 1 - required: - - mbsfnAreaId - - earfcn + - 0ms + - 40ms + - 64ms + - 80ms + - 100ms + - 128ms + - 160ms + - 256ms + - 320ms + - 480ms + - 512ms + - 640ms + - 1024ms + - 1280ms + - 2560ms + - 5120ms tjMDTMeasurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: - 1024ms - - 1280ms - 2048ms - - 2560ms - 5120ms - 10240ms - 1min @@ -971,8 +1015,6 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: - - 250ms - - 500ms - 1000ms - 2000ms - 3000ms @@ -995,16 +1037,22 @@ components: - CPICH_RSCP - PathLoss - tjMDTPLMList-Type: + tjMDTM4ThresholdUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.A. + type: integer + minimum: 0 + maximum: 31 + + tjMDTPLMNList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array items: type: object properties: mcc: - $ref: '#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: - $ref: '#/components/schemas/Mnc' + $ref: 'comDefs.yaml#/components/schemas/Mnc' required: - mcc - mnc @@ -1037,45 +1085,72 @@ components: type: string enum: - PERIODICAL - - A2_FOR_LTE + - A2_FOR_LTE_NR - 1F_FOR_UMTS - 1I_FOR_UMTS_MCPS_TDD - - A2_TRIGGERED_PERIODIC_FOR_LTE - - ALL_CONFIGURED_RRM_FOR_LTE + - A2_TRIGGERED_PERIODIC_FOR_LTE_NR + - ALL_CONFIGURED_RRM_FOR_LTE_NR - ALL_CONFIGURED_RRM_FOR_UMTS tjMDTReportInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.5. - type: string - enum: - - 250ms - - 500ms - - 1000ms - - 2000ms - - 3000ms - - 4000ms - - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms - - 120ms - - 240ms - - 480ms - - 640ms - - 1024ms - - 2048ms - - 5120ms - - 10240ms - - 60000ms - - 360000ms - - 720000ms - - 1800000ms - - 3600000ms + type: object + properties: + UMTS: + type: array + items: + type: string + enum: + - 250ms + - 500ms + - 1000ms + - 2000ms + - 3000ms + - 4000ms + - 6000ms + - 8000ms + - 12000ms + - 16000ms + - 20000ms + - 24000ms + - 28000ms + - 32000ms + - 64000ms + LTE: + type: array + items: + type: string + enum: + - 120ms + - 240ms + - 480ms + - 640ms + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms + - 360000ms + - 720000ms + - 1800000ms + - 3600000ms + NR: + type: array + items: + type: string + enum: + - 120ms + - 240ms + - 480ms + - 640ms + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms + - 360000ms + - 720000ms + - 1800000ms tjMDTReportType-Type: description: Report type for logged NR MDT. See details in 3GPP TS 32.422 clause 5.10.27. @@ -1095,29 +1170,8 @@ components: - UE_ORIENTATION tjMDTTraceCollectionEntityID-Type: - description: See details in 3GPP TS 32.422 clause 5.10.11. Only tceID value may be sent over the air to the UE being configured for Logged MDT. - type: object - properties: - tceID: - type: integer - tcePLMN: - type: object - properties: - mcc: - $ref: '#/components/schemas/Mcc' - mnc: - $ref: '#/components/schemas/Mnc' - required: - - mcc - - mnc - tceAddress: - oneOf: - - $ref: '#/components/schemas/tjTraceCollectionEntityAddress-Type' - - $ref: '#/components/schemas/tjStreamingTraceConsumerURI-Type' - required: - - tceID - - tcePLMN - - tceAddress + description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. + type: integer #-------- end of Definition of types used in Trace control NRM fragment ---------- @@ -1132,15 +1186,29 @@ components: properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id Top: type: object properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id #-------- Definition of IOCs with new name-containments defined in other TS ------ @@ -1154,7 +1222,9 @@ components: userDefinedNetworkType: type: string setOfMcc: - $ref: '#/components/schemas/SetOfMcc' + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/Mcc' priorityLabel: type: integer supportedPerfMetricGroups: @@ -1167,13 +1237,15 @@ components: dnPrefix: type: string managedElementTypeList: - $ref: '#/components/schemas/ManagedElementTypeList' + type: array + items: + type: string userLabel: type: string locationName: type: string managedBy: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' vendorName: type: string userDefinedState: @@ -1192,14 +1264,14 @@ components: properties: ManagementNode: $ref: '#/components/schemas/ManagementNode-Multiple' + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' PerfMetricJob: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - ThresholdMonitoringCapability: - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' NtfSubscriptionControl: $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: @@ -1207,18 +1279,16 @@ components: AlarmList: $ref: '#/components/schemas/AlarmList-Single' MnsRegistry: - type: array - items: - $ref: '#/components/schemas/MnsRegistry' + $ref: '#/components/schemas/MnsRegistry-Single' ManagedElement-ncO: type: object properties: + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' PerfMetricJob: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - ThresholdMonitoringCapability: - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' NtfSubscriptionControl: $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: @@ -1234,9 +1304,13 @@ components: userLabel: type: string vnfParametersList: - $ref: '#/components/schemas/VnfParametersList' + type: array + items: + $ref: '#/components/schemas/VnfParameter' peeParametersList: - $ref: '#/components/schemas/PeeParametersList' + type: array + items: + $ref: '#/components/schemas/PeeParameter' priorityLabel: type: integer supportedPerfMetricGroups: @@ -1266,15 +1340,17 @@ components: tjListOfNeTypes: $ref: '#/components/schemas/tjListOfNeTypes-Type' tjPLMNTarget: - $ref: '#/components/schemas/tjPLMNTaget-Type' - tjTraceConsumer: - oneOf: - - $ref: '#/components/schemas/tjStreamingTraceConsumerURI-Type' - - $ref: '#/components/schemas/tjTraceCollectionEntityAddress-Type' + $ref: '#/components/schemas/tjPLMNTarget-Type' + tjStreamingTraceConsumerURI: + $ref: 'comDefs.yaml#/components/schemas/Uri' + tjTraceCollectionEntityAddress: + $ref: '#/components/schemas/IpAddr' tjTraceDepth: $ref: '#/components/schemas/tjTraceDepth-Type' tjTraceReference: $ref: '#/components/schemas/tjTraceReference-Type' + tjTraceRecordSessionReference: + type: string tjTraceReportingFormat: $ref: '#/components/schemas/tjTraceReportingFormat-Type' tjTraceTarget: @@ -1284,13 +1360,25 @@ components: tjMDTAnonymizationOfData: $ref: '#/components/schemas/tjMDTAnonymizationOfData-Type' tjMDTAreaConfigurationForNeighCell: - $ref: '#/components/schemas/tjMDTAreaConfigurationForNeighCell-Type' + $ref: '#/components/schemas/AreaConfig' tjMDTAreaScope: - $ref: '#/components/schemas/tjMDTAreaScope-Type' + type: array + items: + $ref: '#/components/schemas/AreaScope' tjMDTCollectionPeriodRrmLte: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type' + tjMDTCollectionPeriodM6Lte: + $ref: '#/components/schemas/tjMDTCollectionPeriodM6Lte-Type' + tjMDTCollectionPeriodM7Lte: + $ref: '#/components/schemas/tjMDTCollectionPeriodM7Lte-Type' tjMDTCollectionPeriodRrmUmts: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmUmts-Type' + tjMDTCollectionPeriodRrmNR: + $ref: '#/components/schemas/tjMDTCollectionPeriodRrmNR-Type' + tjMDTCollectionPeriodM6NR: + $ref: '#/components/schemas/tjMDTCollectionPeriodM6NR-Type' + tjMDTCollectionPeriodM7NR: + $ref: '#/components/schemas/tjMDTCollectionPeriodM7NR-Type' tjMDTEventListForTriggeredMeasurement: $ref: '#/components/schemas/tjMDTEventListForTriggeredMeasurement-Type' tjMDTEventThreshold: @@ -1301,16 +1389,26 @@ components: $ref: '#/components/schemas/tjMDTLoggingDuration-Type' tjMDTLoggingInterval: $ref: '#/components/schemas/tjMDTLoggingInterval-Type' + tjMDTLoggingEventThreshold: + $ref: '#/components/schemas/tjMDTLoggingEventThreshold-Type' + tjMDTLoggingHysteresis: + $ref: '#/components/schemas/tjMDTLoggingHysteresis-Type' + tjMDTLoggingTimeToTrigger: + $ref: '#/components/schemas/tjMDTLoggingTimeToTrigger-Type' tjMDTMBSFNAreaList: - $ref: '#/components/schemas/tjMDTMBSFNAreaList-Type' + type: array + items: + $ref: '#/components/schemas/MbsfnArea' tjMDTMeasurementPeriodLTE: $ref: '#/components/schemas/tjMDTMeasurementPeriodLTE-Type' tjMDTMeasurementPeriodUMTS: $ref: '#/components/schemas/tjMDTMeasurementPeriodUMTS-Type' tjMDTMeasurementQuantity: $ref: '#/components/schemas/tjMDTMeasurementQuantity-Type' - tjMDTPLMList: - $ref: '#/components/schemas/tjMDTPLMList-Type' + tjMDTM4ThresholdUmts: + $ref: '#/components/schemas/tjMDTM4ThresholdUmts-Type' + tjMDTPLMNList: + $ref: '#/components/schemas/tjMDTPLMNList-Type' tjMDTPositioningMethod: $ref: '#/components/schemas/tjMDTPositioningMethod-Type' tjMDTReportAmount: @@ -1325,12 +1423,6 @@ components: $ref: '#/components/schemas/tjMDTSensorInformation-Type' tjMDTTraceCollectionEntityID: $ref: '#/components/schemas/tjMDTTraceCollectionEntityID-Type' - required: - - tjJobType - - tjTraceReference - - tjTraceConsumer - - tjTraceReportingFormat - - tjTraceTarget ManagedFunction-ncO: type: object @@ -1339,24 +1431,17 @@ components: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - ThresholdMonitoringCapability: - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' ManagedNFService: $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' - MnsRegistry: + MnsRegistry-Single: type: object properties: - mnsLabel: - type: string - mnsType: - type: string - mnsVersion: - type: string - mnsAddress: - type: string + MnsInfo: + $ref: '#/components/schemas/MnsInfo-Multiple' + #-------- Definition of concrete IOCs -------------------------------------------- @@ -1378,7 +1463,7 @@ components: $ref: '#/components/schemas/VsDataContainer-Multiple' ManagedNFService-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1391,18 +1476,20 @@ components: sAP: $ref: '#/components/schemas/SAP' operations: - $ref: '#/components/schemas/OperationList' + type: array + items: + $ref: '#/components/schemas/Operation' administrativeState: - $ref: '#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: '#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' usageState: - $ref: '#/components/schemas/UsageState' + $ref: 'comDefs.yaml#/components/schemas/UsageState' registrationState: $ref: '#/components/schemas/RegistrationState' ManagementNode-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1411,7 +1498,7 @@ components: userLabel: type: string managedElements: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' vendorName: type: string userDefinedState: @@ -1420,9 +1507,21 @@ components: type: string swVersion: type: string + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' + MnsAgent-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + systemDN: + $ref: 'comDefs.yaml#/components/schemas/Dn' MeContext-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1432,17 +1531,17 @@ components: type: string PerfMetricJob-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: administrativeState: - $ref: '#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: '#/components/schemas/OperationalState' - perfMetricJobGroupId: + $ref: 'comDefs.yaml#/components/schemas/OperationalState' + jobId: type: string performanceMetrics: type: array @@ -1452,60 +1551,61 @@ components: type: integer minimum: 1 objectInstances: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' rootObjectInstances: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' reportingCtrl: $ref: '#/components/schemas/ReportingCtrl' - ThresholdMonitoringCapability-Single: - allOf: - - $ref: '#/components/schemas/Top-Attr' - - type: object - properties: - attributes: - type: object - properties: - supportedMonitoringGPs: - $ref: '#/components/schemas/MonitoringGPList' ThresholdMonitor-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: + administrativeState: + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'comDefs.yaml#/components/schemas/OperationalState' + performanceMetrics: + type: array + items: + type: string thresholdInfoList: - $ref: '#/components/schemas/ThresholdInfoList' - monitoringGP: + type: array + items: + $ref: '#/components/schemas/ThresholdInfo' + monitorGranularityPeriod: type: integer - monitoringNotifTarget: - type: string - monitoredIOCName: - type: string - monitoredObjectDNs: - $ref: '#/components/schemas/DnList' + minimum: 1 + objectInstances: + $ref: 'comDefs.yaml#/components/schemas/DnList' + rootObjectInstances: + $ref: 'comDefs.yaml#/components/schemas/DnList' NtfSubscriptionControl-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: notificationRecipientAddress: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' notificationTypes: - $ref: '#/components/schemas/NotificationTypes' + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/NotificationType' scope: $ref: '#/components/schemas/Scope' notificationFilter: - type: string + $ref: 'comDefs.yaml#/components/schemas/Filter' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1513,11 +1613,12 @@ components: properties: heartbeatNtfPeriod: type: integer + minimum: 0 triggerHeartbeatNtf: type: boolean TraceJob-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1525,29 +1626,47 @@ components: AlarmList-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: administrativeState: - $ref: '#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: '#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' numOfAlarmRecords: type: integer lastModification: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmRecords: description: >- - This resource represents a map of alarm records. - The alarmIds are used as keys in the map. + This resource represents a map of alarm records. + The alarmIds are used as keys in the map. type: object additionalProperties: $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord' -#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + MnsInfo-Single: + type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS + mnsVersion: + type: string + mnsAddress: + description: Resource URI as defined in the relevant Technical Specification + $ref: 'comDefs.yaml#/components/schemas/Uri' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: type: array @@ -1561,6 +1680,10 @@ components: type: array items: $ref: '#/components/schemas/ManagementNode-Single' + MnsAgent-Multiple: + type: array + items: + $ref: '#/components/schemas/MnsAgent-Single' MeContext-Multiple: type: array items: @@ -1573,34 +1696,39 @@ components: type: array items: $ref: '#/components/schemas/ThresholdMonitor-Single' + TraceJob-Multiple: + type: array + items: + $ref: '#/components/schemas/TraceJob-Single' NtfSubscriptionControl-Multiple: type: array items: $ref: '#/components/schemas/NtfSubscriptionControl-Single' - TraceJob-Multiple: + MnsInfo-Multiple: type: array items: - $ref: '#/components/schemas/TraceJob-Single' + $ref: '#/components/schemas/MnsInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-genericNrm: oneOf: - - $ref: '#/components/schemas/VsDataContainer-Single' - - - $ref: '#/components/schemas/ManagementNode-Single' - - $ref: '#/components/schemas/MeContext-Single' + - $ref: '#/components/schemas/VsDataContainer-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' + - $ref: '#/components/schemas/ManagementNode-Single' + - $ref: '#/components/schemas/MnsAgent-Single' + - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/PerfMetricJob-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' - - $ref: '#/components/schemas/ThresholdMonitor-Single' + - $ref: '#/components/schemas/PerfMetricJob-Single' + - $ref: '#/components/schemas/ThresholdMonitor-Single' + - $ref: '#/components/schemas/TraceJob-Single' - - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - - $ref: '#/components/schemas/HeartbeatControl-Single' - - $ref: '#/components/schemas/TraceJob-Single' + - $ref: '#/components/schemas/NtfSubscriptionControl-Single' + - $ref: '#/components/schemas/HeartbeatControl-Single' - - $ref: '#/components/schemas/AlarmList-Single' + - $ref: '#/components/schemas/AlarmList-Single' + - $ref: '#/components/schemas/MnsRegistry-Single' + - $ref: '#/components/schemas/MnsInfo-Single' -- GitLab From b39085e4aa9cd725d5871a9d80eec1ec80ad2b8e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 07:42:25 +0000 Subject: [PATCH 107/268] Replace PerThresMonMnS.yaml with perfMnS.yaml (R16) --- OpenAPI/PerThresMonMnS.yaml | 108 ++++++++++++++---------------------- 1 file changed, 41 insertions(+), 67 deletions(-) diff --git a/OpenAPI/PerThresMonMnS.yaml b/OpenAPI/PerThresMonMnS.yaml index 923640a11..1fd64a7d2 100644 --- a/OpenAPI/PerThresMonMnS.yaml +++ b/OpenAPI/PerThresMonMnS.yaml @@ -1,17 +1,23 @@ openapi: 3.0.1 info: - title: TS 28.532 Performance Threshold Monitoring Service - version: 16.4.0 - description: OAS 3.0.1 specification of the Performance Threshold Monitoring Service + title: TS 28.532 Performance Threshold Monitoring MnS + version: 16.6.0 + description: >- + OAS 3.0.1 definition of the Performance Threshold Monitoring MnS + © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.532 V16.6.0; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: 'http://{monitoringNotifTarget}' + - url: '{root}' variables: - monitoringNotifTarget: + root: description: >- The open API server of the performance threshold monitoring service is located in the consumer side, see monitoringNotifTarget attribute of the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. - default: example.com + default: http://example.com/3GPPManagement paths: /notificationSink: post: @@ -22,7 +28,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyThresholdCrossing-NotifType' + $ref: '#/components/schemas/NotifyThresholdCrossing' responses: '204': description: >- @@ -33,70 +39,38 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - dateTime-Type: - type: string - format: date-Time - uri-Type: - type: string - long-Type: - type: string - format: long - thresholdLevel-Type: - type: integer - measurementTypeName-Type: - type: string - measurementValue-Type: - type: string - additionalText-Type: - type: string - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - header-Type: - description: Header used in notifications as notification header - type: object - properties: - uri: - $ref: '#/components/schemas/uri-Type' - notificationId: - $ref: '#/components/schemas/notificationId-Type' - notificationType: - $ref: '#/components/schemas/notificationType-Type' - eventTime: - $ref: '#/components/schemas/dateTime-Type' - notificationId-Type: - $ref: '#/components/schemas/long-Type' - notificationType-Type: + PerfNotificationTypes: type: string enum: - notifyThresholdCrossing - notifyThresholdCrossing-NotifType: - type: object - properties: - header: - $ref: '#/components/schemas/header-Type' - body: - type: object + PerfMetricValue: + oneOf: + - type: integer + - $ref: 'comDefs.yaml#/components/schemas/Float' + PerfMetricDirection: + type: string + enum: + - UP + - DOWN + NotifyThresholdCrossing: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object properties: - startOfMonitoringGP: - $ref: '#/components/schemas/dateTime-Type' - endOfMonitoringGP: - $ref: '#/components/schemas/dateTime-Type' - monitoredObjectInstance: - $ref: '#/components/schemas/uri-Type' - thresholdLevel: - $ref: '#/components/schemas/thresholdLevel-Type' - measurementTypeName: - $ref: '#/components/schemas/measurementTypeName-Type' - measurementValue: - $ref: '#/components/schemas/measurementValue-Type' + observedPerfMetricName: + type: string + observedPerfMetricValue: + $ref: '#/components/schemas/PerfMetricValue' + observedPerfMetricDirection: + $ref: '#/components/schemas/PerfMetricDirection' + thresholdValue: + $ref: '#/components/schemas/PerfMetricValue' + hysteresis: + $ref: '#/components/schemas/PerfMetricValue' + monitorGranularityPeriod: + type: integer additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string -- GitLab From 4c1f448c3b04d0813880c9dc7c1ef580c0ed054a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 07:46:09 +0000 Subject: [PATCH 108/268] Delete PerThresMonMnS.yaml --- OpenAPI/PerThresMonMnS.yaml | 76 ------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 OpenAPI/PerThresMonMnS.yaml diff --git a/OpenAPI/PerThresMonMnS.yaml b/OpenAPI/PerThresMonMnS.yaml deleted file mode 100644 index 1fd64a7d2..000000000 --- a/OpenAPI/PerThresMonMnS.yaml +++ /dev/null @@ -1,76 +0,0 @@ -openapi: 3.0.1 -info: - title: TS 28.532 Performance Threshold Monitoring MnS - version: 16.6.0 - description: >- - OAS 3.0.1 definition of the Performance Threshold Monitoring MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.532 V16.6.0; Generic management services - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ -servers: - - url: '{root}' - variables: - root: - description: >- - The open API server of the performance threshold monitoring service is - located in the consumer side, see monitoringNotifTarget attribute of - the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. - default: http://example.com/3GPPManagement -paths: - /notificationSink: - post: - summary: Send notifications about performance threshold crossing - description: To send a notifyThresholdCrossing notification - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyThresholdCrossing' - responses: - '204': - description: >- - Success case ("204 No Content"). The notification is successfully - delivered. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' -components: - schemas: - PerfNotificationTypes: - type: string - enum: - - notifyThresholdCrossing - PerfMetricValue: - oneOf: - - type: integer - - $ref: 'comDefs.yaml#/components/schemas/Float' - PerfMetricDirection: - type: string - enum: - - UP - - DOWN - NotifyThresholdCrossing: - allOf: - - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - - type: object - properties: - observedPerfMetricName: - type: string - observedPerfMetricValue: - $ref: '#/components/schemas/PerfMetricValue' - observedPerfMetricDirection: - $ref: '#/components/schemas/PerfMetricDirection' - thresholdValue: - $ref: '#/components/schemas/PerfMetricValue' - hysteresis: - $ref: '#/components/schemas/PerfMetricValue' - monitorGranularityPeriod: - type: integer - additionalText: - type: string -- GitLab From b2e1eef7038f5bfced3c9828f7afed79b1bcf45a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 07:50:01 +0000 Subject: [PATCH 109/268] Upload perfMnS.yaml --- OpenAPI/perfMnS.yaml | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 OpenAPI/perfMnS.yaml diff --git a/OpenAPI/perfMnS.yaml b/OpenAPI/perfMnS.yaml new file mode 100644 index 000000000..1fd64a7d2 --- /dev/null +++ b/OpenAPI/perfMnS.yaml @@ -0,0 +1,76 @@ +openapi: 3.0.1 +info: + title: TS 28.532 Performance Threshold Monitoring MnS + version: 16.6.0 + description: >- + OAS 3.0.1 definition of the Performance Threshold Monitoring MnS + © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.532 V16.6.0; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ +servers: + - url: '{root}' + variables: + root: + description: >- + The open API server of the performance threshold monitoring service is + located in the consumer side, see monitoringNotifTarget attribute of + the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. + default: http://example.com/3GPPManagement +paths: + /notificationSink: + post: + summary: Send notifications about performance threshold crossing + description: To send a notifyThresholdCrossing notification + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyThresholdCrossing' + responses: + '204': + description: >- + Success case ("204 No Content"). The notification is successfully + delivered. The response message body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' +components: + schemas: + PerfNotificationTypes: + type: string + enum: + - notifyThresholdCrossing + PerfMetricValue: + oneOf: + - type: integer + - $ref: 'comDefs.yaml#/components/schemas/Float' + PerfMetricDirection: + type: string + enum: + - UP + - DOWN + NotifyThresholdCrossing: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + observedPerfMetricName: + type: string + observedPerfMetricValue: + $ref: '#/components/schemas/PerfMetricValue' + observedPerfMetricDirection: + $ref: '#/components/schemas/PerfMetricDirection' + thresholdValue: + $ref: '#/components/schemas/PerfMetricValue' + hysteresis: + $ref: '#/components/schemas/PerfMetricValue' + monitorGranularityPeriod: + type: integer + additionalText: + type: string -- GitLab From e3c514b8ac2093f72de167c728d1c55218ba4a0e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 07:53:21 +0000 Subject: [PATCH 110/268] upload filedatareportingMnS --- OpenAPI/fileDataReportingMnS.yaml | 229 ++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) create mode 100644 OpenAPI/fileDataReportingMnS.yaml diff --git a/OpenAPI/fileDataReportingMnS.yaml b/OpenAPI/fileDataReportingMnS.yaml new file mode 100644 index 000000000..e9f6c71b8 --- /dev/null +++ b/OpenAPI/fileDataReportingMnS.yaml @@ -0,0 +1,229 @@ +openapi: 3.0.1 +info: + title: File Data Reporting MnS + version: 16.10.0 + description: >- + OAS 3.0.1 definition of the File Data Reporting MnS + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.532; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ +servers: + - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}' + variables: + MnSRoot: + description: See clause 4.4.3 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX +paths: + /files: + get: + summary: Read information about available files + description: >- + Information about available files is read with HTTP GET. The files for + which information shall be returned are identified with the path + component (base resource) and the query component (fileDataType, beginTime, + endTime) of the URI. + parameters: + - name: fileDataType + in: query + description: >- + This parameter selects files based on the file data type. + required: true + schema: + $ref: '#/components/schemas/FileDataType' + - name: beginTime + in: query + description: >- + This parameter selects files based on the earliest time they + became available + required: false + schema: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + - name: endTime + in: query + description: >- + This parameter selects files based on the latest time they + became available + required: false + schema: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + responses: + '200': + description: >- + 'Success case ("200 OK"). + The resources identified in the request for retrieval are returned + in the response message body.' + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/FileInfo' + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + /subscriptions: + post: + summary: Create a subscription + description: >- + To create a subscription the representation of the subscription is + POSTed on the /subscriptions collection resource. + requestBody: + required: true + content: + application/json: + schema: + $ref: 'faultMnS.yaml#/components/schemas/Subscription' + responses: + '201': + description: >- + Success case ("201 Created"). + The representation of the newly created subscription resource shall + be returned. + content: + application/json: + schema: + $ref: 'faultMnS.yaml#/components/schemas/Subscription' + headers: + Location: + description: URI of the newly created subscription resource + required: true + schema: + type: string + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + callbacks: + notifyFileReady: + '{request.body#/consumerReference}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyFileReady' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + notifyFilePreparationError: + '{request.body#/consumerReference}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyFilePreparationError' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + /subscriptions/{subscriptionId}: + delete: + summary: Delete a subscription + description: >- + The subscription is deleted by deleting the corresponding subscription + resource. The resource to be deleted is identified with the path + component of the URI. + parameters: + - name: subscriptionId + in: path + description: Identifies the subscription to be deleted. + required: true + schema: + type: string + responses: + '204': + description: >- + Success case ("204 No Content"). + The subscription resource has been deleted. The response message body + is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' +components: + schemas: + FileDataType: + type: string + enum: + - Performance + - Trace + - Anatytics + - Proprietary + FileNotificationTypes: + type: string + enum: + - notifyFileReady + - notifyFilePreparationError + FileInfo: + type: object + properties: + fileLocation: + $ref: 'comDefs.yaml#/components/schemas/Uri' + fileSize: + type: integer + fileReadyTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileExpirationTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileCompression: + type: string + fileFormat: + type: string + fileDataType: + $ref: '#/components/schemas/FileDataType' + NotifyFileReady: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + fileInfoList: + type: array + items: + $ref: '#/components/schemas/FileInfo' + additionalText: + type: string + NotifyFilePreparationError: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + fileInfoList: + type: array + items: + $ref: '#/components/schemas/FileInfo' + reason: + type: string + additionalText: + type: string \ No newline at end of file -- GitLab From 3622957aa5147802b84ab847c2a1ce24d64591ab Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:00:39 +0000 Subject: [PATCH 111/268] Delete PerDataFileReportMnS.yaml --- OpenAPI/PerDataFileReportMnS.yaml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 OpenAPI/PerDataFileReportMnS.yaml diff --git a/OpenAPI/PerDataFileReportMnS.yaml b/OpenAPI/PerDataFileReportMnS.yaml deleted file mode 100644 index 83fd77acb..000000000 --- a/OpenAPI/PerDataFileReportMnS.yaml +++ /dev/null @@ -1,13 +0,0 @@ -openapi: 3.0.1 -info: - title: TS 28.532 File data reporting Service - version: 16.6.0 - description: >- - OAS 3.0.1 specification of the File data reporting Management Service © 2020, - 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All - rights reserved. -externalDocs: - description: 3GPP TS 28.532 V16.5.0; Generic management services - url: 'http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/' -paths: {} - -- GitLab From 47f8a29fd37b6ae68455e3371a3d31b4c8df229e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:01:22 +0000 Subject: [PATCH 112/268] Delete PerfDataStreamingMnS.yaml --- OpenAPI/PerfDataStreamingMnS.yaml | 363 ------------------------------ 1 file changed, 363 deletions(-) delete mode 100644 OpenAPI/PerfDataStreamingMnS.yaml diff --git a/OpenAPI/PerfDataStreamingMnS.yaml b/OpenAPI/PerfDataStreamingMnS.yaml deleted file mode 100644 index e040e14c8..000000000 --- a/OpenAPI/PerfDataStreamingMnS.yaml +++ /dev/null @@ -1,363 +0,0 @@ -openapi: 3.0.1 -info: - title: TS 28.550 Performance Data Streaming Service - version: 16.3.0 - description: OAS 3.0.1 specification of the Performance Data Streaming Service -servers: - - url: 'http://{streamTarget}/PerfDataStreamMnS/v1630' - description: This URL is used for posting the set of information about streams supported on the connection between the producer and the consumer. - variables: - streamTarget: - description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).' - default: example.com - - url: 'wss://{streamTarget}/PerfDataStreamMnS/v1630/streamingConnection' - description: This URL is used for establishing the WebSocket connection for the performance data streaming service. - variables: - streamTarget: - description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).' - default: example.com -paths: - /streamInfoList: - post: - summary: The set of information about the streams sent from the producer to the consumer - description: To send the streamInfoList from the producer to the consumer - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoListPost-RequestType' - responses: - '201': - description: Success case ("201 Posted"). The streamInfoList is successfully posted. - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoListPost-ResponseType' - '202': - description: Partial success case ("202 Partially posted"). The representation of the posted resource on stream information. - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoListPost-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - get: - summary: Read resources of stream information from the streaming consumer - description: 'With HTTP GET, resources of stream information are read. The resources to be read are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be returned.' - parameters: - - name: streamIdList - in: query - description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI. - required: true - schema: - type: array - items: - type: integer - responses: - '200': - description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.' - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType' - '202': - description: Partial success case ("202 Partially retrieved"). The representation of the retrieved resources on stream information. - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - patch: - summary: Update resources of stream information to the streaming consumer - description: 'With HTTP PATCH, resources of stream information are to be updated. The resources to be updated are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be updated.' - parameters: - - name: streamIdList - in: query - description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI. - required: true - schema: - type: array - items: - type: integer - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoToUpdate-RequestType' - responses: - '200': - description: Success case ("200 OK"). The resources selected by the query parameter are updated and returned in the response message body. - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType' - '202': - description: Partial success case ("202 Partially updated"). The representation of the updated resources on stream information - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - delete: - summary: The information of streams to be deleted by the producer to the consumer - description: 'With HTTP DELETE, resources of stream information are to be deleted. The resources to be deleted are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be deleted.' - parameters: - - name: streamIdList - in: query - description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI. - required: true - schema: - type: array - items: - type: integer - responses: - '204': - description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - '/streamInfoList/{streamId}': - get: - summary: Read resource of the stream information from the streaming consumer - description: 'With HTTP GET, resource of stream information is read. The resource to be read is identified with the path component the URI.' - parameters: - - name: streamId - in: path - description: Identifies the stream for which the information is to be retrieved. - required: true - schema: - $ref: '#/components/schemas/uri-Type' - responses: - '200': - description: Success case ("200 OK"). The resource identified in the request for retrieval is returned in the response message body. - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - patch: - summary: Update the resource of stream information to the streaming consumer - description: 'With HTTP PATCH, resource of stream information is to be updated. The resource to be updated is identified by the path component of the URI. ' - parameters: - - name: streamId - in: path - description: Identifies the stream for which the information is to be updated. - required: true - schema: - $ref: '#/components/schemas/uri-Type' - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoToUpdate-RequestType' - responses: - '200': - description: Success case ("200 OK"). The resources identified by the path of the URI is updated and returned in the response message body. - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoUpdate-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - delete: - summary: The stream information to be deleted by the producer to the consumer - description: 'With HTTP DELETE, resource of stream information identified by the path component of the URI is to be deleted.' - parameters: - - name: streamId - in: path - description: Identifies the stream for which the information is to be deleted - required: true - schema: - $ref: '#/components/schemas/uri-Type' - responses: - '204': - description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - /streamConnection: - get: - summary: The connection for streaming from the producer to the consumer - description: To establish the WebSocket connection between the producer and the consumer. The HTTP version of this operation shall not be earlier than HTTP/1.1 - parameters: - - in: header - name: Upgrade - required: true - schema: - $ref: '#/components/schemas/Upgrade-HeaderType' - - in: header - name: Connection - required: true - schema: - $ref: '#/components/schemas/Connection-HeaderType' - - in: header - name: Sec-WebSocket-Key - required: true - schema: - $ref: '#/components/schemas/Sec-WebSocket-Key-HeaderType' - - in: header - name: Sec-WebSocket-Version - required: true - schema: - $ref: '#/components/schemas/Sec-WebSocket-Version-HeaderType' - responses: - '101': - description: Success case ("101 Switching Protocols "). The connection has been successfully switched to WebSocket. The response message body is absent. - headers: - Upgrade: - schema: - $ref: '#/components/schemas/Upgrade-HeaderType' - Connection: - schema: - $ref: '#/components/schemas/Connection-HeaderType' - Sec-WebSocket-Accept-HeaderType: - schema: - $ref: '#/components/schemas/Sec-WebSocket-Accept-HeaderType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' -components: - schemas: - uri-Type: - type: string - streamInfoIn-Type: - type: object - properties: - streamId: - type: integer - iOCInstance: - $ref: '#/components/schemas/uri-Type' - measTypes: - type: array - items: - type: string - streamInfoOut-Type: - type: object - properties: - streamId: - $ref: '#/components/schemas/uri-Type' - iOCInstance: - $ref: '#/components/schemas/uri-Type' - measTypes: - type: array - items: - type: string - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - streamInfoListPost-RequestType: - type: object - properties: - streamInfoList: - type: array - items: - $ref: '#/components/schemas/streamInfoIn-Type' - streamInfoListPost-ResponseType: - type: object - properties: - streamInfoListPosted: - type: array - items: - $ref: '#/components/schemas/streamInfoOut-Type' - streamInfoRetrieval-ResponseType: - type: object - properties: - streamInfoOut: - $ref: '#/components/schemas/streamInfoOut-Type' - listOfStreamInfoRetrieval-ResponseType: - type: object - properties: - listOfStreamInfoOut: - type: array - items: - $ref: '#/components/schemas/streamInfoOut-Type' - streamInfoToUpdatePropertyType: - type: object - properties: - iOCInstance: - description: 'The updated measured object instance, empty value means no update.' - allOf: - - $ref: '#/components/schemas/uri-Type' - measTypes: - description: 'The updated list of measurement type, empty value means no update.' - type: array - items: - type: string - streamInfoToUpdate-RequestType: - type: object - properties: - streamInfoToUpdate: - $ref: '#/components/schemas/streamInfoToUpdatePropertyType' - listOfStreamInfoToUpdate-RequestType: - type: object - properties: - listOfStreamInfoToUpdate: - type: array - items: - $ref: '#/components/schemas/streamInfoToUpdatePropertyType' - streamInfoUpdate-ResponseType: - type: object - properties: - streamInfoUpdated: - $ref: '#/components/schemas/streamInfoOut-Type' - listOfStreamInfoUpdate-ResponseType: - type: object - properties: - listOfStreamInfoUpdated: - type: array - items: - $ref: '#/components/schemas/streamInfoOut-Type' - Upgrade-HeaderType: - type: string - enum: - - websocket - Connection-HeaderType: - type: string - enum: - - Upgrade - Sec-WebSocket-Key-HeaderType: - type: string - Sec-WebSocket-Version-HeaderType: - type: string - Sec-WebSocket-Accept-HeaderType: - type: string -- GitLab From 4cc53bd80be3713a2497f8f72916501e343ea2df Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:02:37 +0000 Subject: [PATCH 113/268] Update PerMeasJobCtlMnS.yaml to align with latest R16 PerMeasJobCtlMnS.yaml --- OpenAPI/PerMeasJobCtlMnS.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/OpenAPI/PerMeasJobCtlMnS.yaml b/OpenAPI/PerMeasJobCtlMnS.yaml index b6abe58b2..50fea5a73 100644 --- a/OpenAPI/PerMeasJobCtlMnS.yaml +++ b/OpenAPI/PerMeasJobCtlMnS.yaml @@ -1,26 +1,23 @@ openapi: 3.0.1 info: title: TS 28.550 Performance Measurement Job Control Service - version: 16.5.0 + version: 16.8.0 description: >- OAS 3.0.1 specification of the Performance Measurement Job Control Service @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.550 V16.5.0; Performance assurance + description: 3GPP TS 28.550 V16.8.0; Performance assurance url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.550/ servers: - - url: 'http://{URI-DN-prefix}/{root}/PerfMeasJobCtrlMnS/v1650/{LDN-first-part}' + - url: '{MnSRoot}/PerfMeasJobCtrlMnS/{MnSVersion}' variables: - URI-DN-prefix: - description: See subclause 4.4 of TS 32.158 - default: example.com - root: - description: See subclause 4.4 of TS 32.158 - default: 3GPPManagement - LDN-first-part: - description: See subclause 4.4 of TS 32.158 - default: '' + MnSRoot: + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX paths: /measJobs: post: -- GitLab From 045250de7656fada6a686bd979ff8094919a4c4b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:05:02 +0000 Subject: [PATCH 114/268] Update faultMnS.yaml to the latest R16 faultMnS.yaml --- OpenAPI/faultMnS.yaml | 254 ++++++++++++++---------------------------- 1 file changed, 84 insertions(+), 170 deletions(-) diff --git a/OpenAPI/faultMnS.yaml b/OpenAPI/faultMnS.yaml index 499123b90..203b424b9 100644 --- a/OpenAPI/faultMnS.yaml +++ b/OpenAPI/faultMnS.yaml @@ -1,22 +1,22 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 16.4.0 + version: 16.10.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.4.0; Generic management services + description: 3GPP TS 28.532; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: '{MnSRoot}/FaultSupervisionMnS/{version}' + - url: '{MnSRoot}/FaultSupervisionMnS/{MnSversion}' variables: MnSRoot: description: See subclause 4.4.3 of TS 32.158 default: http://example.com/3GPPManagement - version: - description: Versi on number of the OpenAPI definition + MnSversion: + description: Version number of the OpenAPI definition default: XXX paths: /alarms: @@ -35,12 +35,12 @@ paths: in: query required: false schema: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - name: filter in: query required: false schema: - $ref: '#/components/schemas/Filter' + $ref: 'comDefs.yaml#/components/schemas/Filter' responses: '200': description: >- @@ -57,7 +57,7 @@ paths: - type: object properties: lastNotificationHeader: - $ref: '#/components/schemas/NotificationHeader' + $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - $ref: '#/components/schemas/AlarmRecord' - type: object properties: @@ -68,7 +68,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' patch: summary: 'Clear, acknowledge or unacknowledge multiple alarms' description: >- @@ -130,7 +130,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /alarms/{alarmId}: patch: summary: 'Clear, acknowledge or unacknowledge a single alarm' @@ -163,7 +163,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /alarms/{alarmId}/comments: post: summary: Add a comment to a single alarm @@ -203,7 +203,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /subscriptions: post: @@ -238,7 +238,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' callbacks: notifyNewAlarm: '{request.body#/consumerReference}': @@ -262,7 +262,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyClearedAlarm: '{request.body#/consumerReference}': post: @@ -283,7 +283,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyChangedAlarm: '{request.body#/consumerReference}': post: @@ -304,7 +304,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyChangedAlarmGeneral: '{request.body#/consumerReference}': post: @@ -327,7 +327,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyCorrelatedNotificationChanged: '{request.body#/consumerReference}': post: @@ -348,7 +348,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyAckStateChanged: '{request.body#/consumerReference}': post: @@ -369,7 +369,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyComments: '{request.body#/consumerReference}': post: @@ -390,7 +390,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyPotentialFaultyAlarmList: '{request.body#/consumerReference}': post: @@ -411,7 +411,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyAlarmListRebuilt: '{request.body#/consumerReference}': post: @@ -432,7 +432,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /subscriptions/{subscriptionId}: delete: summary: Delete a subscription @@ -458,91 +458,10 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - - #---- Definitions to be moved to comDefs.yaml --------------------------------------# - - Long: - type: string - format: long - Float: - type: string - format: float - DateTime: - type: string - format: date-Time - - Dn: - type: string - Uri: - type: string - - AttributeNameValuePairSet: - type: object - minProperties: 1 - AttributeValueChangeSet: - description: >- - The key in this map is the attribute name. The value of each key is an array. - When only one item is present in the array, it carries the new attribute - value. If two items are present, then the first item carries the old value - and the second item the new value. The items can be of any type including null. - type: object - additionalProperties: - type: array - minItems: 1 - maxItems: 2 - items: - nullable: true - - Filter: - type: string - SystemDN: - type: string - - NotificationId: - type: integer - NotificationHeader: - description: >- - Header used for all notification types - type: object - required: - - href - - notificationId - - notificationType - - eventTime - - systemDN - properties: - uri: - $ref: '#/components/schemas/Uri' - notificationId: - $ref: '#/components/schemas/NotificationId' - notificationType: - oneOf: - - $ref: '#/components/schemas/AlarmNotificationTypes' - #- $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes' - #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' - # more to be added - eventTime: - $ref: '#/components/schemas/DateTime' - systemDN: - $ref: '#/components/schemas/SystemDN' - - ErrorResponse: - description: >- - Default schema for the response message body in case the request is not - successful. - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - - #---- End of definitions to be moved to comDefs.yaml -------------------------------# #---- Definition of AlarmRecord ----------------------------------------------------# @@ -608,46 +527,47 @@ components: high: oneOf: - type: integer - - $ref: '#/components/schemas/Float' + - $ref: 'comDefs.yaml#/components/schemas/Float' low: - $ref: '#/components/schemas/Float' + $ref: 'comDefs.yaml#/components/schemas/Float' ThresholdLevelInd: - type: object - required: - - up - properties: - up: - $ref: '#/components/schemas/ThresholdHysteresis' - low: - $ref: '#/components/schemas/ThresholdHysteresis' + oneOf: + - type: object + properties: + up: + $ref: '#/components/schemas/ThresholdHysteresis' + - type: object + properties: + down: + $ref: '#/components/schemas/ThresholdHysteresis' ThresholdInfo: type: object - required: - - observedMeasurement - - observedValue properties: observedMeasurement: type: string observedValue: oneOf: - type: integer - - $ref: '#/components/schemas/Float' - thresholdLevelInd: + - $ref: 'comDefs.yaml#/components/schemas/Float' + thresholdLevel: $ref: '#/components/schemas/ThresholdLevelInd' armTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' + required: + - observedMeasurement + - observedValue CorrelatedNotification: type: object - required: - - source - - notificationId properties: sourceObjectInstance: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' notificationIds: type: array items: - $ref: '#/components/schemas/NotificationId' + $ref: 'comDefs.yaml#/components/schemas/NotificationId' + required: + - sourceObjectInstance + - notificationIds CorrelatedNotifications: type: array items: @@ -667,15 +587,15 @@ components: # alarmId: # $ref: '#/components/schemas/AlarmId' objectInstance: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' notificationId: - $ref: '#/components/schemas/NotificationId' + $ref: 'comDefs.yaml#/components/schemas/NotificationId' alarmRaisedTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmChangedTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmClearedTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmType: $ref: '#/components/schemas/AlarmType' probableCause: @@ -687,7 +607,7 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: @@ -695,21 +615,21 @@ components: correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: - $ref: '#/components/schemas/AttributeValueChangeSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean ackTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' ackUserId: type: string ackSystemId: @@ -740,7 +660,7 @@ components: - notifyCorrelatedNotificationChanged - notifyComments - notifyClearedAlarm - - notifyAlarmListRebuiltAlarm + - notifyAlarmListRebuilt - notifyPotentialFaultyAlarmList AlarmListAlignmentRequirement: type: string @@ -750,7 +670,7 @@ components: NotifyNewAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -771,7 +691,7 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: @@ -779,20 +699,20 @@ components: correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: - $ref: '#/components/schemas/AttributeValueChangeSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean NotifyNewSecAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -816,7 +736,7 @@ components: additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean serviceUser: @@ -827,7 +747,7 @@ components: type: string NotifyClearedAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -851,7 +771,7 @@ components: type: string NotifyChangedAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -869,14 +789,11 @@ components: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId - alarmType - - probableCause - - perceivedSeverity - - changedAlarmAttributes properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -893,38 +810,35 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: $ref: '#/components/schemas/ThresholdInfo' stateChangeDefinition: - $ref: '#/components/schemas/AttributeValueChangeSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean changedAlarmAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' NotifyChangedSecAlarmGeneral: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId - alarmType - - probableCause - - perceivedSeverity - serviceUser - serviceProvider - securityAlarmDetector - - changedAlarmAttributes properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -939,7 +853,7 @@ components: additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean serviceUser: @@ -949,10 +863,10 @@ components: securityAlarmDetector: type: string changedAlarmAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' NotifyCorrelatedNotificationChanged: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -966,7 +880,7 @@ components: type: boolean NotifyAckStateChanged: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -992,7 +906,7 @@ components: type: string NotifyComments: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -1013,7 +927,7 @@ components: $ref: '#/components/schemas/Comments' NotifyPotentialFaultyAlarmList: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - reason @@ -1022,7 +936,7 @@ components: type: string NotifyAlarmListRebuilt: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - reason @@ -1119,7 +1033,7 @@ components: type: object properties: commentTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' commentUserId: type: string commentSystemId: @@ -1137,8 +1051,8 @@ components: type: object properties: consumerReference: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' timeTick: - $ref: '#/components/schemas/Long' + type: integer filter: - $ref: '#/components/schemas/Filter' + $ref: 'comDefs.yaml#/components/schemas/Filter' -- GitLab From a760ddb12a69745d1fbb062ad1af32dd11f59ff6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:06:30 +0000 Subject: [PATCH 115/268] Update heartbeatNtf.yaml to latest R16 heartbeatNtf.yaml --- OpenAPI/heartbeatNtf.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/OpenAPI/heartbeatNtf.yaml b/OpenAPI/heartbeatNtf.yaml index afde5066d..efa3185bd 100644 --- a/OpenAPI/heartbeatNtf.yaml +++ b/OpenAPI/heartbeatNtf.yaml @@ -1,23 +1,25 @@ openapi: 3.0.1 info: title: Heartbeat notification - version: 16.3.0 + version: 16.6.0 description: >- - OAS 3.0.1 specification of the heartbeat notification + OAS 3.0.1 definition of the heartbeat notification © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.3.0; Heartbeat notification + description: 3GPP TS 28.532 V16.6.0; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.6532/ paths: {} components: schemas: - hearbeatNtfPeriod-Type: - type: integer - notifyHeartbeat-NotifType: + HeartbeatNotificationTypes: + type: string + enum: + - notifyHeartbeat + NotifyHeartbeat: allOf: - - $ref: 'provMnS.yaml#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: heartbeatNtfPeriod: - $ref: '#/components/schemas/hearbeatNtfPeriod-Type' + type: integer -- GitLab From 61a8ee7f451730753d810e36b4a0d3123fa6e587 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:12:28 +0000 Subject: [PATCH 116/268] Update provMnS.yaml to latest R16 provMnS.yaml --- OpenAPI/provMnS.yaml | 303 ++++++++++++++++--------------------------- 1 file changed, 112 insertions(+), 191 deletions(-) diff --git a/OpenAPI/provMnS.yaml b/OpenAPI/provMnS.yaml index b2f84a4d2..1dd467e16 100644 --- a/OpenAPI/provMnS.yaml +++ b/OpenAPI/provMnS.yaml @@ -1,25 +1,25 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 16.4.0 + version: 16.5.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.4.0; Generic management services + description: 3GPP TS 28.532; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: 'http://{URI-DN-prefix}/{root}/ProvMnS/v1640/{LDN-first-part}' + - url: '{MnSRoot}/ProvMnS/{MnSVersion}/{URI-LDN-first-part}' variables: - URI-DN-prefix: - description: See subclause 4.4 of TS 32.158 - default: example.com - root: - description: See subclause 4.4 of TS 32.158 - default: 3GPPManagement - LDN-first-part: - description: See subclause 4.4 of TS 32.158 + MnSRoot: + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX + URI-LDN-first-part: + description: See clause 4.4.2 of TS 32.158 default: '' paths: '/{className}={id}': @@ -28,12 +28,12 @@ paths: in: path required: true schema: - $ref: '#/components/schemas/className-PathType' + type: string - name: id in: path required: true schema: - $ref: '#/components/schemas/id-PathType' + type: string put: summary: Replaces a complete single resource or creates it if it does not exist description: >- @@ -44,7 +44,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourcePut-RequestType' + $ref: '#/components/schemas/Resource' responses: '200': description: >- @@ -60,7 +60,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceUpdate-ResponseType' + $ref: '#/components/schemas/Resource' '201': description: >- Success case ("201 Created"). @@ -70,7 +70,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceCreation-ResponseType' + $ref: '#/components/schemas/Resource' '204': description: >- Success case ("204 No Content"). @@ -82,7 +82,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' callbacks: notifyMOICreation: '{request.body#/notificationRecipientAddress}': @@ -92,7 +92,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOICreation-NotifType' + $ref: '#/components/schemas/NotifyMoiCreation' responses: '204': description: >- @@ -104,7 +104,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyMOIDeletion: '{request.body#/notificationRecipientAddress}': post: @@ -113,7 +113,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOIDeletion-NotifType' + $ref: '#/components/schemas/NotifyMoiDeletion' responses: '204': description: >- @@ -125,8 +125,8 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' - notifyMOIAttributeValueChange: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + notifyMOIAttributeValueChanges: '{request.body#/notificationRecipientAddress}': post: requestBody: @@ -134,7 +134,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOIAttributeValueChange-NotifType' + $ref: '#/components/schemas/NotifyMoiAttributeValueChanges' responses: '204': description: >- @@ -146,7 +146,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyMOIChanges: '{request.body#/notificationRecipientAddress}': post: @@ -155,7 +155,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOIChanges-NotifType' + $ref: '#/components/schemas/NotifyMoiChanges' responses: '204': description: >- @@ -167,7 +167,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' get: summary: Reads one or multiple resources description: >- @@ -183,7 +183,7 @@ paths: mechanism is specified in the present document. required: false schema: - $ref: '#/components/schemas/scope-QueryType' + $ref: '#/components/schemas/Scope' style: form explode: true - name: filter @@ -196,7 +196,7 @@ paths: document. required: false schema: - $ref: '#/components/schemas/filter-QueryType' + $ref: 'comDefs.yaml#/components/schemas/Filter' - name: attributes in: query description: >- @@ -204,7 +204,9 @@ paths: are returned. required: true schema: - $ref: '#/components/schemas/attributes-QueryType' + type: array + items: + type: string style: form explode: false - name: fields @@ -214,7 +216,9 @@ paths: that are returned. required: false schema: - $ref: '#/components/schemas/fields-QueryType' + type: array + items: + type: string style: form explode: false responses: @@ -229,13 +233,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceRetrieval-ResponseType' + $ref: '#/components/schemas/Resource' default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' patch: summary: Patches one or multiple resources description: >- @@ -254,16 +258,20 @@ paths: content: application/merge-patch+json: schema: - $ref: '#/components/schemas/jsonMergePatch-RequestType' + $ref: '#/components/schemas/Resource' application/3gpp-merge-patch+json: schema: - $ref: '#/components/schemas/3gppJsonMergePatch-RequestType' + $ref: '#/components/schemas/Resource' application/json-patch+json: schema: - $ref: '#/components/schemas/jsonPatch-RequestType' + type: array + items: + type: object application/3gpp-json-patch+json: schema: - $ref: '#/components/schemas/3gppJsonPatch-RequestType' + type: array + items: + type: object responses: '200': description: >- @@ -276,7 +284,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceUpdate-ResponseType' + $ref: '#/components/schemas/Resource' '204': description: >- Success case ("204 No Content"). @@ -288,7 +296,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' delete: summary: Deletes one or multiple resources description: >- @@ -303,7 +311,9 @@ paths: mechanism is specified in the present document. required: false schema: - $ref: '#/components/schemas/scope-QueryType' + $ref: '#/components/schemas/Scope' + style: form + explode: true - name: filter in: query description: >- @@ -314,7 +324,7 @@ paths: document. required: false schema: - $ref: '#/components/schemas/filter-QueryType' + $ref: 'comDefs.yaml#/components/schemas/Filter' responses: '200': description: >- @@ -331,136 +341,66 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceDeletion-ResponseType' + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/Uri' default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - dateTime-Type: - type: string - format: date-time - long-Type: - type: integer - format: int64 - uri-Type: - type: string - correlatedNotification-Type: + CorrelatedNotification: type: object properties: source: - $ref: '#/components/schemas/uri-Type' + $ref: 'comDefs.yaml#/components/schemas/Dn' notificationIds: type: array items: - $ref: '#/components/schemas/notificationId-Type' - notificationId-Type: - $ref: '#/components/schemas/long-Type' - notificationType-Type: + $ref: 'comDefs.yaml#/components/schemas/NotificationId' + required: + - source + - notificationIds + CmNotificationTypes: type: string enum: - notifyMOICreation - notifyMOIDeletion - - notifyMOIAttributeValueChange - systemDN-Type: + - notifyMOIAttributeValueChanges + - notifyMOIChanges + SourceIndicator: type: string - additionalText-Type: - type: string - sourceIndicator-Type: + enum: + - RESOURCE_OPERATION + - MANAGEMENT_OPERATION + - SON_OPERATION + - UNKNOWN + Operation: type: string enum: - - resourceOperation - - mangementOperation - - sONOperation - - unknown - header-Type: - type: object - properties: - href: - $ref: '#/components/schemas/uri-Type' - notificationId: - $ref: '#/components/schemas/notificationId-Type' - notificationType: - $ref: '#/components/schemas/notificationType-Type' - eventTime: - $ref: '#/components/schemas/dateTime-Type' - systemDN: - $ref: '#/components/schemas/systemDN-Type' - required: - - href - - notificationId - - notificationType - - eventTime - - systemDN - scopeType-Type: + - CREATE + - DELETE + - REPLACE + ScopeType: type: string enum: - BASE_ONLY - BASE_NTH_LEVEL - BASE_SUBTREE - BASE_ALL - scopeLevel-Type: - type: integer - className-PathType: - type: string - id-PathType: - type: string - attributes-QueryType: - type: array - items: - type: string - fields-QueryType: - type: array - items: - type: string - filter-QueryType: - type: string - scope-QueryType: + Scope: type: object properties: scopeType: - $ref: '#/components/schemas/scopeType-Type' + $ref: '#/components/schemas/ScopeType' scopeLevel: - $ref: '#/components/schemas/scopeLevel-Type' + type: integer - resourcePut-RequestType: - $ref: '#/components/schemas/resourceRepresentation-Type' - jsonMergePatch-RequestType: - $ref: '#/components/schemas/resourceRepresentation-Type' - 3gppJsonMergePatch-RequestType: - $ref: '#/components/schemas/resourceRepresentation-Type' - jsonPatch-RequestType: - type: array - items: - type: object - 3gppJsonPatch-RequestType: - type: array - items: - type: object - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - resourceRetrieval-ResponseType: - $ref: '#/components/schemas/resourceRepresentation-Type' - resourceCreation-ResponseType: - $ref: '#/components/schemas/resourceRepresentation-Type' - resourceUpdate-ResponseType: - $ref: '#/components/schemas/resourceRepresentation-Type' - resourceDeletion-ResponseType: - type: array - items: - $ref: '#/components/schemas/uri-Type' - - resourceRepresentation-Type: + Resource: oneOf: - type: object properties: @@ -478,102 +418,83 @@ components: - $ref: '5gcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'sliceNrm.yaml#/components/schemas/resources-sliceNrm' - mOIChange-Type: + MoiChange: type: object properties: notificationId: - $ref: '#/components/schemas/notificationId-Type' + $ref: 'comDefs.yaml#/components/schemas/NotificationId' correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' + $ref: '#/components/schemas/SourceIndicator' path: - $ref: '#/components/schemas/uri-Type' + $ref: 'comDefs.yaml#/components/schemas/Uri' operation: - type: string - enum: - - CREATE - - DELETE - - REPLACE + $ref: '#/components/schemas/Operation' value: oneOf: - - type: object - additionalProperties: - nullable: true - - type: array - items: - type: object - minItems: 1 - maxItems: 2 + - $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' + - $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' - notifyMOICreation-NotifType: + NotifyMoiCreation: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' + $ref: '#/components/schemas/SourceIndicator' attributeList: - type: object - additionalProperties: - nullable: true - notifyMOIDeletion-NotifType: + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' + NotifyMoiDeletion: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' + $ref: '#/components/schemas/SourceIndicator' attributeList: - type: object - additionalProperties: true - notifyMOIAttributeValueChange-NotifType: + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' + NotifyMoiAttributeValueChanges: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' - attributeValueChange: - type: object - additionalProperties: - type: array - minItems: 1 - maxItems: 2 - items: - nullable: true + $ref: '#/components/schemas/SourceIndicator' + attributeListValueChanges: + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' required: - - attributeValueChange - notifyMOIChanges-NotifType: + - attributeListValueChanges + NotifyMoiChanges: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: - mOIChanges: + moiChanges: type: array items: - $ref: '#/components/schemas/mOIChange-Type' + $ref: '#/components/schemas/MoiChange' required: - - mOIChanges + - moiChanges -- GitLab From 3ec34568c10f71e38491ab3988b64b1cbb676542 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:14:21 +0000 Subject: [PATCH 117/268] Update streamingDataMnS.yaml to latest R16 streamingDataMnS.yaml --- OpenAPI/streamingDataMnS.yaml | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/OpenAPI/streamingDataMnS.yaml b/OpenAPI/streamingDataMnS.yaml index ab7f71d4a..abbf1271f 100644 --- a/OpenAPI/streamingDataMnS.yaml +++ b/OpenAPI/streamingDataMnS.yaml @@ -1,24 +1,17 @@ openapi: 3.0.1 info: title: TS 28.532 Streaming data reporting service - version: 16.4.0 + version: 16.10.0 description: OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS) servers: - - url: '{protocol}://{root}/StreamingDataReportingMnS/{version}' + - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}' variables: - protocol: - description: Protocol used - enum: - - http - - https - - wss - default: https - root: - description: Indicates the host name and optional port, and an optional sequence of path segments that together represent a prefix path. - default: example.com - version: - description: Indicates the current version of the specification - default: 16.4.0 + MnSRoot: + description: See clause 4.4.3 of TS 32.158. + default: https://example.com/3GPPManagement + MnSVersion: + description: See clause 4.4.3 of TS 32.158. + default: '' paths: '/connections': post: @@ -329,8 +322,8 @@ components: description: DN of the measured object instance (see 3GPP TS 28.550) allOf: - $ref: '#/components/schemas/systemDN-Type' - measTypes-Type: - description: an ordered list of measurement type or KPI whose measurement values or KPI result values are to be reported by the Performance Data Stream Units (see Annex C of TS 28.550) via this stream + performanceMetrics-Type: + description: an ordered list of performance metric names (see clause 4.4.1 of 3GPP TS 28.622[11]) whose values are to be reported by the Performance Data Stream Units (see Annex C of TS 28.550 [42]) via this stream. Performance metrics include measurement and KPI type: array items: type: string @@ -340,15 +333,13 @@ components: properties: measObjDn: $ref: '#/components/schemas/measObjDn-Type' - measTypes: - $ref: '#/components/schemas/measTypes-Type' - measurementReaderId: - $ref: '#/components/schemas/systemDN-Type' + performanceMetrics: + $ref: '#/components/schemas/performanceMetrics-Type' jobId: type: string required: - measObjDn - - measTypes + - performanceMetrics producerId-Type: description: DN of the streaming data reporting MnS producer. allOf: -- GitLab From 0f0a3fc3371fd9e5c8a5a577fb3734b385cc3662 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:27:16 +0000 Subject: [PATCH 118/268] Update 5gcNrm.yaml to adress validation issues --- OpenAPI/5gcNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 2f6304902..b7c2c418f 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -41,11 +41,11 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' ipv6Prefix: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Prefix' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Prefix' transport: $ref: 'genericNrm.yaml#/components/schemas/TransportProtocol' port: -- GitLab From d5cd51d85151ec4c7ef450296ba6d831dc21a256 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:33:53 +0000 Subject: [PATCH 119/268] Update coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index e6a0ef13a..908756fa5 100644 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -112,9 +112,9 @@ components: type: object properties: operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' AssuranceGoal: @@ -165,4 +165,4 @@ components: - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' \ No newline at end of file + - $ref: '#/components/schemas/ManagedElement-Single' -- GitLab From bf152bff16e20a7e3afe03f2734eb248fd259216 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:36:23 +0000 Subject: [PATCH 120/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 7c628a2ac..7946de01c 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -55,7 +55,7 @@ components: type: object properties: mcc: - $ref: 'genericNrm.yaml#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: $ref: '#/components/schemas/Mnc' PlmnIdList: @@ -77,7 +77,7 @@ components: type: object properties: mcc: - $ref: 'genericNrm.yaml#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: $ref: '#/components/schemas/Mnc' nid: -- GitLab From cc4c54b709c71dfd9ec73f00d7e93608fe0abb26 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:40:13 +0000 Subject: [PATCH 121/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index b7c2c418f..570052a50 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -71,9 +71,9 @@ components: sNssais: $ref: 'nrNrm.yaml#/components/schemas/Snssai' fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' nfServices: type: array items: @@ -91,9 +91,9 @@ components: schema: type: string fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' ipEndPoints: type: array items: @@ -1145,7 +1145,7 @@ components: sEPPId: type: integer fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1357,7 +1357,7 @@ components: sEPPId: type: integer fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' EP_N2-Single: -- GitLab From 5cc538606e5963ffcfa8804215a1694e95e27487 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:43:43 +0000 Subject: [PATCH 122/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 570052a50..52852b56a 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -205,7 +205,7 @@ components: authzInfo: type: string hostAddr: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' allowedPLMNs: type: array items: @@ -1187,7 +1187,7 @@ components: supportedFuncList: $ref: '#/components/schemas/SupportedFuncList' address: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NefFunction-Single: allOf: @@ -1688,7 +1688,7 @@ components: remotePlmnId: $ref: 'nrNrm.yaml#/components/schemas/PlmnId' remoteSeppAddress: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' remoteSeppId: type: integer n32cParas: -- GitLab From 3b4f4982c1a87ed5ce105d9635ea9c1bf5f54f8f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:47:38 +0000 Subject: [PATCH 123/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 7946de01c..8068ad192 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -327,9 +327,9 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' vlanId: type: integer minimum: 0 @@ -347,9 +347,9 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' CellIndividualOffset: type: object @@ -611,8 +611,8 @@ components: properties: TceIPAddress: oneOf: - - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' TceID: type: integer PlmnTarget: -- GitLab From e152162ce90d7d1a9ea8018b92441fbfcbe05a08 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:51:17 +0000 Subject: [PATCH 124/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 52852b56a..b64d9e0c4 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -283,7 +283,7 @@ components: commModelType: $ref: '#/components/schemas/CommModelType' targetNFServiceList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' commModelConfiguration: type: string CommModelList: @@ -311,7 +311,7 @@ components: cNSIId: $ref: '#/components/schemas/CNSIId' networkSliceRef: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' NetworkSliceInfoList: type: array items: @@ -738,7 +738,7 @@ components: aMFRegionRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' aMFSetMemberList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' AmfRegion-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -758,7 +758,7 @@ components: snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' aMFSetListRef: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' SmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1389,7 +1389,7 @@ components: remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' EP_N4-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' -- GitLab From 617f95fd96b704ae2e19d407bb75f8d510d39269 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:56:53 +0000 Subject: [PATCH 125/268] 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 b64d9e0c4..dfa2d187f 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -499,7 +499,7 @@ components: plmnInfo: $ref: 'nrNrm.yaml#/components/schemas/PlmnInfo' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' NsacfInfoSnssai: type: object -- GitLab From 367a6e17b2a4e89d2adabf57ef3908050077a7ae Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:02:12 +0000 Subject: [PATCH 126/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index dfa2d187f..74cc8d1a5 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -736,7 +736,7 @@ components: snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' aMFRegionRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' aMFSetMemberList: $ref: 'comDefs.yaml#/components/schemas/DnList' AmfRegion-Single: @@ -782,9 +782,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -885,9 +885,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' -- GitLab From ef057fffef1feb75da064fed0d17c17b33be8fbd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:06:16 +0000 Subject: [PATCH 127/268] 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 74cc8d1a5..9ada2dcd2 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -685,7 +685,7 @@ components: backupInfoAmfRemoval: $ref: '#/components/schemas/GUAMInfo' amfSetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: -- GitLab From 36d98c5524d92d600623f2f3d0e2791e0de6993d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:09:03 +0000 Subject: [PATCH 128/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 8068ad192..b08aace1f 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -931,9 +931,9 @@ components: - type: object properties: administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' cellLocalId: type: integer cellState: -- GitLab From ff2172db07b3fddf067495279212304f6bc6aca0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:13:59 +0000 Subject: [PATCH 129/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index b08aace1f..5ef76d430 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -794,9 +794,9 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -847,9 +847,9 @@ components: tceMappingInfoList: $ref: '#/components/schemas/TceMappingInfoList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dCHOControl: type: boolean dDAPSHOControl: @@ -895,7 +895,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -975,11 +975,11 @@ components: nrSectorCarrierRef: type: array items: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' bwpRef: type: array items: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' rimRSMonitoringStartTime: type: string rimRSMonitoringStopTime: @@ -995,11 +995,11 @@ components: rimRSMonitoringOccasionStartingOffset: type: integer nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' victimSetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' aggressorSetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1080,7 +1080,7 @@ components: bSChannelBwUL: type: integer sectorEquipmentFunctionRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1189,9 +1189,9 @@ components: cellIndividualOffset: $ref: '#/components/schemas/CellIndividualOffset' adjacentNRCellRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' nRFreqRelationRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' isRemoveAllowed: type: boolean isHOAllowed: @@ -1213,7 +1213,7 @@ components: - type: object properties: adjacentEUtranCellRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NRFreqRelation-Single: allOf: @@ -1277,7 +1277,7 @@ components: tReselectionNRSfMedium: $ref: '#/components/schemas/TReselectionNRSf' nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' EUtranFreqRelation-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1340,7 +1340,7 @@ components: tReselectionNRSfMedium: $ref: '#/components/schemas/TReselectionNRSf' eUTranFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' DANRManagementFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1527,7 +1527,7 @@ components: setType: $ref: '#/components/schemas/RSSetType' nRCellDURefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' ExternalGnbDuFunction-Single: allOf: @@ -1618,7 +1618,7 @@ components: plmnIdList: $ref: '#/components/schemas/PlmnIdList' nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalENBFunction-Single: allOf: @@ -1648,7 +1648,7 @@ components: - type: object properties: EUtranFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EP_XnC-Single: @@ -1750,7 +1750,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' EP_NgU-Single: allOf: @@ -1767,7 +1767,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' EP_X2U-Single: allOf: -- GitLab From ab439fedb6668043ad0615f6fefa3a83a0b7f684 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:21:32 +0000 Subject: [PATCH 130/268] Update provMnS.yaml -- GitLab From bc4d2dfa875be8c53f9d40eb543cd84bcd3005c0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:22:54 +0000 Subject: [PATCH 131/268] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 6dd728fcc..9afbf9b7e 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -538,8 +538,8 @@ components: IpAddress: oneOf: - - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' LogicInterfaceInfo: type: object -- GitLab From d2fc679ffbec56c55dff5839a4927173e70bfdef Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:28:52 +0000 Subject: [PATCH 132/268] Update provMnS.yaml -- GitLab From 094ba49ca1341427f0a5614fe0610c72b0f53c13 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:32:18 +0000 Subject: [PATCH 133/268] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 9afbf9b7e..0fc9a4f80 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -594,11 +594,11 @@ components: - type: object properties: networkSliceSubnetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' @@ -612,19 +612,19 @@ components: - type: object properties: managedFunctionRefList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' networkSliceSubnetRefList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' nsInfo: $ref: '#/components/schemas/NsInfo' sliceProfileList: $ref: '#/components/schemas/SliceProfileList' epTransportRefList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' priorityLabel: type: integer networkSliceSubnetType: @@ -651,7 +651,7 @@ components: qosProfile: type: string epApplicationRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: -- GitLab From 151ccf3ddf798f5b5e349cc6e81af1b6901f5c2e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:35:35 +0000 Subject: [PATCH 134/268] Update sliceNrm.yaml -- GitLab From b767a50aea6715b3076d4e6c230bc23a73b34f2d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:36:19 +0000 Subject: [PATCH 135/268] Update sliceNrm.yaml -- GitLab From cff67553f6f866a0a0956579725876c38b3d3bcd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 22 Jan 2022 02:01:19 +0000 Subject: [PATCH 136/268] Update the version to 17.0.0 --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index fd690eb91..7d4778a6f 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.9.0 + version: 17.0.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 16753939ba79e584d03f7f4cd595e4f8301afe47 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 22 Jan 2022 02:02:29 +0000 Subject: [PATCH 137/268] Update the version to 17.0.0 --- OpenAPI/comDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index f9d90b78f..d16f02ac3 100644 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 16.8.0 + version: 17.0.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From b50f1c001243ee66cc6bc0dbe0aa8ab1bdf84281 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Fri, 19 Nov 2021 16:45:42 +0100 Subject: [PATCH 138/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e4c4b2619..080dfdb99 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -464,6 +464,10 @@ components: items: type: string + SupportedBMOList: + type: array + items: + type: string #-------- Definition of concrete IOCs -------------------------------------------- @@ -707,8 +711,8 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' - commModelList: - $ref: '#/components/schemas/CommModelList' + supportedBMOList: + $ref: '#/components/schemas/SupportedBMOList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -767,6 +771,8 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' + supportedBMOList: + $ref: '#/components/schemas/SupportedBMOList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object -- GitLab From b14414a3286be9034c0e138f2273519e92a11bba Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 17 Nov 2021 20:56:22 +0100 Subject: [PATCH 139/268] Correct attribute nRFrequencyRef to nRFreqRelationRef in IOC NRCellRelation --- OpenAPI/nrNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 850106631..d4993ba31 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1104,7 +1104,7 @@ components: $ref: '#/components/schemas/CellIndividualOffset' adjacentNRCellRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' - nRFrequencyRef: + nRFreqRelationRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' isRemoveAllowed: type: boolean @@ -1139,13 +1139,13 @@ components: properties: offsetMO: $ref: '#/components/schemas/QOffsetRangeList' - blackListEntry: + blockListEntry: type: array items: type: integer minimum: 0 maximum: 1007 - blackListEntryIdleMode: + blockListEntryIdleMode: type: integer cellReselectionPriority: type: integer -- GitLab From 70f0428181d5747d4a6b2c7f477b8746a6b7afeb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 9 Nov 2021 08:37:21 +0100 Subject: [PATCH 140/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index d4993ba31..49db64394 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -709,6 +709,23 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' + + OperatorDu-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + gnbId: + $ref: '#/components/schemas/GnbId' + gnbIdLength: + $ref: '#/components/schemas/GnbIdLength' + - type: object + properties: + EP_F1C: + $ref: '#/components/schemas/EP_F1C-Single' + EP_F1U: + $ref: '#/components/schemas/EP_F1U-Multiple' + GnbCuUpFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -936,6 +953,18 @@ components: DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' + NrOperatorCellDu-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + cellLocalId: + type: integer + plmnInfoList: + $ref: '#/components/schemas/PlmnInfoList' + nrTac: + $ref: '#/components/schemas/NrTac' + NRFrequency-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1712,6 +1741,10 @@ components: type: array items: $ref: '#/components/schemas/GnbDuFunction-Single' + OperatorDu-Multiple: + type: array + items: + $ref: '#/components/schemas/OperatorDu-Single' GnbCuUpFunction-Multiple: type: array items: @@ -1725,6 +1758,12 @@ components: type: array items: $ref: '#/components/schemas/NrCellDu-Single' + + NrOperatorCellDu-Multiple: + type: array + items: + $ref: '#/components/schemas/NrOperatorCellDu-Single' + NrCellCu-Multiple: type: array items: @@ -1857,9 +1896,11 @@ components: - $ref: '#/components/schemas/GnbDuFunction-Single' - $ref: '#/components/schemas/GnbCuUpFunction-Single' - $ref: '#/components/schemas/GnbCuCpFunction-Single' + - $ref: '#/components/schemas/OperatorDu-Single' - $ref: '#/components/schemas/NrCellCu-Single' - $ref: '#/components/schemas/NrCellDu-Single' + - $ref: '#/components/schemas/NrOperatorCellDu-Single' - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' -- GitLab From 529a242efa0150dd5f44b5b5ec139c39bce070f8 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 13:25:46 +0100 Subject: [PATCH 141/268] Rel17 CR0624 removing extra '"', Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 49db64394..e0fe8fbe0 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -65,7 +65,7 @@ components: PlmnInfo: type: object properties: - plmnId": + plmnId: $ref: '#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' @@ -80,7 +80,7 @@ components: NpnIdentity: type: object properties: - plmnId": + plmnId: $ref: '#/components/schemas/PlmnId' cagidList: $ref: '#/components/schemas/cagId' -- GitLab From cd6016c35a5ddae6ca56e56d2f13a20be3df4099 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 13:29:35 +0100 Subject: [PATCH 142/268] Rel17_CR0627 NS specific authentication, Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index bf6b4d71c..48d584283 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -298,6 +298,8 @@ components: $ref: '#/components/schemas/DeterministicComm' survivalTime: type: string + nSSAA: + $ref: '#/components/schemas/Nssaa' RANSliceSubnetProfile: type: object properties: @@ -476,6 +478,8 @@ components: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: $ref: '#/components/schemas/EnergyEfficiency' + nSSAA: + $ref: '#/components/schemas/Nssaa' SliceProfile: type: object properties: @@ -517,6 +521,12 @@ components: items: $ref: '#/components/schemas/SliceProfile' + Nssaa: + type: string + enum: + - NOT SUPPORTED + - SUPPORTED + #------------ Definition of concrete IOCs ---------------------------------------- SubNetwork-Single: allOf: -- GitLab From 1aed3eccfe8baa83c8fe40c25888cf2f2c496399 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 Nov 2021 02:45:51 +0100 Subject: [PATCH 143/268] 28.541 Rel17 CR0627 NS specific authentication Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 48d584283..ad349f244 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -257,6 +257,13 @@ components: $ref: '#/components/schemas/ServAttrCom' performance: $ref: '#/components/schemas/EEPerfReq' + NSSAASupport: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + support: + $ref: '#/components/schemas/Support' CNSliceSubnetProfile: type: object properties: @@ -298,8 +305,8 @@ components: $ref: '#/components/schemas/DeterministicComm' survivalTime: type: string - nSSAA: - $ref: '#/components/schemas/Nssaa' + nssaaSupport: + $ref: '#/components/schemas/NSSAASupport’ RANSliceSubnetProfile: type: object properties: @@ -478,8 +485,8 @@ components: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: $ref: '#/components/schemas/EnergyEfficiency' - nSSAA: - $ref: '#/components/schemas/Nssaa' + nssaaSupport: + $ref: '#/components/schemas/NSSAASupport’ SliceProfile: type: object properties: @@ -521,12 +528,6 @@ components: items: $ref: '#/components/schemas/SliceProfile' - Nssaa: - type: string - enum: - - NOT SUPPORTED - - SUPPORTED - #------------ Definition of concrete IOCs ---------------------------------------- SubNetwork-Single: allOf: -- GitLab From 14bcfbf6803a0245be0f06b14cddaa72ba88bf81 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 Nov 2021 02:58:01 +0100 Subject: [PATCH 144/268] fix ' at the end of $ref --- OpenAPI/sliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index ad349f244..0948ef91d 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -306,7 +306,7 @@ components: survivalTime: type: string nssaaSupport: - $ref: '#/components/schemas/NSSAASupport’ + $ref: '#/components/schemas/NSSAASupport' RANSliceSubnetProfile: type: object properties: @@ -486,7 +486,7 @@ components: energyEfficiency: $ref: '#/components/schemas/EnergyEfficiency' nssaaSupport: - $ref: '#/components/schemas/NSSAASupport’ + $ref: '#/components/schemas/NSSAASupport' SliceProfile: type: object properties: -- GitLab From 0e240889311474f3c3f83a72fc9340c9615729f5 Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 4 Nov 2021 10:51:25 +0100 Subject: [PATCH 145/268] This is referred to S5-216066 --- OpenAPI/5gcNrm.yaml | 50 +++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 080dfdb99..5b25c68f5 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1138,12 +1138,14 @@ components: - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - EP_N64: - $ref: '#/components/schemas/EP_N64-Multiple' - EP_N65: - $ref: '#/components/schemas/EP_N65-Multiple' - EP_N66: - $ref: '#/components/schemas/EP_N66-Multiple' + EP_Npc4: + $ref: '#/components/schemas/EP_Npc4-Multiple' + EP_Npc6: + $ref: '#/components/schemas/EP_Npc6-Multiple' + EP_Npc7: + $ref: '#/components/schemas/EP_Npc7-Multiple' + EP_Npc8: + $ref: '#/components/schemas/EP_Npc8-Multiple' ExternalAmfFunction-Single: allOf: @@ -1651,7 +1653,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - EP_N64-Single: + EP_Npc4-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object @@ -1665,7 +1667,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - EP_N65-Single: + EP_Npc6-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object @@ -1679,7 +1681,21 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - EP_N66-Single: + EP_Npc7-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + EP_Npc8-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top-Attr' - type: object @@ -2091,18 +2107,22 @@ components: type: array items: $ref: '#/components/schemas/EP_N60-Single' - EP_N64-Multiple: + EP_Npc4-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_Npc4-Single' + EP_Npc6-Multiple: type: array items: - $ref: '#/components/schemas/EP_N64-Single' - EP_N65-Multiple: + $ref: '#/components/schemas/EP_Npc6-Single' + EP_Npc7-Multiple: type: array items: - $ref: '#/components/schemas/EP_N65-Single' - EP_N66-Multiple: + $ref: '#/components/schemas/EP_Npc7-Single' + EP_Npc8-Multiple: type: array items: - $ref: '#/components/schemas/EP_N66-Single' + $ref: '#/components/schemas/EP_Npc8-Single' Configurable5QISet-Multiple: type: array items: -- GitLab From e52ae511473ffe0b293ec868b52685fe8c6f8e0e Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Wed, 3 Nov 2021 16:46:12 +0100 Subject: [PATCH 146/268] This commit reflects S5-216051 --- OpenAPI/nrNrm.yaml | 2 ++ yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index e0fe8fbe0..35ead708f 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -801,6 +801,8 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' + dCHOControl: + type: boolean - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 4c4cee4d6..d22d73f16 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -102,7 +102,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { leaf-list xnHOBlackList { type string; description "List of nodes to which handovers over Xn are prohibited."; - } + } + leaf configurable5QISetRef { type types3gpp:DistinguishedName; description "DN of the Configurable5QISet that the GNBCUCPFunction supports (is associated to)."; @@ -112,6 +113,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { type string; description "List of nodes to which handovers over X2 are prohibited."; } + leaf dynamic5QISetRef { type types3gpp:DistinguishedName; description "DN of the Dynamic5QISet that the GNBCUCPFunction supports (is associated to)."; @@ -127,6 +129,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "This attribute determines whether the DAPS handover function is enabled or disabled."; } + } augment "/me3gpp:ManagedElement" { @@ -142,4 +145,4 @@ module _3gpp-nr-nrm-gnbcucpfunction { uses mf3gpp:ManagedFunctionContainedClasses; } } -} \ No newline at end of file +} -- GitLab From 646738cfa399146efab4558c9cc88dff6f24e4b3 Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Wed, 3 Nov 2021 17:13:46 +0100 Subject: [PATCH 147/268] Corrected CR number in description of revision. --- yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index d22d73f16..22d0bc993 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -15,7 +15,6 @@ module _3gpp-nr-nrm-gnbcucpfunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2021-11-06 { reference "CR-0611" ; } revision 2021-11-05 { reference "CR-0609"; } revision 2020-10-02 { reference CR-0384 ; } revision 2020-08-06 { reference "CR-0333"; } -- GitLab From a938c692e8bf92f859d50be8dceec9e73e2b42af Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 15:01:02 +0100 Subject: [PATCH 148/268] Rel17_CR0626 NS protection on N6 Protection TrafficControlData: Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 5b25c68f5..7f6726100 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -382,6 +382,8 @@ components: $ref: '#/components/schemas/SteeringMode' mulAccCtrl: $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/MulticastAccessControl' + snssaiList: + $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' TrafficControlDataList: type: array -- GitLab From 59df87f790ee6a24f1df99a69e496038aeb4787c Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 15:31:26 +0100 Subject: [PATCH 149/268] Rel17 CR0626 NS protection on N6 Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 0948ef91d..8471f9c50 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -263,7 +263,27 @@ components: servAttrCom: $ref: '#/components/schemas/ServAttrCom' support: - $ref: '#/components/schemas/Support' + $ref: '#/components/schemas/Support' + SecFunc: + type: object + properties: + secFunId: + type: integer + secFunType: + type: string + secRules: + type: array + items: + type: string + N6Protection: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + secFuncList: + type: array + items: + $ref: '#/components/schemas/SecFunc' CNSliceSubnetProfile: type: object properties: @@ -307,6 +327,8 @@ components: type: string nssaaSupport: $ref: '#/components/schemas/NSSAASupport' + n6Protection: + $ref: '#/components/schemas/N6Protection' RANSliceSubnetProfile: type: object properties: @@ -487,6 +509,8 @@ components: $ref: '#/components/schemas/EnergyEfficiency' nssaaSupport: $ref: '#/components/schemas/NSSAASupport' + n6Protection: + $ref: '#/components/schemas/N6Protection' SliceProfile: type: object properties: -- GitLab From b176ba55e406465ba01f7ddb265efee6c273050a Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Nov 2021 16:20:36 +0100 Subject: [PATCH 150/268] 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 8471f9c50..b4d145e1e 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -268,7 +268,7 @@ components: type: object properties: secFunId: - type: integer + type: string secFunType: type: string secRules: -- GitLab From 6b48d7d1e8c5256178f8f7a2165cd0caa59d05ac Mon Sep 17 00:00:00 2001 From: Per Elmdahl EPKPEEL Date: Wed, 3 Nov 2021 19:21:49 +0100 Subject: [PATCH 151/268] This commit corresponds to S5-216053 --- OpenAPI/nrNrm.yaml | 2 ++ yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 35ead708f..ad666127d 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -803,6 +803,8 @@ components: $ref: 'genericNrm.yaml#/components/schemas/Dn' dCHOControl: type: boolean + dDAPSHOControl: + type: boolean - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang index 22d0bc993..60c861b88 100755 --- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang +++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang @@ -15,7 +15,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; - revision 2021-11-05 { reference "CR-0609"; } + revision 2020-11-05 { reference "CR-0611" ; } revision 2020-10-02 { reference CR-0384 ; } revision 2020-08-06 { reference "CR-0333"; } revision 2020-08-03 { reference "CR-0321"; } @@ -118,17 +118,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { description "DN of the Dynamic5QISet that the GNBCUCPFunction supports (is associated to)."; } - leaf dCHOControl { - type boolean; - description "This attribute determines whether the CHO function is enabled or disabled."; - } - leaf dDAPSHOControl { type boolean; description "This attribute determines whether the DAPS handover function is enabled or disabled."; } - } augment "/me3gpp:ManagedElement" { -- GitLab From 1d112a61b557d1455e33d865a3eb18858dea7a28 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 23 Dec 2021 10:54:00 +0000 Subject: [PATCH 152/268] Update 5gcNrm.yaml for CR0637 TS28.541 --- OpenAPI/5gcNrm.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 7f6726100..e758a1698 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -173,6 +173,32 @@ components: - $ref: '#/components/schemas/UpfInfo' - $ref: '#/components/schemas/AmfInfo' - $ref: '#/components/schemas/Udrinfo' + NotificationType: + type: string + enum: + - N1_MESSAGES + - N2_INFORMATION + - LOCATION_NOTIFICATION + - DATA_REMOVAL_NOTIFICATION + - DATA_CHANGE_NOTIFICATION + - LOCATION_UPDATE_NOTIFICATION + - NSSAA_REAUTH_NOTIFICATION + - NSSAA_REVOC_NOTIFICATION + DefaultNotificationSubscription: + type: object + properties: + notificationType: + $ref: '#/components/schemas/NotificationType' + callbackURI: + type: string + n1MessageClass: + type: boolean + n2InfroamtionClass: + type: boolean + versions: + type: string + binding: + type: string ManagedNFProfile: type: object properties: @@ -180,6 +206,8 @@ components: type: string nfType: $ref: 'genericNrm.yaml#/components/schemas/NFType' + heartbeatTimer: + type: integer authzInfo: type: string hostAddr: -- GitLab From 92fb1542a2a39e7343bf16dac604b2e4cbd6fdd7 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 23 Dec 2021 11:06:20 +0000 Subject: [PATCH 153/268] fix syntax issue Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e758a1698..3fd32d4e3 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -184,21 +184,21 @@ components: - LOCATION_UPDATE_NOTIFICATION - NSSAA_REAUTH_NOTIFICATION - NSSAA_REVOC_NOTIFICATION - DefaultNotificationSubscription: - type: object - properties: - notificationType: - $ref: '#/components/schemas/NotificationType' - callbackURI: - type: string - n1MessageClass: - type: boolean - n2InfroamtionClass: - type: boolean - versions: - type: string - binding: - type: string + DefaultNotificationSubscription: + type: object + properties: + notificationType: + $ref: '#/components/schemas/NotificationType' + callbackURI: + type: string + n1MessageClass: + type: boolean + n2InfroamtionClass: + type: boolean + versions: + type: string + binding: + type: string ManagedNFProfile: type: object properties: -- GitLab From 61ea306d6f81cdaff1e528bae8077d1e6fb36c3f Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 15 Oct 2021 05:37:24 +0200 Subject: [PATCH 154/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 3fd32d4e3..53c9466a1 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -603,7 +603,7 @@ components: $ref: '#/components/schemas/WeightFactor' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' - amfSet: + amfSetRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' @@ -654,6 +654,10 @@ components: $ref: '#/components/schemas/AmfSetId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + aMFRegionRef: + $ref: 'genericNrm.yaml#/components/schemas/Dn' + aMFSetMemberListRef: + $ref: 'genericNrm.yaml#/components/schemas/DnList' AmfRegion-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -672,6 +676,8 @@ components: $ref: '#/components/schemas/AmfRegionId' snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' + aMFSetListRef: + $ref: 'genericNrm.yaml#/components/schemas/DnList' SmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' -- GitLab From 433033db249f2377c439347aaa68065dfc45ac9c Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 15 Oct 2021 08:16:00 +0200 Subject: [PATCH 155/268] 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 53c9466a1..cfd49a043 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -656,7 +656,7 @@ components: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' aMFRegionRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' - aMFSetMemberListRef: + aMFSetMemberList: $ref: 'genericNrm.yaml#/components/schemas/DnList' AmfRegion-Single: allOf: -- GitLab From 2cc01c5d3aced9954180a8e3ad5bf8c23b2a573b Mon Sep 17 00:00:00 2001 From: sunxixi Date: Fri, 19 Nov 2021 17:38:44 +0100 Subject: [PATCH 156/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index cfd49a043..a6b1b9036 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -873,6 +873,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + eCSAddrConfigInfo: + type: string - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From b4cfe498873ba1831cb67d884913ffb1c0c26dee Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 22 Nov 2021 03:55:46 +0100 Subject: [PATCH 157/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index a6b1b9036..e660c64dd 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -498,6 +498,11 @@ components: type: array items: type: string + + ECSAddrConfigInfo: + type: array + items: + type: string #-------- Definition of concrete IOCs -------------------------------------------- @@ -874,7 +879,7 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' eCSAddrConfigInfo: - type: string + $ref: '#/components/schemas/ECSAddrConfigInfo' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From aa3793cd9945f4d100e1ef505d7a0c70dc11e934 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 24 Dec 2021 14:38:57 +0000 Subject: [PATCH 158/268] update version to 17.5.0 for 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e660c64dd..f557aaf6e 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 1dee45eadf6a656f907079fb87a3c3797a91cc4f Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Dec 2021 07:58:23 +0000 Subject: [PATCH 159/268] update version to 17.5.0 for nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index ad666127d..4dfb1e61d 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From e842696c3f87ad8f43445f1b1918dd3767be36bc Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Dec 2021 07:59:06 +0000 Subject: [PATCH 160/268] update version to 17.5.0 for sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index b4d145e1e..f2dcff006 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 17.4.0 + version: 17.5.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 87ca0e49b9a8f2f24c1b4e3be45a1fec1cd2e7d5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Oct 2021 17:12:54 +0200 Subject: [PATCH 161/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 4dfb1e61d..0703dec22 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -592,6 +592,12 @@ components: properties: resourceType: type: string + enum: + - PRB + - PRB_UL + - PRB_DL + - RRC + - DRB rRMPolicyMemberList: $ref: '#/components/schemas/RrmPolicyMemberList' -- GitLab From 93d54bed5c3b1c73335973d2ee0b6aaefcbe8065 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Oct 2021 17:17:20 +0200 Subject: [PATCH 162/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 0703dec22..8f25700cf 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -583,7 +583,14 @@ components: type: array items: $ref: '#/components/schemas/TceMappingInfo' - + ResourceType: + type: string + enum: + - PRB + - PRB_UL + - PRB_DL + - RRC + - DRB #-------- Definition of abstract IOCs -------------------------------------------- @@ -591,13 +598,7 @@ components: type: object properties: resourceType: - type: string - enum: - - PRB - - PRB_UL - - PRB_DL - - RRC - - DRB + $ref: '#/components/schemas/ResourceType' rRMPolicyMemberList: $ref: '#/components/schemas/RrmPolicyMemberList' -- GitLab From e73950e2174787868702958c1aacc2b1d68e3312 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 5 Oct 2021 03:24:03 +0200 Subject: [PATCH 163/268] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index f2dcff006..9bfab246a 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -616,6 +616,12 @@ components: $ref: 'genericNrm.yaml#/components/schemas/DnList' priorityLabel: type: integer + networkSliceSubnetType: + type: integer + enum: + - TopSliceSubnet + - RANSliceSubnet + - CNSliceSubnet EP_Transport-Single: allOf: -- GitLab From 6177694b7b17fdad6da4c443573d74d32798461f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 13 Oct 2021 06:48:57 +0200 Subject: [PATCH 164/268] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 9bfab246a..48d14b0d7 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -617,11 +617,11 @@ components: priorityLabel: type: integer networkSliceSubnetType: - type: integer + type: string enum: - - TopSliceSubnet - - RANSliceSubnet - - CNSliceSubnet + - TOP_SLICESUBNET + - RAN_SLICESUBNET + - CN_SLICESUBNET EP_Transport-Single: allOf: -- GitLab From 098c583c3a3ba1b43ed4795b69525b7d9901ca4e Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Sat, 9 Oct 2021 09:23:40 +0200 Subject: [PATCH 165/268] Update latency to support UL and DL requirements --- OpenAPI/sliceNrm.yaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 48d14b0d7..4989e8759 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -289,7 +289,9 @@ components: properties: maxNumberofUEs: type: integer - latency: + dLLatency: + type: integer + uLLatency: type: integer dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' @@ -334,6 +336,10 @@ components: properties: coverageAreaTAList: type: integer + dLLatency: + type: integer + uLLatency: + type: integer uEMobilityLevel: $ref: '#/components/schemas/MobilityLevel' resourceSharingLevel: @@ -379,7 +385,9 @@ components: TopSliceSubnetProfile: type: object properties: - latency: + dLLatency: + type: integer + uLLatency: type: integer maxNumberofUEs: type: integer @@ -441,7 +449,9 @@ components: $ref: 'nrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: type: number - latency: + dLLatency: + type: number + uLLatency: type: number uEMobilityLevel: $ref: '#/components/schemas/MobilityLevel' -- GitLab From 948bcfbc87a4ad5a2cfe92c1712f3cd7da7b668d Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Fri, 1 Oct 2021 10:58:57 +0200 Subject: [PATCH 166/268] S5-215263 Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 0911920a2..b4712edfd 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1210,6 +1210,10 @@ components: type: array items: $ref: '#/components/schemas/MnsRegistry' + MnsRegistry: + type: array + items: + $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: @@ -1353,6 +1357,11 @@ components: type: string mnsType: type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS mnsVersion: type: string mnsAddress: -- GitLab From ed04a2228b97cd5908e0a7149c69db2ee209b24a Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Fri, 1 Oct 2021 10:59:48 +0200 Subject: [PATCH 167/268] S5-215263 Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index b4712edfd..2b46aa48c 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1210,10 +1210,6 @@ components: type: array items: $ref: '#/components/schemas/MnsRegistry' - MnsRegistry: - type: array - items: - $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: -- GitLab From 6b049522492f930affd7e60f3a9eb9b11142320f Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:23:40 +0200 Subject: [PATCH 168/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 52163902b..f4f4119e9 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -55,6 +55,13 @@ module _3gpp-common-mnsregistry { } } + grouping MNSRegistryGrp { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.541"; + uses top3gpp:Top_Grp; + uses MNSInfoGrp; + } + grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; -- GitLab From acacf8286faedbff09fb29668422c5e201cb74db Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:41:57 +0200 Subject: [PATCH 169/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 32 ++++++++++++++--------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index f4f4119e9..0206d06f6 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -32,7 +32,6 @@ module _3gpp-common-mnsregistry { enum StreamingDataReportingMnS; enum FileDataReportingMnS; } - } leaf mnsVersion { description "Version of management service."; @@ -55,13 +54,16 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistryGrp { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.541"; - uses top3gpp:Top_Grp; - uses MNSInfoGrp; + augment "/subnet3gpp:SubNetwork" { + list MNSInfo { + description "Represents the MNSInfo IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; + } } - + grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; @@ -80,8 +82,14 @@ module _3gpp-common-mnsregistry { } } - augment "/subnet3gpp:SubNetwork" { - uses MNSRegistryGrp; - } - -} \ No newline at end of file + augment "/subnet3gpp:SubNetwork" { + list MNSRegistry { + description "Represents the MNSRegistry IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + } + } + } + } \ No newline at end of file -- GitLab From 26e2fffcae46dc6661fac9acc17c5c457c6bb9be Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:47:18 +0200 Subject: [PATCH 170/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 0206d06f6..3b0089553 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -54,16 +54,17 @@ module _3gpp-common-mnsregistry { } } - augment "/subnet3gpp:SubNetwork" { - list MNSInfo { - description "Represents the MNSInfo IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } - + + augment "mnsregist3gpp:MNSRegistry" { + list MNSInfo { + description "Represents the MNSInfo IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; + } + } + grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; -- GitLab From 43ae3a3d53e3e4dfc88ea5a7cc86a9f3d201f6e5 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:47:55 +0200 Subject: [PATCH 171/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 3b0089553..c980cc1b0 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -80,6 +80,7 @@ module _3gpp-common-mnsregistry { container attributes { uses MNSInfoGrp; } + } } } -- GitLab From 65aaf969d171699dd82265b34c331db9916cd68e Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:50:23 +0200 Subject: [PATCH 172/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index c980cc1b0..acd8d90aa 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -45,15 +45,6 @@ module _3gpp-common-mnsregistry { } } - grouping MNSInfo { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } - augment "mnsregist3gpp:MNSRegistry" { list MNSInfo { @@ -64,6 +55,7 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } + } grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; -- GitLab From 7ba819e737d35008a54888e121ba800eb21358e1 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 14:57:29 +0200 Subject: [PATCH 173/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 46 +++++++++++------------ 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index acd8d90aa..794b974e7 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -44,18 +44,6 @@ module _3gpp-common-mnsregistry { type string; } } - - - augment "mnsregist3gpp:MNSRegistry" { - list MNSInfo { - description "Represents the MNSInfo IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } - } grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; @@ -72,18 +60,26 @@ module _3gpp-common-mnsregistry { container attributes { uses MNSInfoGrp; } - } } - } - - augment "/subnet3gpp:SubNetwork" { - list MNSRegistry { - description "Represents the MNSRegistry IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSRegistryGrp; - } - } + + augment "mnsregist3gpp:MNSRegistry" { + list MNSInfo { + description "Represents the MNSInfo IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; } - } \ No newline at end of file + } + + augment "/subnet3gpp:SubNetwork" { + description "Represents the MNSRegistry IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + } + } + + +} -- GitLab From b70b1afe53acfd26a297263f3c025242e1654f2c Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 15:02:31 +0200 Subject: [PATCH 174/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 794b974e7..90ec6f4a8 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -71,6 +71,7 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } + } augment "/subnet3gpp:SubNetwork" { description "Represents the MNSRegistry IOC."; @@ -78,8 +79,6 @@ module _3gpp-common-mnsregistry { uses top3gpp:Top_Grp; container attributes { uses MNSRegistryGrp; + } } - } - - -} +} \ No newline at end of file -- GitLab From 7e1e0c73b4c504a22c65ee59194b5474327e3c73 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 15:55:18 +0200 Subject: [PATCH 175/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 90ec6f4a8..9c429e348 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -32,6 +32,7 @@ module _3gpp-common-mnsregistry { enum StreamingDataReportingMnS; enum FileDataReportingMnS; } + } leaf mnsVersion { description "Version of management service."; -- GitLab From af781a8489d42174f1056781a35afbf621a14a71 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:02:01 +0200 Subject: [PATCH 176/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 9c429e348..d09ab2451 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -63,7 +63,7 @@ module _3gpp-common-mnsregistry { } } - augment "mnsregist3gpp:MNSRegistry" { + augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { description "Represents the MNSInfo IOC."; key id; @@ -76,10 +76,6 @@ module _3gpp-common-mnsregistry { augment "/subnet3gpp:SubNetwork" { description "Represents the MNSRegistry IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSRegistryGrp; - } + uses top3gpp:Top_Grp; } } \ No newline at end of file -- GitLab From 95f04cffe12ec492920c7fa68c78d93f6fc5061d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:04:23 +0200 Subject: [PATCH 177/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index d09ab2451..b718a31cb 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -62,7 +62,8 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - + } + augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { description "Represents the MNSInfo IOC."; @@ -72,8 +73,6 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - } - augment "/subnet3gpp:SubNetwork" { description "Represents the MNSRegistry IOC."; uses top3gpp:Top_Grp; -- GitLab From df11c2f935c56353b6ee1e2ba71d1642f918bc26 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:10:46 +0200 Subject: [PATCH 178/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index b718a31cb..9b8c00ef8 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -73,8 +73,11 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } + } + augment "/subnet3gpp:SubNetwork" { description "Represents the MNSRegistry IOC."; uses top3gpp:Top_Grp; } + } \ No newline at end of file -- GitLab From c0ad76e7adb1310ac5309582d3995a88861aa70f Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:13:12 +0200 Subject: [PATCH 179/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 9b8c00ef8..b6e10b5b7 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -62,7 +62,6 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - } augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { -- GitLab From 5c1dfb0cfd39e11dcc00a91b577c237055f6fbe9 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:47:18 +0200 Subject: [PATCH 180/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 30 ++++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index b6e10b5b7..2392c0435 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -62,21 +62,27 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - + augment "/mnsregist3gpp:MNSRegistry" { - list MNSInfo { - description "Represents the MNSInfo IOC."; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; + list MNSInfo { + description "Represents the MNS Registry."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; + } } - } } - + augment "/subnet3gpp:SubNetwork" { - description "Represents the MNSRegistry IOC."; + description "Represents the MNS Registry IOC."; + reference "3GPP TS 28.622"; + key id; uses top3gpp:Top_Grp; - } - + container attributes { + uses MNSRegistryGrp; + } + } + } \ No newline at end of file -- GitLab From 7ad48451197187792dbce33ce429264a2a728961 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:48:59 +0200 Subject: [PATCH 181/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 2392c0435..2ad7ef529 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -80,9 +80,7 @@ module _3gpp-common-mnsregistry { reference "3GPP TS 28.622"; key id; uses top3gpp:Top_Grp; - container attributes { - uses MNSRegistryGrp; - } + uses MNSRegistryGrp; } } \ No newline at end of file -- GitLab From dfa1f800c83e730f84e153a58726f1359024ed28 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:51:56 +0200 Subject: [PATCH 182/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 -- 1 file changed, 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 2ad7ef529..920a3214f 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -78,8 +78,6 @@ module _3gpp-common-mnsregistry { augment "/subnet3gpp:SubNetwork" { description "Represents the MNS Registry IOC."; reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; uses MNSRegistryGrp; } -- GitLab From de5f2bb61964723266a5a27cc641395cb038a130 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:55:24 +0200 Subject: [PATCH 183/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 920a3214f..f7be5f3d5 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -47,8 +47,10 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistryGrp { + list MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; + key id; uses top3gpp:Top_Grp; } @@ -61,18 +63,13 @@ module _3gpp-common-mnsregistry { container attributes { uses MNSInfoGrp; } + } } - augment "/mnsregist3gpp:MNSRegistry" { - list MNSInfo { - description "Represents the MNS Registry."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } + augment "/mnsregist3gpp:MNSRegistryGrp" { + description "Represents the MNS Registry."; + reference "3GPP TS 28.622"; + uses MNSInfoGrp; } augment "/subnet3gpp:SubNetwork" { -- GitLab From df72eb8ac21c0c8cf7023144d3783be76569d61a Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:58:25 +0200 Subject: [PATCH 184/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 26 ++++++++--------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index f7be5f3d5..1f120390d 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -46,27 +46,19 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistryGrp { - list MNSInfo { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - } - grouping MNSRegistry { - list mnsRegistry { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - key "mnsType mnsVersion mnsAddress"; - container attributes { - uses MNSInfoGrp; - } + list MNSInfo { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; + } } } - augment "/mnsregist3gpp:MNSRegistryGrp" { + augment "/mnsregist3gpp:MNSRegistry" { description "Represents the MNS Registry."; reference "3GPP TS 28.622"; uses MNSInfoGrp; -- GitLab From 4eaf42c6f25802597772f39fd01dc04167fd114c Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 16:59:54 +0200 Subject: [PATCH 185/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 1f120390d..ffeac083a 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -46,7 +46,7 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistry { + grouping MNSRegistryGrp { list MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; @@ -58,7 +58,7 @@ module _3gpp-common-mnsregistry { } } - augment "/mnsregist3gpp:MNSRegistry" { + augment "/mnsregist3gpp:MNSRegistryGrp" { description "Represents the MNS Registry."; reference "3GPP TS 28.622"; uses MNSInfoGrp; -- GitLab From 6e654684218f2312bf420aeab6b169ff8d459d6d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:05:46 +0200 Subject: [PATCH 186/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index ffeac083a..0a45dcdc7 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -47,27 +47,21 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistryGrp { - list MNSInfo { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGrp; } } augment "/mnsregist3gpp:MNSRegistryGrp" { - description "Represents the MNS Registry."; - reference "3GPP TS 28.622"; uses MNSInfoGrp; } augment "/subnet3gpp:SubNetwork" { - description "Represents the MNS Registry IOC."; - reference "3GPP TS 28.622"; uses MNSRegistryGrp; - } + } } \ No newline at end of file -- GitLab From 2fc1d3555dbf1f0f55386ea5e22b09015d12b399 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:08:25 +0200 Subject: [PATCH 187/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 0a45dcdc7..d6dacbf9b 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -46,7 +46,7 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistryGrp { + grouping MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; key id; @@ -55,6 +55,17 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } + + grouping MNSRegistryGrp { + list MNSInfo { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfo; + } + } + } augment "/mnsregist3gpp:MNSRegistryGrp" { uses MNSInfoGrp; -- GitLab From 0756b429a2608173e2c8a795c62668728792095d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:14:39 +0200 Subject: [PATCH 188/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 24 +++++------------------ 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index d6dacbf9b..0425fd636 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -46,33 +46,19 @@ module _3gpp-common-mnsregistry { } } - grouping MNSInfo { + grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; - key id; uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; - } - } - - grouping MNSRegistryGrp { list MNSInfo { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfo; + uses MNSInfoGroup; + key "mnsType mnsVersion"; } } } - - augment "/mnsregist3gpp:MNSRegistryGrp" { - uses MNSInfoGrp; - } - + augment "/subnet3gpp:SubNetwork" { - uses MNSRegistryGrp; + uses MNSRegistry; } } \ No newline at end of file -- GitLab From 5384da12781f4d89bb7ddb4727f1959622892d81 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:21:02 +0200 Subject: [PATCH 189/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 0425fd636..9f8509f45 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -46,19 +46,29 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistry { - description "Represents the MNSRegistry IOC."; + grouping MNSInfo { + list MNSInfo { + description "Represents the MNSInfo IOC."; reference "3GPP TS 28.622"; + key "mnsType mnsVersion"; uses top3gpp:Top_Grp; - list MNSInfo { + container attributes { uses MNSInfoGroup; - key "mnsType mnsVersion"; + } } + + grouping MNSRegistry { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; } - } augment "/subnet3gpp:SubNetwork" { uses MNSRegistry; } + + augment "/mnsregist3gpp:MNSRegistry" { + uses MNSInfo; + } } \ No newline at end of file -- GitLab From 4509ad1d195e24652480b58a31ad98ca949822cc Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:22:13 +0200 Subject: [PATCH 190/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 9f8509f45..ad19de69f 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -56,6 +56,7 @@ module _3gpp-common-mnsregistry { uses MNSInfoGroup; } } + } grouping MNSRegistry { description "Represents the MNSRegistry IOC."; -- GitLab From ad241a10e17a248693c05e1363ee88dd8493d9b6 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:25:02 +0200 Subject: [PATCH 191/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 26 ++++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index ad19de69f..99a029f0f 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -45,19 +45,7 @@ module _3gpp-common-mnsregistry { type string; } } - - grouping MNSInfo { - list MNSInfo { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; - key "mnsType mnsVersion"; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGroup; - } - } - } - + grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; @@ -69,7 +57,15 @@ module _3gpp-common-mnsregistry { } augment "/mnsregist3gpp:MNSRegistry" { - uses MNSInfo; + list MNSInfo { + description "Represents the MNSInfo IOC."; + reference "3GPP TS 28.622"; + key "mnsType mnsVersion"; + uses top3gpp:Top_Grp; + container attributes { + uses MNSInfoGroup; + } + } } - + } \ No newline at end of file -- GitLab From 5c3f5a53f0969c8ab2cdb66e0469eca19f13df0e Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:33:15 +0200 Subject: [PATCH 192/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 29 ++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 99a029f0f..0b115934d 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -46,26 +46,39 @@ module _3gpp-common-mnsregistry { } } + grouping MNSInfo { + description "Represents the MNSInfo IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + key "mnsType mnsVersion mnsAddress"; + container attributes { + uses MNSInfoGrp; + } + } + grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; - } - - augment "/subnet3gpp:SubNetwork" { - uses MNSRegistry; } augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { - description "Represents the MNSInfo IOC."; + description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; - key "mnsType mnsVersion"; uses top3gpp:Top_Grp; container attributes { - uses MNSInfoGroup; - } + uses MNSInfo; } + } + } + + augment "/subnet3gpp:SubNetwork" { + uses MNSRegistry; + } + + augment "/mnsregist3gpp:MNSRegistry" { + uses MNSInfo; } } \ No newline at end of file -- GitLab From bb5b788f75073f7eb0bca5a8e21110e788b5700c Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:36:11 +0200 Subject: [PATCH 193/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 0b115934d..fafdf5510 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -50,7 +50,6 @@ module _3gpp-common-mnsregistry { description "Represents the MNSInfo IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; - key "mnsType mnsVersion mnsAddress"; container attributes { uses MNSInfoGrp; } @@ -63,13 +62,12 @@ module _3gpp-common-mnsregistry { } augment "/mnsregist3gpp:MNSRegistry" { - list MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; - container attributes { + list MNSInfo { uses MNSInfo; - } + key "mnsType mnsVersion mnsAddress"; } } -- GitLab From a9d9fdb83bbf3122e4e902f9fa73df4f9fa484f4 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:40:08 +0200 Subject: [PATCH 194/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index fafdf5510..731e6bc51 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -55,12 +55,22 @@ module _3gpp-common-mnsregistry { } } + grouping MNSRegistryGrp { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + } + grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + } } + augment "/mnsregist3gpp:MNSRegistry" { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; -- GitLab From 0e1e928fab4ee6b3447d5bfd0142bc25d5eacaed Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:46:37 +0200 Subject: [PATCH 195/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 731e6bc51..0fd8b21ad 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -54,30 +54,13 @@ module _3gpp-common-mnsregistry { uses MNSInfoGrp; } } - - grouping MNSRegistryGrp { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - } grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; container attributes { - uses MNSRegistryGrp; - } - } - - - augment "/mnsregist3gpp:MNSRegistry" { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - list MNSInfo { uses MNSInfo; - key "mnsType mnsVersion mnsAddress"; } } -- GitLab From 8c96262753cfd047ec1e0439c2b24f1c68a708ef Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:49:54 +0200 Subject: [PATCH 196/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 0fd8b21ad..b8e7284d4 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -55,7 +55,7 @@ module _3gpp-common-mnsregistry { } } - grouping MNSRegistry { + grouping MNSRegistryGrp { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; @@ -64,6 +64,14 @@ module _3gpp-common-mnsregistry { } } + grouping MNSRegistry { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.622"; + uses top3gpp:Top_Grp; + uses MNSRegistryGrp; + } + + augment "/subnet3gpp:SubNetwork" { uses MNSRegistry; } -- GitLab From 97f91021a7b457ada3d958263702292d99142437 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:51:48 +0200 Subject: [PATCH 197/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index b8e7284d4..ee2a670ec 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -73,11 +73,11 @@ module _3gpp-common-mnsregistry { augment "/subnet3gpp:SubNetwork" { - uses MNSRegistry; + uses MNSRegistryGrp; } augment "/mnsregist3gpp:MNSRegistry" { - uses MNSInfo; + uses MNSInfoGrp; } } \ No newline at end of file -- GitLab From 475390027bf40019f93f19113c00cac81cd4be14 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:57:25 +0200 Subject: [PATCH 198/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index ee2a670ec..049cd34c7 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -67,7 +67,6 @@ module _3gpp-common-mnsregistry { grouping MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; uses MNSRegistryGrp; } -- GitLab From 957aab24926fe499afec17316c33b4a7aa76c1b7 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 17:59:18 +0200 Subject: [PATCH 199/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 049cd34c7..d34cdde66 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -72,11 +72,11 @@ module _3gpp-common-mnsregistry { augment "/subnet3gpp:SubNetwork" { - uses MNSRegistryGrp; + uses MNSRegistry; } augment "/mnsregist3gpp:MNSRegistry" { - uses MNSInfoGrp; + uses MNSInfo; } } \ No newline at end of file -- GitLab From f9366722284911827e1fc54c9a6743f2690a986a Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:07:22 +0200 Subject: [PATCH 200/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index d34cdde66..783a9493b 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -76,6 +76,14 @@ module _3gpp-common-mnsregistry { } augment "/mnsregist3gpp:MNSRegistry" { + list MNSInfo { + description "Represents the MNS Registry."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses AMFFunctionGrp; + } uses MNSInfo; } -- GitLab From 4852d5365742c9725e6e2326d52d132bec0d87bf Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:08:42 +0200 Subject: [PATCH 201/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 783a9493b..5cbcade9c 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -77,14 +77,15 @@ module _3gpp-common-mnsregistry { augment "/mnsregist3gpp:MNSRegistry" { list MNSInfo { - description "Represents the MNS Registry."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses AMFFunctionGrp; + description "Represents the MNS Registry."; + reference "3GPP TS 28.622"; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses AMFFunctionGrp; } - uses MNSInfo; - } + uses MNSInfo; + } + } } \ No newline at end of file -- GitLab From 49d863d67195e515339496936dbc42933596e986 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:12:36 +0200 Subject: [PATCH 202/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 5cbcade9c..87f834a6b 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -65,9 +65,14 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistry { + list MNSInfo { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; - uses MNSRegistryGrp; + uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + key "mnsType mnsVersion mnsAddress"; + } } @@ -76,16 +81,7 @@ module _3gpp-common-mnsregistry { } augment "/mnsregist3gpp:MNSRegistry" { - list MNSInfo { - description "Represents the MNS Registry."; - reference "3GPP TS 28.622"; - key id; - uses top3gpp:Top_Grp; - container attributes { - uses AMFFunctionGrp; - } uses MNSInfo; - } } } \ No newline at end of file -- GitLab From 5dcc31b31b0d26e4a1733fd454be969c35ea297e Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:13:40 +0200 Subject: [PATCH 203/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 87f834a6b..634f7a6af 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -74,7 +74,7 @@ module _3gpp-common-mnsregistry { key "mnsType mnsVersion mnsAddress"; } } - + } augment "/subnet3gpp:SubNetwork" { uses MNSRegistry; -- GitLab From 7d05180ed26d19c5ebd60f135554ec3192916239 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:15:43 +0200 Subject: [PATCH 204/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 634f7a6af..0e9b9c301 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -69,9 +69,9 @@ module _3gpp-common-mnsregistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; + key "mnsType mnsVersion mnsAddress"; container attributes { uses MNSRegistryGrp; - key "mnsType mnsVersion mnsAddress"; } } } -- GitLab From 0310d54785ff95cae236c2fca355e0e01adf05c9 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:18:35 +0200 Subject: [PATCH 205/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 0e9b9c301..908a64586 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -65,7 +65,7 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistry { - list MNSInfo { + list MNSInfoGrp { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; @@ -80,8 +80,8 @@ module _3gpp-common-mnsregistry { uses MNSRegistry; } - augment "/mnsregist3gpp:MNSRegistry" { - uses MNSInfo; + augment "/mnsregist3gpp:MNSRegistryGrp" { + uses MNSInfoGrp; } } \ No newline at end of file -- GitLab From b6fa64a3cc35756e438188a3fcd24c5559ceb1a5 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:22:15 +0200 Subject: [PATCH 206/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 908a64586..892f17c02 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -65,13 +65,13 @@ module _3gpp-common-mnsregistry { } grouping MNSRegistry { - list MNSInfoGrp { + list MNSRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; key "mnsType mnsVersion mnsAddress"; container attributes { - uses MNSRegistryGrp; + uses MNSInfo; } } } -- GitLab From 69d2d4d40e5c9b22226ec5dfd89861dbdc27397d Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:41:27 +0200 Subject: [PATCH 207/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 892f17c02..cdd2ab94c 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -59,19 +59,16 @@ module _3gpp-common-mnsregistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; - container attributes { - uses MNSInfo; - } } grouping MNSRegistry { - list MNSRegistry { + list mnsRegistry { description "Represents the MNSRegistry IOC."; reference "3GPP TS 28.622"; uses top3gpp:Top_Grp; key "mnsType mnsVersion mnsAddress"; container attributes { - uses MNSInfo; + uses MNSInfoGrp; } } } -- GitLab From 9a22a16a6d5d3ffb33c4321a571ee716c2e0516e Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:43:16 +0200 Subject: [PATCH 208/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index cdd2ab94c..3e166b8c6 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -74,10 +74,10 @@ module _3gpp-common-mnsregistry { } augment "/subnet3gpp:SubNetwork" { - uses MNSRegistry; + uses MNSRegistryGrp; } - augment "/mnsregist3gpp:MNSRegistryGrp" { + augment "/mnsregist3gpp:MNSRegistry" { uses MNSInfoGrp; } -- GitLab From a7e4971d47cfeb27acce989a4147d6028866c264 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:45:31 +0200 Subject: [PATCH 209/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 3e166b8c6..a2e592396 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -77,7 +77,7 @@ module _3gpp-common-mnsregistry { uses MNSRegistryGrp; } - augment "/mnsregist3gpp:MNSRegistry" { + augment "/mnsregist3gpp:MNSRegistryGrp" { uses MNSInfoGrp; } -- GitLab From 1e0e837132f45a14c2c0306dada683ab83d9154b Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 18:46:45 +0200 Subject: [PATCH 210/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index a2e592396..52163902b 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -77,8 +77,4 @@ module _3gpp-common-mnsregistry { uses MNSRegistryGrp; } - augment "/mnsregist3gpp:MNSRegistryGrp" { - uses MNSInfoGrp; - } - } \ No newline at end of file -- GitLab From 46e3b6bf35a275c284bc1c24aa1c15fd142538b8 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 19:54:44 +0200 Subject: [PATCH 211/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 52163902b..85dc917a7 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -14,7 +14,8 @@ module _3gpp-common-mnsregistry { revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } - + revision 2021-10-18 { reference "Update, S5-215263"; } + grouping MNSInfoGrp { description "Represents the MNSInfo IOC."; reference "3GPP TS 28.622"; -- GitLab From 4835f856e724c3c8acd4eea7eac7ca08c0ed4c73 Mon Sep 17 00:00:00 2001 From: scottma Date: Mon, 18 Oct 2021 20:00:09 +0200 Subject: [PATCH 212/268] Update _3gpp-common-mnsregistry.yang --- yang-models/_3gpp-common-mnsregistry.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 85dc917a7..52163902b 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -14,8 +14,7 @@ module _3gpp-common-mnsregistry { revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } - revision 2021-10-18 { reference "Update, S5-215263"; } - + grouping MNSInfoGrp { description "Represents the MNSInfo IOC."; reference "3GPP TS 28.622"; -- GitLab From 7dc43eccdb2422eb4593a6553d8dfce3d761de89 Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Tue, 19 Oct 2021 11:33:35 +0200 Subject: [PATCH 213/268] S5-215266rev2 genericNrm.yaml --- OpenAPI/genericNrm.yaml | 46 ++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 2b46aa48c..864d5427a 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1207,9 +1207,8 @@ components: AlarmList: $ref: '#/components/schemas/AlarmList-Single' MnsRegistry: - type: array - items: - $ref: '#/components/schemas/MnsRegistry' + $ref: '#/components/schemas/MnsRegistry-Single' + ManagedElement-ncO: type: object properties: @@ -1346,22 +1345,11 @@ components: TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' - MnsRegistry: + MnsRegistry-Single: type: object properties: - mnsLabel: - type: string - mnsType: - type: string - enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS - mnsVersion: - type: string - mnsAddress: - type: string + MnsInfo: + $ref: '#/components/schemas/MnsInfo-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- @@ -1552,6 +1540,24 @@ components: additionalProperties: $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord' + MnsInfo-Single: + type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS + mnsVersion: + type: string + mnsAddress: + description: Resource URI as defined in the relevant Technical Specification + $ref: 'comDefs.yaml#/components/schemas/Uri' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -1586,6 +1592,10 @@ components: type: array items: $ref: '#/components/schemas/TraceJob-Single' + MnsInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/MnsInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -1609,3 +1619,5 @@ components: - $ref: '#/components/schemas/TraceJob-Single' - $ref: '#/components/schemas/AlarmList-Single' + - $ref: '#/components/schemas/MnsRegistry-Single' + - $ref: '#/components/schemas/MnsInfo-Single' -- GitLab From 5fd9d1c98261830be9de099ecdd09c42e4040385 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 12:06:30 +0200 Subject: [PATCH 214/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index f557aaf6e..f08a1ef54 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -493,7 +493,8 @@ components: type: array items: type: string - + maxNumberofPDUSessions: + type: integer SupportedBMOList: type: array items: -- GitLab From 12110c0440c5d513a6c22b9d94ad77385ee3d1f6 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 03:55:01 +0200 Subject: [PATCH 215/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 48 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index f08a1ef54..4fb9a9e4d 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1191,6 +1191,31 @@ components: EP_Npc8: $ref: '#/components/schemas/EP_Npc8-Multiple' + EASDFFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + serverAddr: + type: string + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_Nxx: + $ref: '#/components/schemas/EP_Nxx-Multiple' + + ExternalAmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1753,7 +1778,22 @@ components: $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' - + + EP_Nxx-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'nrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' + FiveQiDscpMappingSet-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -2166,7 +2206,11 @@ components: EP_Npc8-Multiple: type: array items: - $ref: '#/components/schemas/EP_Npc8-Single' + $ref: '#/components/schemas/EP_Npc66-Single' + EP_Nxx-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_Nxx-Single' Configurable5QISet-Multiple: type: array items: -- GitLab From fe6beb2f28d5513cf4e8a9573cfd496ed41dce87 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 05:17:37 +0200 Subject: [PATCH 216/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 4fb9a9e4d..58b2a480a 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -2286,6 +2286,7 @@ components: - $ref: '#/components/schemas/EP_N32-Single' - $ref: '#/components/schemas/EP_N33-Single' - $ref: '#/components/schemas/EP_N60-Single' + - $ref: '#/components/schemas/EP_Nxx-Single' - $ref: '#/components/schemas/EP_S5C-Single' - $ref: '#/components/schemas/EP_S5U-Single' -- GitLab From 44d3f75964d471e2a1cc33a30cda97f1b86e21fd Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 17:51:29 +0200 Subject: [PATCH 217/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 58b2a480a..0bbdfe74f 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -499,7 +499,27 @@ components: type: array items: type: string - + + NRTACRange: + type: object + properties: + nRTACstart: + type: string + nRTACend: + type: string + nRTACpattern: + type: string + + TaiRange: + type: object + properties: + plmnId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' + nRTACRangelist: + type: array + items: + $ref: '#/components/schemas/NRTACRange' + ECSAddrConfigInfo: type: array items: @@ -1134,6 +1154,17 @@ components: $ref: '#/components/schemas/CapabilityList' isCAPIFSup: type: boolean + taiList: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/Tai' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + dnai: + type: string + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 46d9ea9de019ef7d9116569fa82a351bd32393e3 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:08:34 +0200 Subject: [PATCH 218/268] 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 0bbdfe74f..a08dd3f9b 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -514,7 +514,7 @@ components: type: object properties: plmnId: - $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList' + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' nRTACRangelist: type: array items: -- GitLab From 1be1d5b3a33ac6c5c05867f3f59d8547bf3ec522 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:10:47 +0200 Subject: [PATCH 219/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 8f25700cf..b4242a701 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -120,6 +120,10 @@ components: $ref: '#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' + TaiList: + type: array + items: + $ref: '#/components/schemas/Tai' BackhaulAddress: type: object -- GitLab From 5d27be2d02aee10f521eb17b120c4758fbaa0829 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:14:35 +0200 Subject: [PATCH 220/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index a08dd3f9b..13ab43e6a 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1155,9 +1155,8 @@ components: isCAPIFSup: type: boolean taiList: - type: array items: - $ref: 'nrNrm.yaml#/components/schemas/Tai' + $ref: 'nrNrm.yaml#/components/schemas/TaiList' taiRangeList: type: array items: -- GitLab From 6ed023fbed68c8b88c206bb150217935c3308b22 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 12:15:09 +0200 Subject: [PATCH 221/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 13ab43e6a..f67d52c5d 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1185,6 +1185,8 @@ components: type: array items: $ref: '#/components/schemas/NsacfInfoSnssai' + taiList： + $ref: 'nrNrm.yaml#/components/schemas/Tai' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From e5e53783b3fdfce293180b946aba23a2bebea5ab Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 12:23:01 +0200 Subject: [PATCH 222/268] 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 f67d52c5d..47dc0d9e9 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1186,7 +1186,7 @@ components: items: $ref: '#/components/schemas/NsacfInfoSnssai' taiList： - $ref: 'nrNrm.yaml#/components/schemas/Tai' + $ref: '#/components/schemas/Tailist' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From ae25713b1ccd779c04edb0646c592574572b7143 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Mon, 18 Oct 2021 12:26:14 +0200 Subject: [PATCH 223/268] 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 47dc0d9e9..f67d52c5d 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1186,7 +1186,7 @@ components: items: $ref: '#/components/schemas/NsacfInfoSnssai' taiList： - $ref: '#/components/schemas/Tailist' + $ref: 'nrNrm.yaml#/components/schemas/Tai' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From c142b044fba01a666e503b4da721f06f57176caa Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 18 Oct 2021 13:40:14 +0200 Subject: [PATCH 224/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index f67d52c5d..f16b45927 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1185,8 +1185,10 @@ components: type: array items: $ref: '#/components/schemas/NsacfInfoSnssai' - taiList： - $ref: 'nrNrm.yaml#/components/schemas/Tai' + taiList: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/Tai' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 20db1d63eea3ebc45a46802e02da6497643b61e0 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:15:39 +0200 Subject: [PATCH 225/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index f16b45927..c2105e1e8 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1186,9 +1186,8 @@ components: items: $ref: '#/components/schemas/NsacfInfoSnssai' taiList: - type: array items: - $ref: 'nrNrm.yaml#/components/schemas/Tai' + $ref: 'nrNrm.yaml#/components/schemas/TaiList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 9c8de46c075943d01d33d08b8bb44aa39eda301c Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:28:39 +0200 Subject: [PATCH 226/268] 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 b4242a701..2896c0a29 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -123,7 +123,7 @@ components: TaiList: type: array items: - $ref: '#/components/schemas/Tai' + $ref: '#/components/schemas/Tai' BackhaulAddress: type: object -- GitLab From 254b57d9dc93826d114ab5f57e319cc56bb193d4 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:34:44 +0200 Subject: [PATCH 227/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index c2105e1e8..87d4f7905 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1185,9 +1185,7 @@ components: type: array items: $ref: '#/components/schemas/NsacfInfoSnssai' - taiList: - items: - $ref: 'nrNrm.yaml#/components/schemas/TaiList' + - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From b8048999bba7f9cfb742fb1a9b14b2ade29409b3 Mon Sep 17 00:00:00 2001 From: sunxixi Date: Tue, 19 Oct 2021 07:37:10 +0200 Subject: [PATCH 228/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 87d4f7905..c2105e1e8 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1185,7 +1185,9 @@ components: type: array items: $ref: '#/components/schemas/NsacfInfoSnssai' - + taiList: + items: + $ref: 'nrNrm.yaml#/components/schemas/TaiList' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From fab14c4b6b99696589f6e2369e4410ccdb7ca93d Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 3 Jan 2022 03:16:06 +0000 Subject: [PATCH 229/268] Revert "Merge branch '28.623_Rel-17_CR0140_Add_support_for_MnS_Discovery' into..." This reverts merge request !206 --- OpenAPI/genericNrm.yaml | 41 +++++----------- yang-models/_3gpp-common-mnsregistry.yang | 59 ++++++++--------------- 2 files changed, 31 insertions(+), 69 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 864d5427a..0911920a2 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1207,8 +1207,9 @@ components: AlarmList: $ref: '#/components/schemas/AlarmList-Single' MnsRegistry: - $ref: '#/components/schemas/MnsRegistry-Single' - + type: array + items: + $ref: '#/components/schemas/MnsRegistry' ManagedElement-ncO: type: object properties: @@ -1345,11 +1346,17 @@ components: TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' - MnsRegistry-Single: + MnsRegistry: type: object properties: - MnsInfo: - $ref: '#/components/schemas/MnsInfo-Multiple' + mnsLabel: + type: string + mnsType: + type: string + mnsVersion: + type: string + mnsAddress: + type: string #-------- Definition of concrete IOCs -------------------------------------------- @@ -1540,24 +1547,6 @@ components: additionalProperties: $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord' - MnsInfo-Single: - type: object - properties: - mnsLabel: - type: string - mnsType: - type: string - enum: - - ProvMnS - - FaultSupervisionMnS - - StreamingDataReportingMnS - - FileDataReportingMnS - mnsVersion: - type: string - mnsAddress: - description: Resource URI as defined in the relevant Technical Specification - $ref: 'comDefs.yaml#/components/schemas/Uri' - #-------- Definition of JSON arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -1592,10 +1581,6 @@ components: type: array items: $ref: '#/components/schemas/TraceJob-Single' - MnsInfo-Multiple: - type: array - items: - $ref: '#/components/schemas/MnsInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -1619,5 +1604,3 @@ components: - $ref: '#/components/schemas/TraceJob-Single' - $ref: '#/components/schemas/AlarmList-Single' - - $ref: '#/components/schemas/MnsRegistry-Single' - - $ref: '#/components/schemas/MnsInfo-Single' diff --git a/yang-models/_3gpp-common-mnsregistry.yang b/yang-models/_3gpp-common-mnsregistry.yang index 52163902b..2783fd385 100755 --- a/yang-models/_3gpp-common-mnsregistry.yang +++ b/yang-models/_3gpp-common-mnsregistry.yang @@ -12,12 +12,13 @@ module _3gpp-common-mnsregistry { Class (IOC) that is part of the Generic Network Resource Model (NRM)."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; - revision 2021-10-18 { reference "S5-215263"; } revision 2021-08-29 { reference "Initial revision, S5-214388"; } - - grouping MNSInfoGrp { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; + + grouping MNSRegistryGrp { + description "Represents the MNSRegistry IOC."; + reference "3GPP TS 28.541"; + uses top3gpp:Top_Grp; + leaf mnsLabel { description "Human-readable name of management service."; mandatory true; @@ -27,10 +28,9 @@ module _3gpp-common-mnsregistry { leaf mnsType { description "Type of management service."; type enumeration { - enum ProvMnS; - enum FaultSupervisionMnS; - enum StreamingDataReportingMnS; - enum FileDataReportingMnS; + enum PROVISIONING; + enum FAULT_SUPERVISION; + enum PERFORMANCE_ASSURANCE; } } @@ -44,37 +44,16 @@ module _3gpp-common-mnsregistry { mandatory true; type string; } - } - - grouping MNSInfo { - description "Represents the MNSInfo IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - container attributes { - uses MNSInfoGrp; } - } - - grouping MNSRegistryGrp { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - } - - grouping MNSRegistry { - list mnsRegistry { - description "Represents the MNSRegistry IOC."; - reference "3GPP TS 28.622"; - uses top3gpp:Top_Grp; - key "mnsType mnsVersion mnsAddress"; - container attributes { - uses MNSInfoGrp; + + augment "/subnet3gpp:SubNetwork" { + list MNSRegistry { + description "Represents the MNSRegistry IOC."; + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MNSRegistryGrp; + } } - } - } - - augment "/subnet3gpp:SubNetwork" { - uses MNSRegistryGrp; - } - + } } \ No newline at end of file -- GitLab From 422887b6fdf905876fe85cfca758633a4f16409b Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 24 Dec 2021 10:35:09 +0000 Subject: [PATCH 230/268] 28.541_Rel17_CR0601 Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 56 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index c2105e1e8..0579c2975 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -144,11 +144,6 @@ components: properties: smfServingAreas: type: string - AmfInfo: - type: object - properties: - priority: - type: integer SupportedDataSetId: type: string description: any of enumrated value @@ -171,7 +166,6 @@ components: - $ref: '#/components/schemas/UdmInfo' - $ref: '#/components/schemas/AusfInfo' - $ref: '#/components/schemas/UpfInfo' - - $ref: '#/components/schemas/AmfInfo' - $ref: '#/components/schemas/Udrinfo' NotificationType: type: string @@ -212,12 +206,46 @@ components: type: string hostAddr: $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + allowedPLMNs: + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/PlmnId' + allowedSNPNs: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/SnpnInfo' + allowedNfTypes: + type: array + items: + $ref: 'genericNrm.yaml#/components/schemas/NFType' + allowedNfDomains: + type: array + items: string + allowedNSSAIs: + type: array + items: + $ref: 'nrNrm.yaml#/components/schemas/Snssai' locality: type: string nFInfo: $ref: '#/components/schemas/NFInfo' capacity: type: integer + nfSetIdList: + type: array + items: string + servingScope: + type: array + items: string + nfSetRecoveryTimeList: + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + scpDomains: + type: array + items: string + vendorId: + type: string SEPPType: type: string description: any of enumrated value @@ -525,6 +553,14 @@ components: items: type: string + GUAMInfo: + type: object + properties: + pLMNId: + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' + aMFIdentifier: + type: integer + #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -608,7 +644,7 @@ components: $ref: '#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: '#/components/schemas/Dynamic5QISet-Multiple' - + AmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -625,6 +661,12 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string + interPlmnFQDN: + type: string + taiList: + $ref: 'nrNrm.yaml#/components/schemas/Tai' + taiRangeList: + $ref: 'nrNrm.yaml#/components/schemas/TaiRange' weightFactor: $ref: '#/components/schemas/WeightFactor' snssaiList: -- GitLab From 63746ed45b70d46afd2c8eb0eebe137fa4b39743 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 4 Jan 2022 12:22:55 +0000 Subject: [PATCH 231/268] validation check. Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 0579c2975..e99effbe4 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -313,7 +313,6 @@ components: items: $ref: '#/components/schemas/NetworkSliceInfo' - PacketErrorRate: type: object properties: @@ -322,8 +321,6 @@ components: exponent: type: integer - - GtpUPathDelayThresholdsType: type: object properties: -- GitLab From 639a545b6fb5c0f52cdaa5f49fc6138e9fd08a1d Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 4 Jan 2022 12:36:25 +0000 Subject: [PATCH 232/268] adding the missing space. try to re-validate. Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e99effbe4..5182a90c2 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -520,6 +520,7 @@ components: type: string maxNumberofPDUSessions: type: integer + SupportedBMOList: type: array items: -- GitLab From 5f13f4c6dc869bc17ac10feb6799e50fb5d91ae4 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 24 Dec 2021 10:40:39 +0000 Subject: [PATCH 233/268] 28.541_Rel17_CR0602 Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 2896c0a29..165441ffb 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -73,6 +73,22 @@ components: type: array items: $ref: '#/components/schemas/PlmnInfo' + SnpnId: + type: object + properties: + mcc: + $ref: 'genericNrm.yaml#/components/schemas/Mcc' + mnc: + $ref: '#/components/schemas/Mnc' + nid: + type: string + SnpnInfo: + type: object + properties: + snpnId: + $ref: '#/components/schemas/SnpnId' + snssai: + $ref: '#/components/schemas/Snssai' cagId: type: string nid: @@ -124,6 +140,25 @@ components: type: array items: $ref: '#/components/schemas/Tai' + + NrtacRange: + type: object + properties: + nRTACstart: + type: string + nRTACend: + type: string + nRTACpattern: + type: string + TaiRange: + type: object + properties: + plmnId: + $ref: '#/components/schemas/PlmnId' + nRTACRangeList: + type: array + items: + $ref: '#/components/schemas/NrtacRange' BackhaulAddress: type: object -- GitLab From c43e285bda80c1d911d0ed0ca299ec805904dd8d Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 12 Jan 2022 03:20:27 +0000 Subject: [PATCH 234/268] fix validation issue Update 5gcNrm.yaml (no definition of PlmnId in comDefs, should be nrNrm.yaml) --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 5182a90c2..df3e41b3f 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -209,7 +209,7 @@ components: allowedPLMNs: type: array items: - $ref: 'comDefs.yaml#/components/schemas/PlmnId' + $ref: 'nrNrm.yaml#/components/schemas/PlmnId' allowedSNPNs: type: array items: -- GitLab From 7e7012c3097c83ace6e620b03769fa9021e0b193 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 12 Jan 2022 03:35:37 +0000 Subject: [PATCH 235/268] fix compilation issue for EASDFFunction stage 3 implementation Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index df3e41b3f..1cc312f9d 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -2371,3 +2371,4 @@ components: - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' + - $ref: '#/components/schemas/EASDFFunction-Single -- GitLab From 96592604e70c0461536c1dc72f33dec9b0775413 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 12 Jan 2022 03:38:49 +0000 Subject: [PATCH 236/268] fix validation issue EASDFFunction 2nd 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 1cc312f9d..17484e530 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -2371,4 +2371,4 @@ components: - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' - $ref: '#/components/schemas/Dynamic5QISet-Single' - - $ref: '#/components/schemas/EASDFFunction-Single + - $ref: '#/components/schemas/EASDFFunction-Single' -- GitLab From 62c30a7471d2f9592b9612fa91a60d6a54f9d227 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 12 Jan 2022 13:48:11 +0000 Subject: [PATCH 237/268] fix validation issue "items: string" Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 17484e530..4037d7e17 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -220,7 +220,8 @@ components: $ref: 'genericNrm.yaml#/components/schemas/NFType' allowedNfDomains: type: array - items: string + items: + type: string allowedNSSAIs: type: array items: @@ -233,17 +234,20 @@ components: type: integer nfSetIdList: type: array - items: string + items: + type: string servingScope: type: array - items: string + items: + type: string nfSetRecoveryTimeList: type: array items: $ref: 'comDefs.yaml#/components/schemas/DateTime' scpDomains: type: array - items: string + items: + type: string vendorId: type: string SEPPType: -- GitLab From 90e559682d9d15a745f4dc4f5613100367d30eba Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 21 Oct 2021 09:16:19 +0200 Subject: [PATCH 238/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 165441ffb..89806d2d2 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -672,6 +672,8 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' DPCIConfigurationFunction: $ref: '#/components/schemas/DPCIConfigurationFunction-Single' CPCIConfigurationFunction: @@ -707,6 +709,8 @@ components: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' DPCIConfigurationFunction: $ref: '#/components/schemas/DPCIConfigurationFunction-Single' CPCIConfigurationFunction: @@ -874,6 +878,8 @@ components: $ref: '#/components/schemas/DESManagementFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' NrCellCu-Single: allOf: @@ -908,6 +914,8 @@ components: $ref: '#/components/schemas/DESManagementFunction-Single' DMROFunction: $ref: '#/components/schemas/DMROFunction-Single' + DLBOFunction: + $ref: '#/components/schemas/DLBOFunction-Single' CESManagementFunction: $ref: '#/components/schemas/CESManagementFunction-Single' DPCIConfigurationFunction: @@ -1414,6 +1422,20 @@ components: $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' tstoreUEcntxt: $ref: '#/components/schemas/TstoreUEcntxt' + DLBOFunction-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + dlboControl: + type: boolean + maximumDeviationHoTrigger: + $ref: '#/components/schemas/MaximumDeviationHoTrigger' + minimumTimeBetweenHoTriggerChange: + $ref: '#/components/schemas/MinimumTimeBetweenHoTriggerChange' DPCIConfigurationFunction-Single: allOf: @@ -1970,6 +1992,7 @@ components: - $ref: '#/components/schemas/DESManagementFunction-Single' - $ref: '#/components/schemas/DRACHOptimizationFunction-Single' - $ref: '#/components/schemas/DMROFunction-Single' + - $ref: '#/components/schemas/DLBOFunction-Single' - $ref: '#/components/schemas/DPCIConfigurationFunction-Single' - $ref: '#/components/schemas/CPCIConfigurationFunction-Single' - $ref: '#/components/schemas/CESManagementFunction-Single' -- GitLab From 61a05442d2b4cda145cf61d0557e56d1a284effa Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 13 Jan 2022 07:05:11 +0000 Subject: [PATCH 239/268] try to update to rel16 latest version for 17.0.0: Update comDefs.yaml --- OpenAPI/comDefs.yaml | 158 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 128 insertions(+), 30 deletions(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index 04ab65161..f9d90b78f 100755 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -1,76 +1,174 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 16.3.0 + version: 16.8.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623 V16.3.0; Generic NRM, Common Type Definitions + description: 3GPP TS 28.623; Generic NRM; Common type definitions url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: schemas: - Long: - type: string - format: long + Float: - type: string + type: number format: float DateTime: type: string - format: date-Time + format: date-time + Latitude: + type: number + format: float + minimum: -90 + maximum: 90 + Longitude: + type: number + format: float + minimum: -180 + maximum: 180 + Dn: type: string + DnList: + type: array + items: + $ref: '#/components/schemas/Dn' + + Mcc: + type: string + pattern: '^[0-9]{3}$' + Mnc: + type: string + pattern: '^[0-9]{2,3}$' + Nid: + type: string + pattern: '^[A-Fa-f0-9]{11}$' + PlmnId: + type: object + properties: + mcc: + $ref: '#/components/schemas/Mcc' + mnc: + $ref: '#/components/schemas/Mnc' + Tac: + type: string + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + EutraCellId: + type: string + pattern: '^[A-Fa-f0-9]{7}$' + NrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + + Fqdn: + type: string + Ipv4Addr: + type: string + pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' + example: '198.51.100.1' + Ipv6Addr: + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' + example: '2001:db8:85a3::8a2e:370:7334' + Ipv6Prefix: + type: string + allOf: + - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' + - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' + example: '2001:db8:abcd:12::0/64' + IpAddr: + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + HostAddr: + # This definition will be deprecated, when all occurances of HostAddr + # are replaced by Host. + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + - $ref: '#/components/schemas/Fqdn' + Host: + oneOf: + - $ref: '#/components/schemas/IpAddr' + - $ref: '#/components/schemas/Fqdn' Uri: type: string + + AdministrativeState: + type: string + enum: + - LOCKED + - UNLOCKED + OperationalState: + type: string + enum: + - ENABLED + - DISABLED + UsageState: + type: string + enum: + - IDEL + - ACTIVE + - BUSY + AttributeNameValuePairSet: + description: >- + The key of this map is the attribute name, and the value the attribute value. type: object minProperties: 1 + additionalProperties: + nullable: true AttributeValueChangeSet: description: >- - The key in this map is the attribute name. The value of each key is an array. - When only one item is present in the array, it carries the new attribute - value. If two items are present, then the first item carries the old value - and the second item the new value. The items can be of any type including null. - type: object - additionalProperties: - type: array + The first array item contains the attribute name value pairs with the new values, + and the second array item the attribute name value pairs with the optional old values. + type: array + items: + $ref: '#/components/schemas/AttributeNameValuePairSet' minItems: 1 maxItems: 2 - items: - nullable: true + Filter: + description: >- + The filter format shall be compliant to XPath 1.0. type: string SystemDN: type: string + NotificationId: type: integer + NotificationType: + oneOf: + - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes' + - $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' + - $ref: 'perfMnS.yaml#/components/schemas/PerfNotificationTypes' + - $ref: 'heartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes' + - $ref: 'fileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes' NotificationHeader: - description: >- - Header used for all notifications types type: object - required: - - uri - - notificationId - - notificationType - - eventTime - - systemDn properties: - uri: + href: $ref: '#/components/schemas/Uri' notificationId: $ref: '#/components/schemas/NotificationId' notificationType: - oneOf: - - $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes' - #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' - # more to be added + $ref: '#/components/schemas/NotificationType' eventTime: $ref: '#/components/schemas/DateTime' systemDN: $ref: '#/components/schemas/SystemDN' + required: + - href + - notificationId + - notificationType + - eventTime + - systemDN + ErrorResponse: description: >- Default schema for the response message body in case the request -- GitLab From eb1548cc5520996156894a1738655923573ab0fe Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 13 Jan 2022 07:10:33 +0000 Subject: [PATCH 240/268] try to use rel16 latest version for rel17 first version: Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 954 +++++++++++++++++++++++----------------- 1 file changed, 541 insertions(+), 413 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 0911920a2..fd690eb91 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.4.0 + version: 16.9.0 description: >- - OAS 3.0.1 specification of the Generic NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + OAS 3.0.1 definition of the Generic NRM + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623 V16.4.0; Generic NRM + description: 3GPP TS 28.623; Generic NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: @@ -15,53 +15,11 @@ components: #-------- Definition of types----------------------------------------------------- - DateTime: - type: string - format: date-time - Dn: - type: string - maxLength: 400 - DnList: - type: array - items: - $ref: '#/components/schemas/Dn' - Mcc: - type: string - pattern: '^[0-9]{3}$' - Mnc: - type: string - pattern: '^[0-9]{2,3}$' - AdministrativeState: - type: string - enum: - - LOCKED - - UNLOCKED - OperationalState: - type: string - enum: - - ENABLED - - DISABLED - UsageState: - type: string - enum: - - IDEL - - ACTIVE - - BUSY RegistrationState: type: string enum: - REGISTERED - DEREGISTERED - SetOfMcc: - type: array - items: - $ref: '#/components/schemas/Mcc' - ManagedElementType: - type: string - ManagedElementTypeList: - type: array - items: - $ref: '#/components/schemas/ManagedElementType' VnfParameter: type: object properties: @@ -73,20 +31,6 @@ components: type: string autoScalable: type: boolean - VnfParametersList: - type: array - items: - $ref: '#/components/schemas/VnfParameter' - SiteLatitude: - type: number - format: float - minimum: -90 - maximum: 90 - SiteLongitude: - type: number - format: float - minimum: -180 - maximum: 180 PeeParameter: type: object properties: @@ -95,53 +39,35 @@ components: siteDescription: type: string siteLatitude: - $ref: '#/components/schemas/SiteLatitude' + $ref: 'comDefs.yaml#/components/schemas/Latitude' siteLongitude: - $ref: '#/components/schemas/SiteLongitude' + $ref: 'comDefs.yaml#/components/schemas/Longitude' equipmentType: type: string environmentType: type: string powerInterface: type: string - PeeParametersList: - type: array - items: - $ref: '#/components/schemas/PeeParameter' - MonitoringGPList: - type: array - items: - type: integer - ThresholdInfoList: - type: array - items: - $ref: '#/components/schemas/ThresholdInfo' ThresholdInfo: type: object properties: - measurementType: + thresholdDirection: type: string - direction: - $ref: '#/components/schemas/Direction' - thresholdPack: - $ref: '#/components/schemas/ThresholdPack' - Direction: - enum: - - Increasing - - Decreasing - ThresholdPack: - type: array - items: - $ref: '#/components/schemas/ThresholdPackElement' - ThresholdPackElement: - type: object - properties: - thresholdLevel: - type: integer + enum: + - UP + - DOWN + - UP_AND_DOWN thresholdValue: - type: number + oneOf: + - type: integer + - $ref: 'comDefs.yaml#/components/schemas/Float' hysteresis: - type: number + oneOf: + - type: integer + minimum: 0 + - type: number + format: float + minimum: 0 Operation: type: object properties: @@ -151,10 +77,6 @@ components: $ref: '#/components/schemas/NFType' operationSemantics: $ref: '#/components/schemas/OperationSemantics' - OperationList: - type: array - items: - $ref: '#/components/schemas/Operation' NFType: type: string description: ' NF name defined in TS 23.501' @@ -178,8 +100,6 @@ components: - AF - UDSF - DN - Fqdn: - type: string OperationSemantics: type: string enum: @@ -189,7 +109,7 @@ components: type: object properties: host: - $ref: '#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' port: type: integer NFServiceType: @@ -202,41 +122,6 @@ components: - Nsmf_PDUSession - Nsmf_EventExposure - Others - HostAddr: - oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' - - $ref: '#/components/schemas/Fqdn' - Ipv4Addr: - type: string - pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' - example: '198.51.100.1' - Ipv4AddrRm: - type: string - pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' - example: '198.51.100.1' - nullable: true - Ipv6Addr: - type: string - allOf: - - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' - - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' - example: '2001:db8:85a3::8a2e:370:7334' - Ipv6AddrRm: - type: string - allOf: - - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' - - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' - example: '2001:db8:85a3::8a2e:370:7334' - nullable: true - Ipv6Prefix: - type: string - allOf: - - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' - - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' - example: '2001:db8:abcd:12::0/64' - Uri: - type: string TransportProtocol: anyOf: - type: string @@ -260,9 +145,14 @@ components: items: type: string enum: - - FILE_BASED_LOC_SET_BY_PRODUCER - - FILE_BASED_LOC_SET_BY_CONSUMER - - STREAM_BASED + - FILE_BASED_LOC_SET_BY_PRODUCER + - FILE_BASED_LOC_SET_BY_CONSUMER + - STREAM_BASED + monitorGranularityPeriods: + type: array + items: + type: integer + minimum: 1 ReportingCtrl: oneOf: - type: object @@ -274,11 +164,11 @@ components: fileReportingPeriod: type: integer fileLocation: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' - type: object properties: streamTarget: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' Scope: type: object properties: @@ -291,28 +181,71 @@ components: - BASE_SUBTREE scopeLevel: type: integer - NotificationType: + AreaScope: + oneOf: + - type: array + items: + $ref: '#/components/schemas/EutraCellId' + - type: array + items: + $ref: '#/components/schemas/NrCellId' + - type: array + items: + $ref: '#/components/schemas/Tac' + - type: array + items: + $ref: '#/components/schemas/Tai' + Tai: + type: object + properties: + mcc: + $ref: 'comDefs.yaml#/components/schemas/Mcc' + mnc: + $ref: 'comDefs.yaml#/components/schemas/Mnc' + tac: + $ref: '#/components/schemas/Tac' + AreaConfig: + type: object + properties: + freqInfo: + $ref: '#/components/schemas/FreqInfo' + pciList: + type: array + items: + type: integer + FreqInfo: + description: specifies the carrier frequency and bands used in a cell. + type: object + properties: + arfcn: + type: integer + freqBands: + type: array + items: + type: integer + MbsfnArea: + type: object + properties: + mbsfnAreaId: + type: integer + minimum: 1 + earfcn: + type: integer + minimum: 1 + Tac: type: string - enum: - - notifyMOICreation - - notifyMOIDeletion - - notifyMOIAttributeValueChanges - - notifyEvent - - notifyNewAlarm - - notifyChangedAlarm - - notifyAckStateChanged - - notifyComments - - notifyCorrelatedNotificationChanged - - notifyChangedAlarmGeneral - - notifyAlarmListRebuilt - - notifyPotentialFaultyAlarmList - - notifyFileReady - - notifyFilePreparationError - - notifyThresholdCrossing - NotificationTypes: - type: array - items: - $ref: '#/components/schemas/NotificationType' + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + EutraCellId: + type: string + pattern: '^[A-Fa-f0-9]{7}$' + NrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + IpAddr: + oneOf: + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' + #-------- Definition of types used in Trace control NRM fragment------------------ @@ -476,6 +409,9 @@ components: - S6d - S6a - Sh + - N70 + - N71 + - NU1 EIRInterfaces: type: array items: @@ -618,6 +554,7 @@ components: - N10 - N13 - N21 + - NU1 UPFInterfaces: type: array items: @@ -676,30 +613,27 @@ components: - GNB_CU_CP - GNB_CU_UP - GNB_DU + - AMF + - PCF + - SMF + - UPF + - AUSF + - SMSF + - HSS + - UDM - tjPLMNTaget-Type: + tjPLMNTarget-Type: type: object description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details. properties: mcc: - $ref: '#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: - $ref: '#/components/schemas/Mnc' + $ref: 'comDefs.yaml#/components/schemas/Mnc' required: - mcc - mnc - tjStreamingTraceConsumerURI-Type: - type: string - description: The URI of the Trace Reporting MnS consumer (see 3GPP TS 28.532) to which the Trace records shall be sent. See 3GPP TS 32.422 clause 5.9 for additional details. - format: uri - - tjTraceCollectionEntityAddress-Type: - description: The IP address to which the Trace records shall be transferred. See 3GPP TS 32.422 clause 5.9 for additional details. - oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' - tjTraceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. type: string @@ -716,11 +650,11 @@ components: description: The Trace Reference parameter shall be globally unique, therefore the Trace Reference shall compose as follows - MCC+MNC+Trace ID, where the MCC and MNC are coming with the Trace activation request from the management system to identify one PLMN containing the management system, and Trace ID is a 3 byte Octet String. See 3GPP TS 32.422 clause 5.6 for additional details. properties: mcc: - $ref: '#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: - $ref: '#/components/schemas/Mnc' + $ref: 'comDefs.yaml#/components/schemas/Mnc' traceId: - type: integer + type: string required: - mcc - mnc @@ -734,19 +668,28 @@ components: - STREAMING tjTraceTarget-Type: - type: string - description: Type of trace target. For additional details see 3GPP TS 32.422. - enum: - - IMSI - - IMEI - - IMEISV - - PUBLIC_ID - - UTRAN_CELL - - E-UTRAN_CELL - - NG-RAN_CELL - - eNB - - RNC - - gNB + type: object + description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422 + properties: + TargetIdType: + type: string + enum: + - IMSI + - IMEI + - IMEISV + - PUBLIC_ID + - UTRAN_CELL + - E-UTRAN_CELL + - NG-RAN_CELL + - eNB + - RNC + - gNB + - SUPI + TargetIdValue: + type: string + required: + - TargetIdType + - TargetIdValue tjTriggeringEvent-Type: type: object @@ -767,6 +710,12 @@ components: - SMF - PCF - UPF + - AUSF + - NEF + - NRF + - NSSF + - SMSF + - UDM EventBitmap: type: integer required: @@ -780,26 +729,41 @@ components: - NO_IDENTITY - TAC_OF_IMEI - tjMDTAreaConfigurationForNeighCell-Type: - description: Used for logged NR MDT and defines the area for which UE is requested to perform measurement logging for neighbour cells which have list of frequencies. For additional details see 3GPP TS 32.422 clause 5.10.26. - type: array - items: - type: object - properties: - frequency: - type: string - cell: - type: string - - tjMDTAreaScope-Type: - description: defines the area in terms or Cells or Tracking Area/Routing Area/Location Area where the MDT data collection shall take place. For additional details see 3GPP TS 32.422 clause 5.10.2. - allOf: - - $ref: '#/components/schemas/DnList' - tjMDTCollectionPeriodRrmLte-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: + - 100ms + - 1000ms + - 1024ms + - 1280ms + - 2048ms + - 2560ms + - 5120ms + - 10000ms + - 10240ms + - 60000ms + + tjMDTCollectionPeriodM6Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.32. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + + tjMDTCollectionPeriodM7Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.33. + type: integer + minimum: 1 + maximum: 60 + + tjMDTCollectionPeriodRrmUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.21. + type: string + enum: + - 100ms - 250ms - 500ms - 1000ms @@ -807,27 +771,42 @@ components: - 3000ms - 4000ms - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms + + tjMDTCollectionPeriodRrmNR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.30. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms - tjMDTCollectionPeriodRrmUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.21. + tjMDTCollectionPeriodM6NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: + - 120ms + - 240ms + - 480ms + - 640ms - 1024ms - - 1280ms - 2048ms - - 2560ms - 5120ms - 10240ms + - 20480ms + - 40960ms - 1min - + - 6min + - 12min + - 30min + + tjMDTCollectionPeriodM7NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.35. + type: integer + minimum: 1 + maximum: 60 + tjMDTEventListForTriggeredMeasurement-Type: description: See details in 3GPP TS 32.422 clause 5.10.28. type: string @@ -840,13 +819,21 @@ components: type: object properties: EventThresholdRSRP: - type: integer - minimum: 0 - maximum: 97 + oneOf: + - type: integer + minimum: 0 + maximum: 97 + - type: integer + minimum: 0 + maximum: 127 EventThresholdRSRQ: - type: integer - minimum: 0 - maximum: 34 + oneOf: + - type: integer + minimum: 0 + maximum: 34 + - type: integer + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: @@ -912,6 +899,7 @@ components: - M5 - M6 - M7 + - M1_EVENT_TRIGGERED - M8 - M9 @@ -928,41 +916,97 @@ components: tjMDTLoggingInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.8. + type: object + properties: + UMTS: + type: array + items: + type: string + enum: + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + LTE: + type: array + items: + type: string + enum: + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + NR: + type: array + items: + type: string + enum: + - 0.32s + - 0.64s + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + - INFINITY + + tjMDTLoggingEventThreshold-Type: + description: See details in 3GPP TS 32.422 clause 5.10.X. + type: object + properties: + RSRP: + type: integer + minimum: 0 + maximum: 127 + RSRQ: + type: integer + minimum: 0 + maximum: 127 + + tjMDTLoggingHysteresis-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Y. + type: integer + minimum: 0 + maximum: 30 + + tjMDTLoggingTimeToTrigger-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Z. type: string enum: - - 1.28s - - 2.56s - - 5.12s - - 10.24s - - 20.48s - - 30.72s - - 40.96s - - 61.44s - - tjMDTMBSFNAreaList-Type: - description: See details in 3GPP TS 32.422 clause 5.10.25. - type: array - items: - type: object - properties: - mbsfnAreaId: - type: integer - minimum: 1 - earfcn: - type: integer - minimum: 1 - required: - - mbsfnAreaId - - earfcn + - 0ms + - 40ms + - 64ms + - 80ms + - 100ms + - 128ms + - 160ms + - 256ms + - 320ms + - 480ms + - 512ms + - 640ms + - 1024ms + - 1280ms + - 2560ms + - 5120ms tjMDTMeasurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: - 1024ms - - 1280ms - 2048ms - - 2560ms - 5120ms - 10240ms - 1min @@ -971,8 +1015,6 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: - - 250ms - - 500ms - 1000ms - 2000ms - 3000ms @@ -995,16 +1037,22 @@ components: - CPICH_RSCP - PathLoss - tjMDTPLMList-Type: + tjMDTM4ThresholdUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.A. + type: integer + minimum: 0 + maximum: 31 + + tjMDTPLMNList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array items: type: object properties: mcc: - $ref: '#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: - $ref: '#/components/schemas/Mnc' + $ref: 'comDefs.yaml#/components/schemas/Mnc' required: - mcc - mnc @@ -1037,45 +1085,72 @@ components: type: string enum: - PERIODICAL - - A2_FOR_LTE + - A2_FOR_LTE_NR - 1F_FOR_UMTS - 1I_FOR_UMTS_MCPS_TDD - - A2_TRIGGERED_PERIODIC_FOR_LTE - - ALL_CONFIGURED_RRM_FOR_LTE + - A2_TRIGGERED_PERIODIC_FOR_LTE_NR + - ALL_CONFIGURED_RRM_FOR_LTE_NR - ALL_CONFIGURED_RRM_FOR_UMTS tjMDTReportInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.5. - type: string - enum: - - 250ms - - 500ms - - 1000ms - - 2000ms - - 3000ms - - 4000ms - - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms - - 120ms - - 240ms - - 480ms - - 640ms - - 1024ms - - 2048ms - - 5120ms - - 10240ms - - 60000ms - - 360000ms - - 720000ms - - 1800000ms - - 3600000ms + type: object + properties: + UMTS: + type: array + items: + type: string + enum: + - 250ms + - 500ms + - 1000ms + - 2000ms + - 3000ms + - 4000ms + - 6000ms + - 8000ms + - 12000ms + - 16000ms + - 20000ms + - 24000ms + - 28000ms + - 32000ms + - 64000ms + LTE: + type: array + items: + type: string + enum: + - 120ms + - 240ms + - 480ms + - 640ms + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms + - 360000ms + - 720000ms + - 1800000ms + - 3600000ms + NR: + type: array + items: + type: string + enum: + - 120ms + - 240ms + - 480ms + - 640ms + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms + - 360000ms + - 720000ms + - 1800000ms tjMDTReportType-Type: description: Report type for logged NR MDT. See details in 3GPP TS 32.422 clause 5.10.27. @@ -1095,29 +1170,8 @@ components: - UE_ORIENTATION tjMDTTraceCollectionEntityID-Type: - description: See details in 3GPP TS 32.422 clause 5.10.11. Only tceID value may be sent over the air to the UE being configured for Logged MDT. - type: object - properties: - tceID: - type: integer - tcePLMN: - type: object - properties: - mcc: - $ref: '#/components/schemas/Mcc' - mnc: - $ref: '#/components/schemas/Mnc' - required: - - mcc - - mnc - tceAddress: - oneOf: - - $ref: '#/components/schemas/tjTraceCollectionEntityAddress-Type' - - $ref: '#/components/schemas/tjStreamingTraceConsumerURI-Type' - required: - - tceID - - tcePLMN - - tceAddress + description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. + type: integer #-------- end of Definition of types used in Trace control NRM fragment ---------- @@ -1132,15 +1186,29 @@ components: properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id Top: type: object properties: id: type: string + nullable: true + objectClass: + type: string + objectInstance: + $ref: 'comDefs.yaml#/components/schemas/Dn' VsDataContainer: $ref: '#/components/schemas/VsDataContainer-Multiple' + required: + - id #-------- Definition of IOCs with new name-containments defined in other TS ------ @@ -1154,7 +1222,9 @@ components: userDefinedNetworkType: type: string setOfMcc: - $ref: '#/components/schemas/SetOfMcc' + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/Mcc' priorityLabel: type: integer supportedPerfMetricGroups: @@ -1167,13 +1237,15 @@ components: dnPrefix: type: string managedElementTypeList: - $ref: '#/components/schemas/ManagedElementTypeList' + type: array + items: + type: string userLabel: type: string locationName: type: string managedBy: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' vendorName: type: string userDefinedState: @@ -1192,14 +1264,14 @@ components: properties: ManagementNode: $ref: '#/components/schemas/ManagementNode-Multiple' + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' PerfMetricJob: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - ThresholdMonitoringCapability: - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' NtfSubscriptionControl: $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: @@ -1207,18 +1279,16 @@ components: AlarmList: $ref: '#/components/schemas/AlarmList-Single' MnsRegistry: - type: array - items: - $ref: '#/components/schemas/MnsRegistry' + $ref: '#/components/schemas/MnsRegistry-Single' ManagedElement-ncO: type: object properties: + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' PerfMetricJob: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - ThresholdMonitoringCapability: - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' NtfSubscriptionControl: $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: @@ -1234,9 +1304,13 @@ components: userLabel: type: string vnfParametersList: - $ref: '#/components/schemas/VnfParametersList' + type: array + items: + $ref: '#/components/schemas/VnfParameter' peeParametersList: - $ref: '#/components/schemas/PeeParametersList' + type: array + items: + $ref: '#/components/schemas/PeeParameter' priorityLabel: type: integer supportedPerfMetricGroups: @@ -1266,15 +1340,17 @@ components: tjListOfNeTypes: $ref: '#/components/schemas/tjListOfNeTypes-Type' tjPLMNTarget: - $ref: '#/components/schemas/tjPLMNTaget-Type' - tjTraceConsumer: - oneOf: - - $ref: '#/components/schemas/tjStreamingTraceConsumerURI-Type' - - $ref: '#/components/schemas/tjTraceCollectionEntityAddress-Type' + $ref: '#/components/schemas/tjPLMNTarget-Type' + tjStreamingTraceConsumerURI: + $ref: 'comDefs.yaml#/components/schemas/Uri' + tjTraceCollectionEntityAddress: + $ref: '#/components/schemas/IpAddr' tjTraceDepth: $ref: '#/components/schemas/tjTraceDepth-Type' tjTraceReference: $ref: '#/components/schemas/tjTraceReference-Type' + tjTraceRecordSessionReference: + type: string tjTraceReportingFormat: $ref: '#/components/schemas/tjTraceReportingFormat-Type' tjTraceTarget: @@ -1284,13 +1360,25 @@ components: tjMDTAnonymizationOfData: $ref: '#/components/schemas/tjMDTAnonymizationOfData-Type' tjMDTAreaConfigurationForNeighCell: - $ref: '#/components/schemas/tjMDTAreaConfigurationForNeighCell-Type' + $ref: '#/components/schemas/AreaConfig' tjMDTAreaScope: - $ref: '#/components/schemas/tjMDTAreaScope-Type' + type: array + items: + $ref: '#/components/schemas/AreaScope' tjMDTCollectionPeriodRrmLte: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type' + tjMDTCollectionPeriodM6Lte: + $ref: '#/components/schemas/tjMDTCollectionPeriodM6Lte-Type' + tjMDTCollectionPeriodM7Lte: + $ref: '#/components/schemas/tjMDTCollectionPeriodM7Lte-Type' tjMDTCollectionPeriodRrmUmts: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmUmts-Type' + tjMDTCollectionPeriodRrmNR: + $ref: '#/components/schemas/tjMDTCollectionPeriodRrmNR-Type' + tjMDTCollectionPeriodM6NR: + $ref: '#/components/schemas/tjMDTCollectionPeriodM6NR-Type' + tjMDTCollectionPeriodM7NR: + $ref: '#/components/schemas/tjMDTCollectionPeriodM7NR-Type' tjMDTEventListForTriggeredMeasurement: $ref: '#/components/schemas/tjMDTEventListForTriggeredMeasurement-Type' tjMDTEventThreshold: @@ -1301,16 +1389,26 @@ components: $ref: '#/components/schemas/tjMDTLoggingDuration-Type' tjMDTLoggingInterval: $ref: '#/components/schemas/tjMDTLoggingInterval-Type' + tjMDTLoggingEventThreshold: + $ref: '#/components/schemas/tjMDTLoggingEventThreshold-Type' + tjMDTLoggingHysteresis: + $ref: '#/components/schemas/tjMDTLoggingHysteresis-Type' + tjMDTLoggingTimeToTrigger: + $ref: '#/components/schemas/tjMDTLoggingTimeToTrigger-Type' tjMDTMBSFNAreaList: - $ref: '#/components/schemas/tjMDTMBSFNAreaList-Type' + type: array + items: + $ref: '#/components/schemas/MbsfnArea' tjMDTMeasurementPeriodLTE: $ref: '#/components/schemas/tjMDTMeasurementPeriodLTE-Type' tjMDTMeasurementPeriodUMTS: $ref: '#/components/schemas/tjMDTMeasurementPeriodUMTS-Type' tjMDTMeasurementQuantity: $ref: '#/components/schemas/tjMDTMeasurementQuantity-Type' - tjMDTPLMList: - $ref: '#/components/schemas/tjMDTPLMList-Type' + tjMDTM4ThresholdUmts: + $ref: '#/components/schemas/tjMDTM4ThresholdUmts-Type' + tjMDTPLMNList: + $ref: '#/components/schemas/tjMDTPLMNList-Type' tjMDTPositioningMethod: $ref: '#/components/schemas/tjMDTPositioningMethod-Type' tjMDTReportAmount: @@ -1325,12 +1423,6 @@ components: $ref: '#/components/schemas/tjMDTSensorInformation-Type' tjMDTTraceCollectionEntityID: $ref: '#/components/schemas/tjMDTTraceCollectionEntityID-Type' - required: - - tjJobType - - tjTraceReference - - tjTraceConsumer - - tjTraceReportingFormat - - tjTraceTarget ManagedFunction-ncO: type: object @@ -1339,24 +1431,17 @@ components: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - ThresholdMonitoringCapability: - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' ManagedNFService: $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' - MnsRegistry: + MnsRegistry-Single: type: object properties: - mnsLabel: - type: string - mnsType: - type: string - mnsVersion: - type: string - mnsAddress: - type: string + MnsInfo: + $ref: '#/components/schemas/MnsInfo-Multiple' + #-------- Definition of concrete IOCs -------------------------------------------- @@ -1378,7 +1463,7 @@ components: $ref: '#/components/schemas/VsDataContainer-Multiple' ManagedNFService-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1391,18 +1476,20 @@ components: sAP: $ref: '#/components/schemas/SAP' operations: - $ref: '#/components/schemas/OperationList' + type: array + items: + $ref: '#/components/schemas/Operation' administrativeState: - $ref: '#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: '#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' usageState: - $ref: '#/components/schemas/UsageState' + $ref: 'comDefs.yaml#/components/schemas/UsageState' registrationState: $ref: '#/components/schemas/RegistrationState' ManagementNode-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1411,7 +1498,7 @@ components: userLabel: type: string managedElements: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' vendorName: type: string userDefinedState: @@ -1420,9 +1507,21 @@ components: type: string swVersion: type: string + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' + MnsAgent-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + systemDN: + $ref: 'comDefs.yaml#/components/schemas/Dn' MeContext-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1432,17 +1531,17 @@ components: type: string PerfMetricJob-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: administrativeState: - $ref: '#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: '#/components/schemas/OperationalState' - perfMetricJobGroupId: + $ref: 'comDefs.yaml#/components/schemas/OperationalState' + jobId: type: string performanceMetrics: type: array @@ -1452,60 +1551,61 @@ components: type: integer minimum: 1 objectInstances: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' rootObjectInstances: - $ref: '#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' reportingCtrl: $ref: '#/components/schemas/ReportingCtrl' - ThresholdMonitoringCapability-Single: - allOf: - - $ref: '#/components/schemas/Top-Attr' - - type: object - properties: - attributes: - type: object - properties: - supportedMonitoringGPs: - $ref: '#/components/schemas/MonitoringGPList' ThresholdMonitor-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: + administrativeState: + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'comDefs.yaml#/components/schemas/OperationalState' + performanceMetrics: + type: array + items: + type: string thresholdInfoList: - $ref: '#/components/schemas/ThresholdInfoList' - monitoringGP: + type: array + items: + $ref: '#/components/schemas/ThresholdInfo' + monitorGranularityPeriod: type: integer - monitoringNotifTarget: - type: string - monitoredIOCName: - type: string - monitoredObjectDNs: - $ref: '#/components/schemas/DnList' + minimum: 1 + objectInstances: + $ref: 'comDefs.yaml#/components/schemas/DnList' + rootObjectInstances: + $ref: 'comDefs.yaml#/components/schemas/DnList' NtfSubscriptionControl-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: notificationRecipientAddress: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' notificationTypes: - $ref: '#/components/schemas/NotificationTypes' + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/NotificationType' scope: $ref: '#/components/schemas/Scope' notificationFilter: - type: string + $ref: 'comDefs.yaml#/components/schemas/Filter' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1513,11 +1613,12 @@ components: properties: heartbeatNtfPeriod: type: integer + minimum: 0 triggerHeartbeatNtf: type: boolean TraceJob-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: @@ -1525,29 +1626,47 @@ components: AlarmList-Single: allOf: - - $ref: '#/components/schemas/Top-Attr' + - $ref: '#/components/schemas/Top' - type: object properties: attributes: type: object properties: administrativeState: - $ref: '#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: '#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' numOfAlarmRecords: type: integer lastModification: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmRecords: description: >- - This resource represents a map of alarm records. - The alarmIds are used as keys in the map. + This resource represents a map of alarm records. + The alarmIds are used as keys in the map. type: object additionalProperties: $ref: 'faultMnS.yaml#/components/schemas/AlarmRecord' -#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + MnsInfo-Single: + type: object + properties: + mnsLabel: + type: string + mnsType: + type: string + enum: + - ProvMnS + - FaultSupervisionMnS + - StreamingDataReportingMnS + - FileDataReportingMnS + mnsVersion: + type: string + mnsAddress: + description: Resource URI as defined in the relevant Technical Specification + $ref: 'comDefs.yaml#/components/schemas/Uri' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: type: array @@ -1561,6 +1680,10 @@ components: type: array items: $ref: '#/components/schemas/ManagementNode-Single' + MnsAgent-Multiple: + type: array + items: + $ref: '#/components/schemas/MnsAgent-Single' MeContext-Multiple: type: array items: @@ -1573,34 +1696,39 @@ components: type: array items: $ref: '#/components/schemas/ThresholdMonitor-Single' + TraceJob-Multiple: + type: array + items: + $ref: '#/components/schemas/TraceJob-Single' NtfSubscriptionControl-Multiple: type: array items: $ref: '#/components/schemas/NtfSubscriptionControl-Single' - TraceJob-Multiple: + MnsInfo-Multiple: type: array items: - $ref: '#/components/schemas/TraceJob-Single' + $ref: '#/components/schemas/MnsInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-genericNrm: oneOf: - - $ref: '#/components/schemas/VsDataContainer-Single' - - - $ref: '#/components/schemas/ManagementNode-Single' - - $ref: '#/components/schemas/MeContext-Single' + - $ref: '#/components/schemas/VsDataContainer-Single' - - $ref: '#/components/schemas/ManagedNFService-Single' + - $ref: '#/components/schemas/ManagementNode-Single' + - $ref: '#/components/schemas/MnsAgent-Single' + - $ref: '#/components/schemas/MeContext-Single' - - $ref: '#/components/schemas/PerfMetricJob-Single' + - $ref: '#/components/schemas/ManagedNFService-Single' - - $ref: '#/components/schemas/ThresholdMonitoringCapability-Single' - - $ref: '#/components/schemas/ThresholdMonitor-Single' + - $ref: '#/components/schemas/PerfMetricJob-Single' + - $ref: '#/components/schemas/ThresholdMonitor-Single' + - $ref: '#/components/schemas/TraceJob-Single' - - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - - $ref: '#/components/schemas/HeartbeatControl-Single' - - $ref: '#/components/schemas/TraceJob-Single' + - $ref: '#/components/schemas/NtfSubscriptionControl-Single' + - $ref: '#/components/schemas/HeartbeatControl-Single' - - $ref: '#/components/schemas/AlarmList-Single' + - $ref: '#/components/schemas/AlarmList-Single' + - $ref: '#/components/schemas/MnsRegistry-Single' + - $ref: '#/components/schemas/MnsInfo-Single' -- GitLab From 75f8db920e8839a5c30bbc29eb5ea6ac99b7d678 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 07:42:25 +0000 Subject: [PATCH 241/268] Replace PerThresMonMnS.yaml with perfMnS.yaml (R16) --- OpenAPI/PerThresMonMnS.yaml | 108 ++++++++++++++---------------------- 1 file changed, 41 insertions(+), 67 deletions(-) diff --git a/OpenAPI/PerThresMonMnS.yaml b/OpenAPI/PerThresMonMnS.yaml index 923640a11..1fd64a7d2 100755 --- a/OpenAPI/PerThresMonMnS.yaml +++ b/OpenAPI/PerThresMonMnS.yaml @@ -1,17 +1,23 @@ openapi: 3.0.1 info: - title: TS 28.532 Performance Threshold Monitoring Service - version: 16.4.0 - description: OAS 3.0.1 specification of the Performance Threshold Monitoring Service + title: TS 28.532 Performance Threshold Monitoring MnS + version: 16.6.0 + description: >- + OAS 3.0.1 definition of the Performance Threshold Monitoring MnS + © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.532 V16.6.0; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: 'http://{monitoringNotifTarget}' + - url: '{root}' variables: - monitoringNotifTarget: + root: description: >- The open API server of the performance threshold monitoring service is located in the consumer side, see monitoringNotifTarget attribute of the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. - default: example.com + default: http://example.com/3GPPManagement paths: /notificationSink: post: @@ -22,7 +28,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyThresholdCrossing-NotifType' + $ref: '#/components/schemas/NotifyThresholdCrossing' responses: '204': description: >- @@ -33,70 +39,38 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - dateTime-Type: - type: string - format: date-Time - uri-Type: - type: string - long-Type: - type: string - format: long - thresholdLevel-Type: - type: integer - measurementTypeName-Type: - type: string - measurementValue-Type: - type: string - additionalText-Type: - type: string - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - header-Type: - description: Header used in notifications as notification header - type: object - properties: - uri: - $ref: '#/components/schemas/uri-Type' - notificationId: - $ref: '#/components/schemas/notificationId-Type' - notificationType: - $ref: '#/components/schemas/notificationType-Type' - eventTime: - $ref: '#/components/schemas/dateTime-Type' - notificationId-Type: - $ref: '#/components/schemas/long-Type' - notificationType-Type: + PerfNotificationTypes: type: string enum: - notifyThresholdCrossing - notifyThresholdCrossing-NotifType: - type: object - properties: - header: - $ref: '#/components/schemas/header-Type' - body: - type: object + PerfMetricValue: + oneOf: + - type: integer + - $ref: 'comDefs.yaml#/components/schemas/Float' + PerfMetricDirection: + type: string + enum: + - UP + - DOWN + NotifyThresholdCrossing: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object properties: - startOfMonitoringGP: - $ref: '#/components/schemas/dateTime-Type' - endOfMonitoringGP: - $ref: '#/components/schemas/dateTime-Type' - monitoredObjectInstance: - $ref: '#/components/schemas/uri-Type' - thresholdLevel: - $ref: '#/components/schemas/thresholdLevel-Type' - measurementTypeName: - $ref: '#/components/schemas/measurementTypeName-Type' - measurementValue: - $ref: '#/components/schemas/measurementValue-Type' + observedPerfMetricName: + type: string + observedPerfMetricValue: + $ref: '#/components/schemas/PerfMetricValue' + observedPerfMetricDirection: + $ref: '#/components/schemas/PerfMetricDirection' + thresholdValue: + $ref: '#/components/schemas/PerfMetricValue' + hysteresis: + $ref: '#/components/schemas/PerfMetricValue' + monitorGranularityPeriod: + type: integer additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string -- GitLab From da4e264489641ab606c64085ba84573313c21a11 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 07:46:09 +0000 Subject: [PATCH 242/268] Delete PerThresMonMnS.yaml --- OpenAPI/PerThresMonMnS.yaml | 76 ------------------------------------- 1 file changed, 76 deletions(-) delete mode 100755 OpenAPI/PerThresMonMnS.yaml diff --git a/OpenAPI/PerThresMonMnS.yaml b/OpenAPI/PerThresMonMnS.yaml deleted file mode 100755 index 1fd64a7d2..000000000 --- a/OpenAPI/PerThresMonMnS.yaml +++ /dev/null @@ -1,76 +0,0 @@ -openapi: 3.0.1 -info: - title: TS 28.532 Performance Threshold Monitoring MnS - version: 16.6.0 - description: >- - OAS 3.0.1 definition of the Performance Threshold Monitoring MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.532 V16.6.0; Generic management services - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ -servers: - - url: '{root}' - variables: - root: - description: >- - The open API server of the performance threshold monitoring service is - located in the consumer side, see monitoringNotifTarget attribute of - the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. - default: http://example.com/3GPPManagement -paths: - /notificationSink: - post: - summary: Send notifications about performance threshold crossing - description: To send a notifyThresholdCrossing notification - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyThresholdCrossing' - responses: - '204': - description: >- - Success case ("204 No Content"). The notification is successfully - delivered. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' -components: - schemas: - PerfNotificationTypes: - type: string - enum: - - notifyThresholdCrossing - PerfMetricValue: - oneOf: - - type: integer - - $ref: 'comDefs.yaml#/components/schemas/Float' - PerfMetricDirection: - type: string - enum: - - UP - - DOWN - NotifyThresholdCrossing: - allOf: - - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - - type: object - properties: - observedPerfMetricName: - type: string - observedPerfMetricValue: - $ref: '#/components/schemas/PerfMetricValue' - observedPerfMetricDirection: - $ref: '#/components/schemas/PerfMetricDirection' - thresholdValue: - $ref: '#/components/schemas/PerfMetricValue' - hysteresis: - $ref: '#/components/schemas/PerfMetricValue' - monitorGranularityPeriod: - type: integer - additionalText: - type: string -- GitLab From ed61f153eabfca98d598b0bbfe46c7693346a417 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 07:50:01 +0000 Subject: [PATCH 243/268] Upload perfMnS.yaml --- OpenAPI/perfMnS.yaml | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 OpenAPI/perfMnS.yaml diff --git a/OpenAPI/perfMnS.yaml b/OpenAPI/perfMnS.yaml new file mode 100644 index 000000000..1fd64a7d2 --- /dev/null +++ b/OpenAPI/perfMnS.yaml @@ -0,0 +1,76 @@ +openapi: 3.0.1 +info: + title: TS 28.532 Performance Threshold Monitoring MnS + version: 16.6.0 + description: >- + OAS 3.0.1 definition of the Performance Threshold Monitoring MnS + © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.532 V16.6.0; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ +servers: + - url: '{root}' + variables: + root: + description: >- + The open API server of the performance threshold monitoring service is + located in the consumer side, see monitoringNotifTarget attribute of + the IOC ThresholdMonitor defined in 3GPP TS 28.622 [11]. + default: http://example.com/3GPPManagement +paths: + /notificationSink: + post: + summary: Send notifications about performance threshold crossing + description: To send a notifyThresholdCrossing notification + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyThresholdCrossing' + responses: + '204': + description: >- + Success case ("204 No Content"). The notification is successfully + delivered. The response message body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' +components: + schemas: + PerfNotificationTypes: + type: string + enum: + - notifyThresholdCrossing + PerfMetricValue: + oneOf: + - type: integer + - $ref: 'comDefs.yaml#/components/schemas/Float' + PerfMetricDirection: + type: string + enum: + - UP + - DOWN + NotifyThresholdCrossing: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + observedPerfMetricName: + type: string + observedPerfMetricValue: + $ref: '#/components/schemas/PerfMetricValue' + observedPerfMetricDirection: + $ref: '#/components/schemas/PerfMetricDirection' + thresholdValue: + $ref: '#/components/schemas/PerfMetricValue' + hysteresis: + $ref: '#/components/schemas/PerfMetricValue' + monitorGranularityPeriod: + type: integer + additionalText: + type: string -- GitLab From df67f822279cc66bf22d6188cc3969c95a988090 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 07:53:21 +0000 Subject: [PATCH 244/268] upload filedatareportingMnS --- OpenAPI/fileDataReportingMnS.yaml | 229 ++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) create mode 100644 OpenAPI/fileDataReportingMnS.yaml diff --git a/OpenAPI/fileDataReportingMnS.yaml b/OpenAPI/fileDataReportingMnS.yaml new file mode 100644 index 000000000..e9f6c71b8 --- /dev/null +++ b/OpenAPI/fileDataReportingMnS.yaml @@ -0,0 +1,229 @@ +openapi: 3.0.1 +info: + title: File Data Reporting MnS + version: 16.10.0 + description: >- + OAS 3.0.1 definition of the File Data Reporting MnS + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.532; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ +servers: + - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}' + variables: + MnSRoot: + description: See clause 4.4.3 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX +paths: + /files: + get: + summary: Read information about available files + description: >- + Information about available files is read with HTTP GET. The files for + which information shall be returned are identified with the path + component (base resource) and the query component (fileDataType, beginTime, + endTime) of the URI. + parameters: + - name: fileDataType + in: query + description: >- + This parameter selects files based on the file data type. + required: true + schema: + $ref: '#/components/schemas/FileDataType' + - name: beginTime + in: query + description: >- + This parameter selects files based on the earliest time they + became available + required: false + schema: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + - name: endTime + in: query + description: >- + This parameter selects files based on the latest time they + became available + required: false + schema: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + responses: + '200': + description: >- + 'Success case ("200 OK"). + The resources identified in the request for retrieval are returned + in the response message body.' + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/FileInfo' + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + /subscriptions: + post: + summary: Create a subscription + description: >- + To create a subscription the representation of the subscription is + POSTed on the /subscriptions collection resource. + requestBody: + required: true + content: + application/json: + schema: + $ref: 'faultMnS.yaml#/components/schemas/Subscription' + responses: + '201': + description: >- + Success case ("201 Created"). + The representation of the newly created subscription resource shall + be returned. + content: + application/json: + schema: + $ref: 'faultMnS.yaml#/components/schemas/Subscription' + headers: + Location: + description: URI of the newly created subscription resource + required: true + schema: + type: string + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + callbacks: + notifyFileReady: + '{request.body#/consumerReference}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyFileReady' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + notifyFilePreparationError: + '{request.body#/consumerReference}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyFilePreparationError' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + /subscriptions/{subscriptionId}: + delete: + summary: Delete a subscription + description: >- + The subscription is deleted by deleting the corresponding subscription + resource. The resource to be deleted is identified with the path + component of the URI. + parameters: + - name: subscriptionId + in: path + description: Identifies the subscription to be deleted. + required: true + schema: + type: string + responses: + '204': + description: >- + Success case ("204 No Content"). + The subscription resource has been deleted. The response message body + is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' +components: + schemas: + FileDataType: + type: string + enum: + - Performance + - Trace + - Anatytics + - Proprietary + FileNotificationTypes: + type: string + enum: + - notifyFileReady + - notifyFilePreparationError + FileInfo: + type: object + properties: + fileLocation: + $ref: 'comDefs.yaml#/components/schemas/Uri' + fileSize: + type: integer + fileReadyTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileExpirationTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileCompression: + type: string + fileFormat: + type: string + fileDataType: + $ref: '#/components/schemas/FileDataType' + NotifyFileReady: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + fileInfoList: + type: array + items: + $ref: '#/components/schemas/FileInfo' + additionalText: + type: string + NotifyFilePreparationError: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + fileInfoList: + type: array + items: + $ref: '#/components/schemas/FileInfo' + reason: + type: string + additionalText: + type: string \ No newline at end of file -- GitLab From ea1fef4da0c60a353b92c06801879bb5645e6f4b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:00:39 +0000 Subject: [PATCH 245/268] Delete PerDataFileReportMnS.yaml --- OpenAPI/PerDataFileReportMnS.yaml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100755 OpenAPI/PerDataFileReportMnS.yaml diff --git a/OpenAPI/PerDataFileReportMnS.yaml b/OpenAPI/PerDataFileReportMnS.yaml deleted file mode 100755 index 83fd77acb..000000000 --- a/OpenAPI/PerDataFileReportMnS.yaml +++ /dev/null @@ -1,13 +0,0 @@ -openapi: 3.0.1 -info: - title: TS 28.532 File data reporting Service - version: 16.6.0 - description: >- - OAS 3.0.1 specification of the File data reporting Management Service © 2020, - 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All - rights reserved. -externalDocs: - description: 3GPP TS 28.532 V16.5.0; Generic management services - url: 'http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/' -paths: {} - -- GitLab From 01338eb9018c9ff1c9c8ad1f085978d8c49fd0db Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:01:22 +0000 Subject: [PATCH 246/268] Delete PerfDataStreamingMnS.yaml --- OpenAPI/PerfDataStreamingMnS.yaml | 363 ------------------------------ 1 file changed, 363 deletions(-) delete mode 100755 OpenAPI/PerfDataStreamingMnS.yaml diff --git a/OpenAPI/PerfDataStreamingMnS.yaml b/OpenAPI/PerfDataStreamingMnS.yaml deleted file mode 100755 index e040e14c8..000000000 --- a/OpenAPI/PerfDataStreamingMnS.yaml +++ /dev/null @@ -1,363 +0,0 @@ -openapi: 3.0.1 -info: - title: TS 28.550 Performance Data Streaming Service - version: 16.3.0 - description: OAS 3.0.1 specification of the Performance Data Streaming Service -servers: - - url: 'http://{streamTarget}/PerfDataStreamMnS/v1630' - description: This URL is used for posting the set of information about streams supported on the connection between the producer and the consumer. - variables: - streamTarget: - description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).' - default: example.com - - url: 'wss://{streamTarget}/PerfDataStreamMnS/v1630/streamingConnection' - description: This URL is used for establishing the WebSocket connection for the performance data streaming service. - variables: - streamTarget: - description: 'The open API server of the performance data streaming service is located in the consumer side,and the “streamTarget” part corresponds to the streamTarget parameter provided in the createMeasurementJob operation (see clause 6.1.1.2) or the streamTarget attribute of the MOI of MeasurementControlor MeasurementReader, see 3GPP TS 28.622 [5]).' - default: example.com -paths: - /streamInfoList: - post: - summary: The set of information about the streams sent from the producer to the consumer - description: To send the streamInfoList from the producer to the consumer - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoListPost-RequestType' - responses: - '201': - description: Success case ("201 Posted"). The streamInfoList is successfully posted. - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoListPost-ResponseType' - '202': - description: Partial success case ("202 Partially posted"). The representation of the posted resource on stream information. - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoListPost-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - get: - summary: Read resources of stream information from the streaming consumer - description: 'With HTTP GET, resources of stream information are read. The resources to be read are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be returned.' - parameters: - - name: streamIdList - in: query - description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI. - required: true - schema: - type: array - items: - type: integer - responses: - '200': - description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.' - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType' - '202': - description: Partial success case ("202 Partially retrieved"). The representation of the retrieved resources on stream information. - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - patch: - summary: Update resources of stream information to the streaming consumer - description: 'With HTTP PATCH, resources of stream information are to be updated. The resources to be updated are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be updated.' - parameters: - - name: streamIdList - in: query - description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI. - required: true - schema: - type: array - items: - type: integer - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoToUpdate-RequestType' - responses: - '200': - description: Success case ("200 OK"). The resources selected by the query parameter are updated and returned in the response message body. - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType' - '202': - description: Partial success case ("202 Partially updated"). The representation of the updated resources on stream information - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoUpdate-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - delete: - summary: The information of streams to be deleted by the producer to the consumer - description: 'With HTTP DELETE, resources of stream information are to be deleted. The resources to be deleted are identified with the path component (base resource) and the query component (streamIdList) of the URI. The fields query component allows to select the resource properties to be deleted.' - parameters: - - name: streamIdList - in: query - description: This parameter identifies the list of streamId to select from the collection resources identified with the path component of the URI. - required: true - schema: - type: array - items: - type: integer - responses: - '204': - description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - '/streamInfoList/{streamId}': - get: - summary: Read resource of the stream information from the streaming consumer - description: 'With HTTP GET, resource of stream information is read. The resource to be read is identified with the path component the URI.' - parameters: - - name: streamId - in: path - description: Identifies the stream for which the information is to be retrieved. - required: true - schema: - $ref: '#/components/schemas/uri-Type' - responses: - '200': - description: Success case ("200 OK"). The resource identified in the request for retrieval is returned in the response message body. - content: - application/json: - schema: - $ref: '#/components/schemas/listOfStreamInfoRetrieval-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - patch: - summary: Update the resource of stream information to the streaming consumer - description: 'With HTTP PATCH, resource of stream information is to be updated. The resource to be updated is identified by the path component of the URI. ' - parameters: - - name: streamId - in: path - description: Identifies the stream for which the information is to be updated. - required: true - schema: - $ref: '#/components/schemas/uri-Type' - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoToUpdate-RequestType' - responses: - '200': - description: Success case ("200 OK"). The resources identified by the path of the URI is updated and returned in the response message body. - content: - application/json: - schema: - $ref: '#/components/schemas/streamInfoUpdate-ResponseType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - delete: - summary: The stream information to be deleted by the producer to the consumer - description: 'With HTTP DELETE, resource of stream information identified by the path component of the URI is to be deleted.' - parameters: - - name: streamId - in: path - description: Identifies the stream for which the information is to be deleted - required: true - schema: - $ref: '#/components/schemas/uri-Type' - responses: - '204': - description: Success case ("204 No Content"). The stream information resource has been deleted. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - /streamConnection: - get: - summary: The connection for streaming from the producer to the consumer - description: To establish the WebSocket connection between the producer and the consumer. The HTTP version of this operation shall not be earlier than HTTP/1.1 - parameters: - - in: header - name: Upgrade - required: true - schema: - $ref: '#/components/schemas/Upgrade-HeaderType' - - in: header - name: Connection - required: true - schema: - $ref: '#/components/schemas/Connection-HeaderType' - - in: header - name: Sec-WebSocket-Key - required: true - schema: - $ref: '#/components/schemas/Sec-WebSocket-Key-HeaderType' - - in: header - name: Sec-WebSocket-Version - required: true - schema: - $ref: '#/components/schemas/Sec-WebSocket-Version-HeaderType' - responses: - '101': - description: Success case ("101 Switching Protocols "). The connection has been successfully switched to WebSocket. The response message body is absent. - headers: - Upgrade: - schema: - $ref: '#/components/schemas/Upgrade-HeaderType' - Connection: - schema: - $ref: '#/components/schemas/Connection-HeaderType' - Sec-WebSocket-Accept-HeaderType: - schema: - $ref: '#/components/schemas/Sec-WebSocket-Accept-HeaderType' - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' -components: - schemas: - uri-Type: - type: string - streamInfoIn-Type: - type: object - properties: - streamId: - type: integer - iOCInstance: - $ref: '#/components/schemas/uri-Type' - measTypes: - type: array - items: - type: string - streamInfoOut-Type: - type: object - properties: - streamId: - $ref: '#/components/schemas/uri-Type' - iOCInstance: - $ref: '#/components/schemas/uri-Type' - measTypes: - type: array - items: - type: string - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - streamInfoListPost-RequestType: - type: object - properties: - streamInfoList: - type: array - items: - $ref: '#/components/schemas/streamInfoIn-Type' - streamInfoListPost-ResponseType: - type: object - properties: - streamInfoListPosted: - type: array - items: - $ref: '#/components/schemas/streamInfoOut-Type' - streamInfoRetrieval-ResponseType: - type: object - properties: - streamInfoOut: - $ref: '#/components/schemas/streamInfoOut-Type' - listOfStreamInfoRetrieval-ResponseType: - type: object - properties: - listOfStreamInfoOut: - type: array - items: - $ref: '#/components/schemas/streamInfoOut-Type' - streamInfoToUpdatePropertyType: - type: object - properties: - iOCInstance: - description: 'The updated measured object instance, empty value means no update.' - allOf: - - $ref: '#/components/schemas/uri-Type' - measTypes: - description: 'The updated list of measurement type, empty value means no update.' - type: array - items: - type: string - streamInfoToUpdate-RequestType: - type: object - properties: - streamInfoToUpdate: - $ref: '#/components/schemas/streamInfoToUpdatePropertyType' - listOfStreamInfoToUpdate-RequestType: - type: object - properties: - listOfStreamInfoToUpdate: - type: array - items: - $ref: '#/components/schemas/streamInfoToUpdatePropertyType' - streamInfoUpdate-ResponseType: - type: object - properties: - streamInfoUpdated: - $ref: '#/components/schemas/streamInfoOut-Type' - listOfStreamInfoUpdate-ResponseType: - type: object - properties: - listOfStreamInfoUpdated: - type: array - items: - $ref: '#/components/schemas/streamInfoOut-Type' - Upgrade-HeaderType: - type: string - enum: - - websocket - Connection-HeaderType: - type: string - enum: - - Upgrade - Sec-WebSocket-Key-HeaderType: - type: string - Sec-WebSocket-Version-HeaderType: - type: string - Sec-WebSocket-Accept-HeaderType: - type: string -- GitLab From 47a36e52c391bf5edb2c56e762e755b44dbe478f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:02:37 +0000 Subject: [PATCH 247/268] Update PerMeasJobCtlMnS.yaml to align with latest R16 PerMeasJobCtlMnS.yaml --- OpenAPI/PerMeasJobCtlMnS.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/OpenAPI/PerMeasJobCtlMnS.yaml b/OpenAPI/PerMeasJobCtlMnS.yaml index b6abe58b2..50fea5a73 100755 --- a/OpenAPI/PerMeasJobCtlMnS.yaml +++ b/OpenAPI/PerMeasJobCtlMnS.yaml @@ -1,26 +1,23 @@ openapi: 3.0.1 info: title: TS 28.550 Performance Measurement Job Control Service - version: 16.5.0 + version: 16.8.0 description: >- OAS 3.0.1 specification of the Performance Measurement Job Control Service @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.550 V16.5.0; Performance assurance + description: 3GPP TS 28.550 V16.8.0; Performance assurance url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.550/ servers: - - url: 'http://{URI-DN-prefix}/{root}/PerfMeasJobCtrlMnS/v1650/{LDN-first-part}' + - url: '{MnSRoot}/PerfMeasJobCtrlMnS/{MnSVersion}' variables: - URI-DN-prefix: - description: See subclause 4.4 of TS 32.158 - default: example.com - root: - description: See subclause 4.4 of TS 32.158 - default: 3GPPManagement - LDN-first-part: - description: See subclause 4.4 of TS 32.158 - default: '' + MnSRoot: + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX paths: /measJobs: post: -- GitLab From bd4ca71ebfe8a650d31f8e177792cd608ec3db70 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:05:02 +0000 Subject: [PATCH 248/268] Update faultMnS.yaml to the latest R16 faultMnS.yaml --- OpenAPI/faultMnS.yaml | 254 ++++++++++++++---------------------------- 1 file changed, 84 insertions(+), 170 deletions(-) diff --git a/OpenAPI/faultMnS.yaml b/OpenAPI/faultMnS.yaml index 499123b90..203b424b9 100755 --- a/OpenAPI/faultMnS.yaml +++ b/OpenAPI/faultMnS.yaml @@ -1,22 +1,22 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 16.4.0 + version: 16.10.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.4.0; Generic management services + description: 3GPP TS 28.532; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: '{MnSRoot}/FaultSupervisionMnS/{version}' + - url: '{MnSRoot}/FaultSupervisionMnS/{MnSversion}' variables: MnSRoot: description: See subclause 4.4.3 of TS 32.158 default: http://example.com/3GPPManagement - version: - description: Versi on number of the OpenAPI definition + MnSversion: + description: Version number of the OpenAPI definition default: XXX paths: /alarms: @@ -35,12 +35,12 @@ paths: in: query required: false schema: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - name: filter in: query required: false schema: - $ref: '#/components/schemas/Filter' + $ref: 'comDefs.yaml#/components/schemas/Filter' responses: '200': description: >- @@ -57,7 +57,7 @@ paths: - type: object properties: lastNotificationHeader: - $ref: '#/components/schemas/NotificationHeader' + $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - $ref: '#/components/schemas/AlarmRecord' - type: object properties: @@ -68,7 +68,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' patch: summary: 'Clear, acknowledge or unacknowledge multiple alarms' description: >- @@ -130,7 +130,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /alarms/{alarmId}: patch: summary: 'Clear, acknowledge or unacknowledge a single alarm' @@ -163,7 +163,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /alarms/{alarmId}/comments: post: summary: Add a comment to a single alarm @@ -203,7 +203,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /subscriptions: post: @@ -238,7 +238,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' callbacks: notifyNewAlarm: '{request.body#/consumerReference}': @@ -262,7 +262,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyClearedAlarm: '{request.body#/consumerReference}': post: @@ -283,7 +283,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyChangedAlarm: '{request.body#/consumerReference}': post: @@ -304,7 +304,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyChangedAlarmGeneral: '{request.body#/consumerReference}': post: @@ -327,7 +327,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyCorrelatedNotificationChanged: '{request.body#/consumerReference}': post: @@ -348,7 +348,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyAckStateChanged: '{request.body#/consumerReference}': post: @@ -369,7 +369,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyComments: '{request.body#/consumerReference}': post: @@ -390,7 +390,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyPotentialFaultyAlarmList: '{request.body#/consumerReference}': post: @@ -411,7 +411,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyAlarmListRebuilt: '{request.body#/consumerReference}': post: @@ -432,7 +432,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /subscriptions/{subscriptionId}: delete: summary: Delete a subscription @@ -458,91 +458,10 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ErrorResponse' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - - #---- Definitions to be moved to comDefs.yaml --------------------------------------# - - Long: - type: string - format: long - Float: - type: string - format: float - DateTime: - type: string - format: date-Time - - Dn: - type: string - Uri: - type: string - - AttributeNameValuePairSet: - type: object - minProperties: 1 - AttributeValueChangeSet: - description: >- - The key in this map is the attribute name. The value of each key is an array. - When only one item is present in the array, it carries the new attribute - value. If two items are present, then the first item carries the old value - and the second item the new value. The items can be of any type including null. - type: object - additionalProperties: - type: array - minItems: 1 - maxItems: 2 - items: - nullable: true - - Filter: - type: string - SystemDN: - type: string - - NotificationId: - type: integer - NotificationHeader: - description: >- - Header used for all notification types - type: object - required: - - href - - notificationId - - notificationType - - eventTime - - systemDN - properties: - uri: - $ref: '#/components/schemas/Uri' - notificationId: - $ref: '#/components/schemas/NotificationId' - notificationType: - oneOf: - - $ref: '#/components/schemas/AlarmNotificationTypes' - #- $ref: 'faultMnS.yaml#/components/schemas/AlarmNotificationTypes' - #- $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' - # more to be added - eventTime: - $ref: '#/components/schemas/DateTime' - systemDN: - $ref: '#/components/schemas/SystemDN' - - ErrorResponse: - description: >- - Default schema for the response message body in case the request is not - successful. - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - - #---- End of definitions to be moved to comDefs.yaml -------------------------------# #---- Definition of AlarmRecord ----------------------------------------------------# @@ -608,46 +527,47 @@ components: high: oneOf: - type: integer - - $ref: '#/components/schemas/Float' + - $ref: 'comDefs.yaml#/components/schemas/Float' low: - $ref: '#/components/schemas/Float' + $ref: 'comDefs.yaml#/components/schemas/Float' ThresholdLevelInd: - type: object - required: - - up - properties: - up: - $ref: '#/components/schemas/ThresholdHysteresis' - low: - $ref: '#/components/schemas/ThresholdHysteresis' + oneOf: + - type: object + properties: + up: + $ref: '#/components/schemas/ThresholdHysteresis' + - type: object + properties: + down: + $ref: '#/components/schemas/ThresholdHysteresis' ThresholdInfo: type: object - required: - - observedMeasurement - - observedValue properties: observedMeasurement: type: string observedValue: oneOf: - type: integer - - $ref: '#/components/schemas/Float' - thresholdLevelInd: + - $ref: 'comDefs.yaml#/components/schemas/Float' + thresholdLevel: $ref: '#/components/schemas/ThresholdLevelInd' armTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' + required: + - observedMeasurement + - observedValue CorrelatedNotification: type: object - required: - - source - - notificationId properties: sourceObjectInstance: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' notificationIds: type: array items: - $ref: '#/components/schemas/NotificationId' + $ref: 'comDefs.yaml#/components/schemas/NotificationId' + required: + - sourceObjectInstance + - notificationIds CorrelatedNotifications: type: array items: @@ -667,15 +587,15 @@ components: # alarmId: # $ref: '#/components/schemas/AlarmId' objectInstance: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' notificationId: - $ref: '#/components/schemas/NotificationId' + $ref: 'comDefs.yaml#/components/schemas/NotificationId' alarmRaisedTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmChangedTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmClearedTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' alarmType: $ref: '#/components/schemas/AlarmType' probableCause: @@ -687,7 +607,7 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: @@ -695,21 +615,21 @@ components: correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: - $ref: '#/components/schemas/AttributeValueChangeSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean ackTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' ackUserId: type: string ackSystemId: @@ -740,7 +660,7 @@ components: - notifyCorrelatedNotificationChanged - notifyComments - notifyClearedAlarm - - notifyAlarmListRebuiltAlarm + - notifyAlarmListRebuilt - notifyPotentialFaultyAlarmList AlarmListAlignmentRequirement: type: string @@ -750,7 +670,7 @@ components: NotifyNewAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -771,7 +691,7 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: @@ -779,20 +699,20 @@ components: correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: - $ref: '#/components/schemas/AttributeValueChangeSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean NotifyNewSecAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -816,7 +736,7 @@ components: additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean serviceUser: @@ -827,7 +747,7 @@ components: type: string NotifyClearedAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -851,7 +771,7 @@ components: type: string NotifyChangedAlarm: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -869,14 +789,11 @@ components: $ref: '#/components/schemas/PerceivedSeverity' NotifyChangedAlarmGeneral: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId - alarmType - - probableCause - - perceivedSeverity - - changedAlarmAttributes properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -893,38 +810,35 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: '#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: $ref: '#/components/schemas/ThresholdInfo' stateChangeDefinition: - $ref: '#/components/schemas/AttributeValueChangeSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean changedAlarmAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' NotifyChangedSecAlarmGeneral: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId - alarmType - - probableCause - - perceivedSeverity - serviceUser - serviceProvider - securityAlarmDetector - - changedAlarmAttributes properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -939,7 +853,7 @@ components: additionalText: type: string additionalInformation: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' rootCauseIndicator: type: boolean serviceUser: @@ -949,10 +863,10 @@ components: securityAlarmDetector: type: string changedAlarmAttributes: - $ref: '#/components/schemas/AttributeNameValuePairSet' + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' NotifyCorrelatedNotificationChanged: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -966,7 +880,7 @@ components: type: boolean NotifyAckStateChanged: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -992,7 +906,7 @@ components: type: string NotifyComments: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - alarmId @@ -1013,7 +927,7 @@ components: $ref: '#/components/schemas/Comments' NotifyPotentialFaultyAlarmList: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - reason @@ -1022,7 +936,7 @@ components: type: string NotifyAlarmListRebuilt: allOf: - - $ref: '#/components/schemas/NotificationHeader' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object required: - reason @@ -1119,7 +1033,7 @@ components: type: object properties: commentTime: - $ref: '#/components/schemas/DateTime' + $ref: 'comDefs.yaml#/components/schemas/DateTime' commentUserId: type: string commentSystemId: @@ -1137,8 +1051,8 @@ components: type: object properties: consumerReference: - $ref: '#/components/schemas/Uri' + $ref: 'comDefs.yaml#/components/schemas/Uri' timeTick: - $ref: '#/components/schemas/Long' + type: integer filter: - $ref: '#/components/schemas/Filter' + $ref: 'comDefs.yaml#/components/schemas/Filter' -- GitLab From 7a1379b2518e2fd9c502e6eedcc042f97c2f82fc Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:06:30 +0000 Subject: [PATCH 249/268] Update heartbeatNtf.yaml to latest R16 heartbeatNtf.yaml --- OpenAPI/heartbeatNtf.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/OpenAPI/heartbeatNtf.yaml b/OpenAPI/heartbeatNtf.yaml index afde5066d..efa3185bd 100755 --- a/OpenAPI/heartbeatNtf.yaml +++ b/OpenAPI/heartbeatNtf.yaml @@ -1,23 +1,25 @@ openapi: 3.0.1 info: title: Heartbeat notification - version: 16.3.0 + version: 16.6.0 description: >- - OAS 3.0.1 specification of the heartbeat notification + OAS 3.0.1 definition of the heartbeat notification © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.3.0; Heartbeat notification + description: 3GPP TS 28.532 V16.6.0; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.6532/ paths: {} components: schemas: - hearbeatNtfPeriod-Type: - type: integer - notifyHeartbeat-NotifType: + HeartbeatNotificationTypes: + type: string + enum: + - notifyHeartbeat + NotifyHeartbeat: allOf: - - $ref: 'provMnS.yaml#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: heartbeatNtfPeriod: - $ref: '#/components/schemas/hearbeatNtfPeriod-Type' + type: integer -- GitLab From 4d50a45f258bab21f62df92920f9ff57a11c5958 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:12:28 +0000 Subject: [PATCH 250/268] Update provMnS.yaml to latest R16 provMnS.yaml --- OpenAPI/provMnS.yaml | 303 ++++++++++++++++--------------------------- 1 file changed, 112 insertions(+), 191 deletions(-) diff --git a/OpenAPI/provMnS.yaml b/OpenAPI/provMnS.yaml index b2f84a4d2..1dd467e16 100755 --- a/OpenAPI/provMnS.yaml +++ b/OpenAPI/provMnS.yaml @@ -1,25 +1,25 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 16.4.0 + version: 16.5.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.4.0; Generic management services + description: 3GPP TS 28.532; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: 'http://{URI-DN-prefix}/{root}/ProvMnS/v1640/{LDN-first-part}' + - url: '{MnSRoot}/ProvMnS/{MnSVersion}/{URI-LDN-first-part}' variables: - URI-DN-prefix: - description: See subclause 4.4 of TS 32.158 - default: example.com - root: - description: See subclause 4.4 of TS 32.158 - default: 3GPPManagement - LDN-first-part: - description: See subclause 4.4 of TS 32.158 + MnSRoot: + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX + URI-LDN-first-part: + description: See clause 4.4.2 of TS 32.158 default: '' paths: '/{className}={id}': @@ -28,12 +28,12 @@ paths: in: path required: true schema: - $ref: '#/components/schemas/className-PathType' + type: string - name: id in: path required: true schema: - $ref: '#/components/schemas/id-PathType' + type: string put: summary: Replaces a complete single resource or creates it if it does not exist description: >- @@ -44,7 +44,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourcePut-RequestType' + $ref: '#/components/schemas/Resource' responses: '200': description: >- @@ -60,7 +60,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceUpdate-ResponseType' + $ref: '#/components/schemas/Resource' '201': description: >- Success case ("201 Created"). @@ -70,7 +70,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceCreation-ResponseType' + $ref: '#/components/schemas/Resource' '204': description: >- Success case ("204 No Content"). @@ -82,7 +82,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' callbacks: notifyMOICreation: '{request.body#/notificationRecipientAddress}': @@ -92,7 +92,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOICreation-NotifType' + $ref: '#/components/schemas/NotifyMoiCreation' responses: '204': description: >- @@ -104,7 +104,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyMOIDeletion: '{request.body#/notificationRecipientAddress}': post: @@ -113,7 +113,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOIDeletion-NotifType' + $ref: '#/components/schemas/NotifyMoiDeletion' responses: '204': description: >- @@ -125,8 +125,8 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' - notifyMOIAttributeValueChange: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + notifyMOIAttributeValueChanges: '{request.body#/notificationRecipientAddress}': post: requestBody: @@ -134,7 +134,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOIAttributeValueChange-NotifType' + $ref: '#/components/schemas/NotifyMoiAttributeValueChanges' responses: '204': description: >- @@ -146,7 +146,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyMOIChanges: '{request.body#/notificationRecipientAddress}': post: @@ -155,7 +155,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyMOIChanges-NotifType' + $ref: '#/components/schemas/NotifyMoiChanges' responses: '204': description: >- @@ -167,7 +167,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' get: summary: Reads one or multiple resources description: >- @@ -183,7 +183,7 @@ paths: mechanism is specified in the present document. required: false schema: - $ref: '#/components/schemas/scope-QueryType' + $ref: '#/components/schemas/Scope' style: form explode: true - name: filter @@ -196,7 +196,7 @@ paths: document. required: false schema: - $ref: '#/components/schemas/filter-QueryType' + $ref: 'comDefs.yaml#/components/schemas/Filter' - name: attributes in: query description: >- @@ -204,7 +204,9 @@ paths: are returned. required: true schema: - $ref: '#/components/schemas/attributes-QueryType' + type: array + items: + type: string style: form explode: false - name: fields @@ -214,7 +216,9 @@ paths: that are returned. required: false schema: - $ref: '#/components/schemas/fields-QueryType' + type: array + items: + type: string style: form explode: false responses: @@ -229,13 +233,13 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceRetrieval-ResponseType' + $ref: '#/components/schemas/Resource' default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' patch: summary: Patches one or multiple resources description: >- @@ -254,16 +258,20 @@ paths: content: application/merge-patch+json: schema: - $ref: '#/components/schemas/jsonMergePatch-RequestType' + $ref: '#/components/schemas/Resource' application/3gpp-merge-patch+json: schema: - $ref: '#/components/schemas/3gppJsonMergePatch-RequestType' + $ref: '#/components/schemas/Resource' application/json-patch+json: schema: - $ref: '#/components/schemas/jsonPatch-RequestType' + type: array + items: + type: object application/3gpp-json-patch+json: schema: - $ref: '#/components/schemas/3gppJsonPatch-RequestType' + type: array + items: + type: object responses: '200': description: >- @@ -276,7 +284,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceUpdate-ResponseType' + $ref: '#/components/schemas/Resource' '204': description: >- Success case ("204 No Content"). @@ -288,7 +296,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' delete: summary: Deletes one or multiple resources description: >- @@ -303,7 +311,9 @@ paths: mechanism is specified in the present document. required: false schema: - $ref: '#/components/schemas/scope-QueryType' + $ref: '#/components/schemas/Scope' + style: form + explode: true - name: filter in: query description: >- @@ -314,7 +324,7 @@ paths: document. required: false schema: - $ref: '#/components/schemas/filter-QueryType' + $ref: 'comDefs.yaml#/components/schemas/Filter' responses: '200': description: >- @@ -331,136 +341,66 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/resourceDeletion-ResponseType' + type: array + items: + $ref: 'comDefs.yaml#/components/schemas/Uri' default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - dateTime-Type: - type: string - format: date-time - long-Type: - type: integer - format: int64 - uri-Type: - type: string - correlatedNotification-Type: + CorrelatedNotification: type: object properties: source: - $ref: '#/components/schemas/uri-Type' + $ref: 'comDefs.yaml#/components/schemas/Dn' notificationIds: type: array items: - $ref: '#/components/schemas/notificationId-Type' - notificationId-Type: - $ref: '#/components/schemas/long-Type' - notificationType-Type: + $ref: 'comDefs.yaml#/components/schemas/NotificationId' + required: + - source + - notificationIds + CmNotificationTypes: type: string enum: - notifyMOICreation - notifyMOIDeletion - - notifyMOIAttributeValueChange - systemDN-Type: + - notifyMOIAttributeValueChanges + - notifyMOIChanges + SourceIndicator: type: string - additionalText-Type: - type: string - sourceIndicator-Type: + enum: + - RESOURCE_OPERATION + - MANAGEMENT_OPERATION + - SON_OPERATION + - UNKNOWN + Operation: type: string enum: - - resourceOperation - - mangementOperation - - sONOperation - - unknown - header-Type: - type: object - properties: - href: - $ref: '#/components/schemas/uri-Type' - notificationId: - $ref: '#/components/schemas/notificationId-Type' - notificationType: - $ref: '#/components/schemas/notificationType-Type' - eventTime: - $ref: '#/components/schemas/dateTime-Type' - systemDN: - $ref: '#/components/schemas/systemDN-Type' - required: - - href - - notificationId - - notificationType - - eventTime - - systemDN - scopeType-Type: + - CREATE + - DELETE + - REPLACE + ScopeType: type: string enum: - BASE_ONLY - BASE_NTH_LEVEL - BASE_SUBTREE - BASE_ALL - scopeLevel-Type: - type: integer - className-PathType: - type: string - id-PathType: - type: string - attributes-QueryType: - type: array - items: - type: string - fields-QueryType: - type: array - items: - type: string - filter-QueryType: - type: string - scope-QueryType: + Scope: type: object properties: scopeType: - $ref: '#/components/schemas/scopeType-Type' + $ref: '#/components/schemas/ScopeType' scopeLevel: - $ref: '#/components/schemas/scopeLevel-Type' + type: integer - resourcePut-RequestType: - $ref: '#/components/schemas/resourceRepresentation-Type' - jsonMergePatch-RequestType: - $ref: '#/components/schemas/resourceRepresentation-Type' - 3gppJsonMergePatch-RequestType: - $ref: '#/components/schemas/resourceRepresentation-Type' - jsonPatch-RequestType: - type: array - items: - type: object - 3gppJsonPatch-RequestType: - type: array - items: - type: object - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - resourceRetrieval-ResponseType: - $ref: '#/components/schemas/resourceRepresentation-Type' - resourceCreation-ResponseType: - $ref: '#/components/schemas/resourceRepresentation-Type' - resourceUpdate-ResponseType: - $ref: '#/components/schemas/resourceRepresentation-Type' - resourceDeletion-ResponseType: - type: array - items: - $ref: '#/components/schemas/uri-Type' - - resourceRepresentation-Type: + Resource: oneOf: - type: object properties: @@ -478,102 +418,83 @@ components: - $ref: '5gcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'sliceNrm.yaml#/components/schemas/resources-sliceNrm' - mOIChange-Type: + MoiChange: type: object properties: notificationId: - $ref: '#/components/schemas/notificationId-Type' + $ref: 'comDefs.yaml#/components/schemas/NotificationId' correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' + $ref: '#/components/schemas/SourceIndicator' path: - $ref: '#/components/schemas/uri-Type' + $ref: 'comDefs.yaml#/components/schemas/Uri' operation: - type: string - enum: - - CREATE - - DELETE - - REPLACE + $ref: '#/components/schemas/Operation' value: oneOf: - - type: object - additionalProperties: - nullable: true - - type: array - items: - type: object - minItems: 1 - maxItems: 2 + - $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' + - $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' - notifyMOICreation-NotifType: + NotifyMoiCreation: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' + $ref: '#/components/schemas/SourceIndicator' attributeList: - type: object - additionalProperties: - nullable: true - notifyMOIDeletion-NotifType: + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' + NotifyMoiDeletion: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' + $ref: '#/components/schemas/SourceIndicator' attributeList: - type: object - additionalProperties: true - notifyMOIAttributeValueChange-NotifType: + $ref: 'comDefs.yaml#/components/schemas/AttributeNameValuePairSet' + NotifyMoiAttributeValueChanges: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: correlatedNotifications: type: array items: - $ref: '#/components/schemas/correlatedNotification-Type' + $ref: '#/components/schemas/CorrelatedNotification' additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string sourceIndicator: - $ref: '#/components/schemas/sourceIndicator-Type' - attributeValueChange: - type: object - additionalProperties: - type: array - minItems: 1 - maxItems: 2 - items: - nullable: true + $ref: '#/components/schemas/SourceIndicator' + attributeListValueChanges: + $ref: 'comDefs.yaml#/components/schemas/AttributeValueChangeSet' required: - - attributeValueChange - notifyMOIChanges-NotifType: + - attributeListValueChanges + NotifyMoiChanges: allOf: - - $ref: '#/components/schemas/header-Type' + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - type: object properties: - mOIChanges: + moiChanges: type: array items: - $ref: '#/components/schemas/mOIChange-Type' + $ref: '#/components/schemas/MoiChange' required: - - mOIChanges + - moiChanges -- GitLab From ba9bf2f4281add5b841be059e29c6bced4cf5f90 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:14:21 +0000 Subject: [PATCH 251/268] Update streamingDataMnS.yaml to latest R16 streamingDataMnS.yaml --- OpenAPI/streamingDataMnS.yaml | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/OpenAPI/streamingDataMnS.yaml b/OpenAPI/streamingDataMnS.yaml index ab7f71d4a..abbf1271f 100755 --- a/OpenAPI/streamingDataMnS.yaml +++ b/OpenAPI/streamingDataMnS.yaml @@ -1,24 +1,17 @@ openapi: 3.0.1 info: title: TS 28.532 Streaming data reporting service - version: 16.4.0 + version: 16.10.0 description: OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS) servers: - - url: '{protocol}://{root}/StreamingDataReportingMnS/{version}' + - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}' variables: - protocol: - description: Protocol used - enum: - - http - - https - - wss - default: https - root: - description: Indicates the host name and optional port, and an optional sequence of path segments that together represent a prefix path. - default: example.com - version: - description: Indicates the current version of the specification - default: 16.4.0 + MnSRoot: + description: See clause 4.4.3 of TS 32.158. + default: https://example.com/3GPPManagement + MnSVersion: + description: See clause 4.4.3 of TS 32.158. + default: '' paths: '/connections': post: @@ -329,8 +322,8 @@ components: description: DN of the measured object instance (see 3GPP TS 28.550) allOf: - $ref: '#/components/schemas/systemDN-Type' - measTypes-Type: - description: an ordered list of measurement type or KPI whose measurement values or KPI result values are to be reported by the Performance Data Stream Units (see Annex C of TS 28.550) via this stream + performanceMetrics-Type: + description: an ordered list of performance metric names (see clause 4.4.1 of 3GPP TS 28.622[11]) whose values are to be reported by the Performance Data Stream Units (see Annex C of TS 28.550 [42]) via this stream. Performance metrics include measurement and KPI type: array items: type: string @@ -340,15 +333,13 @@ components: properties: measObjDn: $ref: '#/components/schemas/measObjDn-Type' - measTypes: - $ref: '#/components/schemas/measTypes-Type' - measurementReaderId: - $ref: '#/components/schemas/systemDN-Type' + performanceMetrics: + $ref: '#/components/schemas/performanceMetrics-Type' jobId: type: string required: - measObjDn - - measTypes + - performanceMetrics producerId-Type: description: DN of the streaming data reporting MnS producer. allOf: -- GitLab From a0c4d95ebeba6edb0978a48d7a69f7969013419b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:27:16 +0000 Subject: [PATCH 252/268] Update 5gcNrm.yaml to adress validation issues --- OpenAPI/5gcNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 4037d7e17..6cdeca626 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -41,11 +41,11 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' ipv6Prefix: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Prefix' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Prefix' transport: $ref: 'genericNrm.yaml#/components/schemas/TransportProtocol' port: -- GitLab From 473d1f5cb911f84bff7265cdc55221f47181b7a8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:33:53 +0000 Subject: [PATCH 253/268] Update coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index e6a0ef13a..908756fa5 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -112,9 +112,9 @@ components: type: object properties: operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' AssuranceGoal: @@ -165,4 +165,4 @@ components: - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' \ No newline at end of file + - $ref: '#/components/schemas/ManagedElement-Single' -- GitLab From b3000f498d583b02d7790d5f7fe2fe4fb0bf732a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:36:23 +0000 Subject: [PATCH 254/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 89806d2d2..ffdb25254 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -55,7 +55,7 @@ components: type: object properties: mcc: - $ref: 'genericNrm.yaml#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: $ref: '#/components/schemas/Mnc' PlmnIdList: @@ -77,7 +77,7 @@ components: type: object properties: mcc: - $ref: 'genericNrm.yaml#/components/schemas/Mcc' + $ref: 'comDefs.yaml#/components/schemas/Mcc' mnc: $ref: '#/components/schemas/Mnc' nid: -- GitLab From db769356653f684b62b44d7de0887a6f2b9b1d81 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:40:13 +0000 Subject: [PATCH 255/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 6cdeca626..8d57a1747 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -71,9 +71,9 @@ components: sNssais: $ref: 'nrNrm.yaml#/components/schemas/Snssai' fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' nfServices: type: array items: @@ -91,9 +91,9 @@ components: schema: type: string fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' ipEndPoints: type: array items: @@ -1134,7 +1134,7 @@ components: sEPPId: type: integer fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1346,7 +1346,7 @@ components: sEPPId: type: integer fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' EP_N2-Single: -- GitLab From f0b4acd936eaaaef3f34e29586c143f1dea63483 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:43:43 +0000 Subject: [PATCH 256/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 8d57a1747..407b07aa6 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -205,7 +205,7 @@ components: authzInfo: type: string hostAddr: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' allowedPLMNs: type: array items: @@ -1176,7 +1176,7 @@ components: supportedFuncList: $ref: '#/components/schemas/SupportedFuncList' address: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NefFunction-Single: allOf: @@ -1677,7 +1677,7 @@ components: remotePlmnId: $ref: 'nrNrm.yaml#/components/schemas/PlmnId' remoteSeppAddress: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' remoteSeppId: type: integer n32cParas: -- GitLab From e54bd5c00ae6bc58ca5dbf6cbbbcfb2f9f0468f6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:47:38 +0000 Subject: [PATCH 257/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index ffdb25254..2b80f32e7 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -328,9 +328,9 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' vlanId: type: integer minimum: 0 @@ -348,9 +348,9 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' CellIndividualOffset: type: object @@ -612,8 +612,8 @@ components: properties: TceIPAddress: oneOf: - - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' TceID: type: integer PlmnTarget: -- GitLab From f0154b13e0721a8f393c15f17fa3f95f46629d2c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:51:17 +0000 Subject: [PATCH 258/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 407b07aa6..8dfd43d8c 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -283,7 +283,7 @@ components: commModelType: $ref: '#/components/schemas/CommModelType' targetNFServiceList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' commModelConfiguration: type: string CommModelList: @@ -311,7 +311,7 @@ components: cNSIId: $ref: '#/components/schemas/CNSIId' networkSliceRef: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' NetworkSliceInfoList: type: array items: @@ -727,7 +727,7 @@ components: aMFRegionRef: $ref: 'genericNrm.yaml#/components/schemas/Dn' aMFSetMemberList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' AmfRegion-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -747,7 +747,7 @@ components: snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' aMFSetListRef: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' SmfFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1378,7 +1378,7 @@ components: remoteAddress: $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' EP_N4-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' -- GitLab From f7a9903e13daddf9dd7f61fea8547517ca86a844 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 08:56:53 +0000 Subject: [PATCH 259/268] 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 8dfd43d8c..56398fb76 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -496,7 +496,7 @@ components: plmnInfo: $ref: 'nrNrm.yaml#/components/schemas/PlmnInfo' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' NsacfInfoSnssai: type: object -- GitLab From 18cecab674523494ba250d843369799d11175f08 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:02:12 +0000 Subject: [PATCH 260/268] Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index 56398fb76..083fdb3c9 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -725,7 +725,7 @@ components: snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' aMFRegionRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' aMFSetMemberList: $ref: 'comDefs.yaml#/components/schemas/DnList' AmfRegion-Single: @@ -771,9 +771,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -874,9 +874,9 @@ components: commModelList: $ref: '#/components/schemas/CommModelList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' -- GitLab From 31ccad737374657092e4391485c71158eb5e5729 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:06:16 +0000 Subject: [PATCH 261/268] 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 083fdb3c9..fa13969c5 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -674,7 +674,7 @@ components: snssaiList: $ref: 'nrNrm.yaml#/components/schemas/SnssaiList' amfSetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: -- GitLab From 92b8c390315d1e283d487f3cd954bc22052432b3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:09:03 +0000 Subject: [PATCH 262/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 2b80f32e7..fdf2efed3 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -932,9 +932,9 @@ components: - type: object properties: administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' cellLocalId: type: integer cellState: -- GitLab From 401abce8233e46e7f5d39e4880338c33ae354c4d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:13:59 +0000 Subject: [PATCH 263/268] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index fdf2efed3..d6f8e2034 100755 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -795,9 +795,9 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -848,9 +848,9 @@ components: tceMappingInfoList: $ref: '#/components/schemas/TceMappingInfoList' configurable5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' dCHOControl: type: boolean dDAPSHOControl: @@ -896,7 +896,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -976,11 +976,11 @@ components: nrSectorCarrierRef: type: array items: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' bwpRef: type: array items: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' rimRSMonitoringStartTime: type: string rimRSMonitoringStopTime: @@ -996,11 +996,11 @@ components: rimRSMonitoringOccasionStartingOffset: type: integer nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' victimSetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' aggressorSetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1081,7 +1081,7 @@ components: bSChannelBwUL: type: integer sectorEquipmentFunctionRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1190,9 +1190,9 @@ components: cellIndividualOffset: $ref: '#/components/schemas/CellIndividualOffset' adjacentNRCellRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' nRFreqRelationRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' isRemoveAllowed: type: boolean isHOAllowed: @@ -1214,7 +1214,7 @@ components: - type: object properties: adjacentEUtranCellRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NRFreqRelation-Single: allOf: @@ -1278,7 +1278,7 @@ components: tReselectionNRSfMedium: $ref: '#/components/schemas/TReselectionNRSf' nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' EUtranFreqRelation-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1341,7 +1341,7 @@ components: tReselectionNRSfMedium: $ref: '#/components/schemas/TReselectionNRSf' eUTranFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' DANRManagementFunction-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -1528,7 +1528,7 @@ components: setType: $ref: '#/components/schemas/RSSetType' nRCellDURefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' ExternalGnbDuFunction-Single: allOf: @@ -1619,7 +1619,7 @@ components: plmnIdList: $ref: '#/components/schemas/PlmnIdList' nRFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' ExternalENBFunction-Single: allOf: @@ -1649,7 +1649,7 @@ components: - type: object properties: EUtranFrequencyRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' EP_XnC-Single: @@ -1751,7 +1751,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' EP_NgU-Single: allOf: @@ -1768,7 +1768,7 @@ components: remoteAddress: $ref: '#/components/schemas/RemoteAddress' epTransportRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' EP_X2U-Single: allOf: -- GitLab From e8181796aaf87c8835b911b82f3c2674496f5f77 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:22:54 +0000 Subject: [PATCH 264/268] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 4989e8759..82f62abfa 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -537,8 +537,8 @@ components: IpAddress: oneOf: - - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' LogicInterfaceInfo: type: object -- GitLab From 1ab333b4ae84c3af2ce83ce59545f10eb035b602 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 13 Jan 2022 09:32:18 +0000 Subject: [PATCH 265/268] Update sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 82f62abfa..935b47cd8 100755 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -593,11 +593,11 @@ components: - type: object properties: networkSliceSubnetRef: - $ref: 'genericNrm.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' @@ -611,19 +611,19 @@ components: - type: object properties: managedFunctionRefList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' networkSliceSubnetRefList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' operationalState: - $ref: 'genericNrm.yaml#/components/schemas/OperationalState' + $ref: 'comDefs.yaml#/components/schemas/OperationalState' administrativeState: - $ref: 'genericNrm.yaml#/components/schemas/AdministrativeState' + $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' nsInfo: $ref: '#/components/schemas/NsInfo' sliceProfileList: $ref: '#/components/schemas/SliceProfileList' epTransportRefList: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' priorityLabel: type: integer networkSliceSubnetType: @@ -650,7 +650,7 @@ components: qosProfile: type: string epApplicationRefs: - $ref: 'genericNrm.yaml#/components/schemas/DnList' + $ref: 'comDefs.yaml#/components/schemas/DnList' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: -- GitLab From 31c9b0a947174d023e0262f7d0a85c5792a77427 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 22 Jan 2022 02:01:19 +0000 Subject: [PATCH 266/268] Update the version to 17.0.0 --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index fd690eb91..7d4778a6f 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.9.0 + version: 17.0.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 97671bf4c40b2104aa0ff00a73891fb197c41911 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 22 Jan 2022 02:02:29 +0000 Subject: [PATCH 267/268] Update the version to 17.0.0 --- OpenAPI/comDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index f9d90b78f..d16f02ac3 100755 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 16.8.0 + version: 17.0.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 71b4fec657bcb9e0b5bed90dcf4c58732fb4c113 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 26 Jan 2022 07:47:18 +0000 Subject: [PATCH 268/268] fix manual merge issue Update 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index a3a73ffa2..91383acfe 100755 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -562,29 +562,6 @@ components: type: array items: type: string - - TaiRange: - type: object - properties: - plmnId: - $ref: 'nrNrm.yaml#/components/schemas/PlmnId' - nRTACRangelist: - type: array - items: - $ref: '#/components/schemas/NRTACRange' - - ECSAddrConfigInfo: - type: array - items: - type: string - - GUAMInfo: - type: object - properties: - pLMNId: - $ref: 'nrNrm.yaml#/components/schemas/PlmnId' - aMFIdentifier: - type: integer #-------- Definition of concrete IOCs -------------------------------------------- -- GitLab