From 7abf2a55541f025474735c18a95c05a2fc534094 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 11:38:43 +0000 Subject: [PATCH 01/30] TS28.623_Rel18_CR0245 Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 67 +++++++++++++++++---------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index b0d7caec8..e5d16a194 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1774,13 +1774,6 @@ components: TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' - MnsRegistry-Single: - type: object - properties: - MnsInfo: - $ref: '#/components/schemas/MnsInfo-Multiple' - - #-------- Definition of concrete IOCs -------------------------------------------- VsDataContainer-Single: @@ -2077,32 +2070,42 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' jobId: type: string + MnsRegistry-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + MnsInfo: + $ref: '#/components/schemas/MnsInfo-Multiple' + 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: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - mnsScope: - description: >- - List of the managed object instances that can be accessed using the MnS. - If a complete SubNetwork can be accessed using the MnS, this attribute may contain the - DN of the SubNetwork instead of the DNs of the individual managed entities within the - SubNetwork. - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + allOf: + - $ref: '#/components/schemas/Top' + - 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: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + mnsScope: + description: >- + List of the managed object instances that can be accessed using the MnS. + If a complete SubNetwork can be accessed using the MnS, this attribute may + contain the DN of the SubNetwork instead of the DNs of the individual managed + entities within the SubNetwork. + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From 602302f3b4c2aeb731945f2731d276e539603bdb Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:35:23 +0000 Subject: [PATCH 02/30] TS28.541_Rel18_CR0896 MFAF Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 52 ++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index aaf8bc79f..e76b8ea91 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1399,6 +1399,28 @@ components: $ref: '#/components/schemas/PlmnRange' minItems: 1 + MfafInfo: + description: Information of a MFAF NF Instance + type: object + properties: + servingNfTypeList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + minItems: 1 + servingNfSetIdList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' + minItems: 1 + taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1502,6 +1524,8 @@ components: $ref: '#/components/schemas/NssaafFunction-Multiple' AFFunction: $ref: '#/components/schemas/AfFunction-Multiple' + MFAFFunction: + $ref: '#/components/schemas/MfafFunction-Multiple' AmfFunction-Single: allOf: @@ -3140,6 +3164,28 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + MfafFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + mfafInfo: + $ref: '#/components/schemas/MfafInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -3434,6 +3480,10 @@ components: type: array items: $ref: '#/components/schemas/AfFunction-Single' + MfafFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MfafFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3524,4 +3574,4 @@ components: - $ref: '#/components/schemas/EcmConnectionInfo-Single' - $ref: '#/components/schemas/NssaafFunction-Single' - $ref: '#/components/schemas/AfFunction-Single' - + - $ref: '#/components/schemas/MfacfFunction-Single' -- GitLab From c0eaf369052fca87deda542f1533368bdbaeb432 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:52:19 +0000 Subject: [PATCH 03/30] fix validation Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index e76b8ea91..333a4ab9c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3574,4 +3574,4 @@ components: - $ref: '#/components/schemas/EcmConnectionInfo-Single' - $ref: '#/components/schemas/NssaafFunction-Single' - $ref: '#/components/schemas/AfFunction-Single' - - $ref: '#/components/schemas/MfacfFunction-Single' + - $ref: '#/components/schemas/MfafFunction-Single' -- GitLab From c001a3bcbd50a1c3d05f2d0e3cb4b4ea1803905e Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 25 May 2023 20:51:40 +0000 Subject: [PATCH 04/30] updated per review comments. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 333a4ab9c..27a15607a 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1407,19 +1407,16 @@ components: type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - minItems: 1 servingNfSetIdList: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' - minItems: 1 taiList: $ref: '#/components/schemas/TaiList' taiRangeList: type: array items: $ref: '#/components/schemas/TaiRange' - minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: -- GitLab From d3c6fb1d29717ebafd72ff8e405399870760b0f2 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 13:55:36 +0000 Subject: [PATCH 05/30] TS28.541_Rel18_CR0903 Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 973445b50..a8af4bf15 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -199,16 +199,18 @@ components: type: integer NRPciList: - type: object - properties: - NRPci: - type: integer + type: array + items: + $ref: '#/components/schemas/NrPci' + minItems: 0 + maxItems: 1007 CSonPciList: - type: object - properties: - NRPci: - type: integer + type: array + items: + $ref: '#/components/schemas/NrPci' + minItems: 1 + maxItems: 100 MaximumDeviationHoTrigger: type: integer -- GitLab From 4ebd96cda1989bacc60d8299bf14a9d8934e0e36 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:23:23 +0000 Subject: [PATCH 06/30] TS28.541_Rel18_CR0897 DCCFFunction Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 67 ++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index aaf8bc79f..0fd5c1cfe 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1399,6 +1399,43 @@ components: $ref: '#/components/schemas/PlmnRange' minItems: 1 + LogicalInterfaceInfo: + type: object + properties: + logicalInterfaceType: + type: string + enum: + - VLAN + - MPLS + - Segment + logicalInterfaceId: + type: string + + DccfInfo: + description: Specific Data for DCCF + type: object + properties: + servingNfTypeList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + minItems: 1 + servingNfSetIdList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' + minItems: 1 + taiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1502,6 +1539,8 @@ components: $ref: '#/components/schemas/NssaafFunction-Multiple' AFFunction: $ref: '#/components/schemas/AfFunction-Multiple' + DCCFFunction: + $ref: '#/components/schemas/DccfFunction-Multiple' AmfFunction-Single: allOf: @@ -3140,6 +3179,28 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + DccfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + dccfInfo: + $ref: '#/components/schemas/DccfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -3434,6 +3495,10 @@ components: type: array items: $ref: '#/components/schemas/AfFunction-Single' + DccfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/DccfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3524,4 +3589,4 @@ components: - $ref: '#/components/schemas/EcmConnectionInfo-Single' - $ref: '#/components/schemas/NssaafFunction-Single' - $ref: '#/components/schemas/AfFunction-Single' - + - $ref: '#/components/schemas/DccfFunction-Single' -- GitLab From 149420819e4d5b507c063d43d531095475195989 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:16:20 +0000 Subject: [PATCH 07/30] TS28.541_Rel18_CR0905 Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 45 +++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 3f363913d..c64e5ff4e 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -571,6 +571,41 @@ components: - Segment logicalInterfaceId: type: string + routeInfo: + $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteInformation' + systemName: + type: string + portName: + type: string + vlanID: + type: integer + minimum: 0 + maximum: 4095 + routingProtocol: + type: string + enum: + - RIP + - IGMP + - OSPF + - EGP + - EIGRP + - BGP + - IS-IS + + ConnectionPointInfo: + type: object + properties: + connectionPointId: + type: string + connectionPointIdType: + type: string + enum: + - VLAN + - MPLS + - Segment + - IPV4 + - IPV6 + - Attachment_Circuit ServiceProfileList: type: array @@ -725,15 +760,17 @@ components: properties: ipAddress: $ref: '#/components/schemas/IpAddress' - logicalInterfaceInfo: + localLogicalInterfaceInfo: $ref: '#/components/schemas/LogicalInterfaceInfo' - nextHopInfo: - type: string qosProfile: type: string epApplicationRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - + connectionPointRefList: + type: array + items: + $ref: '#/components/schemas/ConnectionPointInfo' + NetworkSliceSubnetProviderCapabilities-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From a3f2b4be8e6667147008aa69b2b5baace40cfa7b Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 25 May 2023 21:06:38 +0000 Subject: [PATCH 08/30] update as per comments. Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index c64e5ff4e..0600a30be 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -571,16 +571,10 @@ components: - Segment logicalInterfaceId: type: string - routeInfo: - $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteInformation' systemName: type: string portName: type: string - vlanID: - type: integer - minimum: 0 - maximum: 4095 routingProtocol: type: string enum: -- GitLab From a92fb2076e19600354ae18ebe1efc53aa78977d2 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 29 May 2023 04:26:59 +0000 Subject: [PATCH 09/30] Ts28.541 rel18 cr0895 nrm enhancements for chf function --- OpenAPI/TS28541_5GcNrm.yaml | 159 +++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0fd5c1cfe..1b9d0a6c2 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1436,6 +1436,34 @@ components: $ref: '#/components/schemas/TaiRange' minItems: 1 + ChfInfo: + description: Information of a CHF NF Instance + type: object + not: + required: [ primaryChfInstance, secondaryChfInstance ] + properties: + supiRangeList: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 0 + gpsiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 0 + plmnRangeList: + type: array + items: + $ref: '#/components/schemas/PlmnRange' + minItems: 0 + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + primaryChfInstance: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + secondaryChfInstance: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1541,6 +1569,8 @@ components: $ref: '#/components/schemas/AfFunction-Multiple' DCCFFunction: $ref: '#/components/schemas/DccfFunction-Multiple' + ChfFunction: + $ref: '#/components/schemas/ChfFunction-Multiple' AmfFunction-Single: allOf: @@ -1616,7 +1646,11 @@ components: EP_NLG: $ref: '#/components/schemas/EP_NLG-Multiple' EP_N58: - $ref: '#/components/schemas/EP_N13-Multiple' + $ref: '#/components/schemas/EP_N58-Multiple' + EP_N41: + $ref: '#/components/schemas/EP_N41-Multiple' + EP_N42: + $ref: '#/components/schemas/EP_N42-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1727,6 +1761,8 @@ components: $ref: '#/components/schemas/EP_N16-Multiple' EP_S5C: $ref: '#/components/schemas/EP_S5C-Multiple' + EP_N40: + $ref: '#/components/schemas/EP_N40-Multiple' FiveQiDscpMappingSet: $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' GtpUPathQoSMonitoringControl: @@ -1889,6 +1925,8 @@ components: $ref: '#/components/schemas/EP_N15-Multiple' EP_N16: $ref: '#/components/schemas/EP_N16-Multiple' + EP_N28: + $ref: '#/components/schemas/EP_N28-Multiple' EP_Rx: $ref: '#/components/schemas/EP_Rx-Multiple' PredefinedPccRuleSet: @@ -3201,6 +3239,95 @@ components: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + ChfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + chfInfo: + $ref: '#/components/schemas/ChfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N28: + $ref: '#/components/schemas/EP_N28-Multiple' + EP_N40: + $ref: '#/components/schemas/EP_N40-Multiple' + EP_N41: + $ref: '#/components/schemas/EP_N41-Multiple' + EP_N42: + $ref: '#/components/schemas/EP_N42-Multiple' + + EP_N28-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N40-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N41-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N42-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -3406,6 +3533,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N27-Single' + EP_N28-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N28-Single' EP_N31-Multiple: type: array @@ -3419,6 +3550,19 @@ components: type: array items: $ref: '#/components/schemas/EP_N33-Single' + EP_N40-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N40-Single' + EP_N41-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N41-Single' + EP_N42-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N42-Single' + EP_S5C-Multiple: type: array items: @@ -3499,6 +3643,10 @@ components: type: array items: $ref: '#/components/schemas/DccfFunction-Single' + ChfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/ChfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3561,10 +3709,15 @@ components: - $ref: '#/components/schemas/EP_N26-Single' - $ref: '#/components/schemas/EP_N27-Single' + - $ref: '#/components/schemas/EP_N28-Single' - $ref: '#/components/schemas/EP_N31-Single' - $ref: '#/components/schemas/EP_N32-Single' - - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N40-Single' + - $ref: '#/components/schemas/EP_N41-Single' + - $ref: '#/components/schemas/EP_N42-Single' + - $ref: '#/components/schemas/EP_N58-Single' - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' @@ -3590,3 +3743,5 @@ components: - $ref: '#/components/schemas/NssaafFunction-Single' - $ref: '#/components/schemas/AfFunction-Single' - $ref: '#/components/schemas/DccfFunction-Single' + - $ref: '#/components/schemas/ChfFunction-Single' + - $ref: '#/components/schemas/ChfFunction-Single' -- GitLab From 3ff66217e1d217e7828cdd97790494182c332c0a Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:35:23 +0000 Subject: [PATCH 10/30] TS28.541_Rel18_CR0896 MFAF Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 50 ++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1b9d0a6c2..51aa5f5b8 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1426,10 +1426,29 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: type: array items: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + $ref: '#/components/schemas/TaiRange' + minItems: 1 + + MfafInfo: + description: Information of a MFAF NF Instance + type: object + properties: + servingNfTypeList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + minItems: 1 + servingNfSetIdList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' minItems: 1 + taiList: + $ref: '#/components/schemas/TaiList' taiRangeList: type: array items: @@ -1571,6 +1590,8 @@ components: $ref: '#/components/schemas/DccfFunction-Multiple' ChfFunction: $ref: '#/components/schemas/ChfFunction-Multiple' + MFAFFunction: + $ref: '#/components/schemas/MfafFunction-Multiple' AmfFunction-Single: allOf: @@ -3239,6 +3260,28 @@ components: $ref: '#/components/schemas/DccfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + MfafFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + mfafInfo: + $ref: '#/components/schemas/MfafInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + ChfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3647,6 +3690,10 @@ components: type: array items: $ref: '#/components/schemas/ChfFunction-Single' + MfafFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MfafFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3745,3 +3792,4 @@ components: - $ref: '#/components/schemas/DccfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' + - $ref: '#/components/schemas/MfacfFunction-Single' -- GitLab From 8a71ac7c21db592db4e03b646bae7fa77823ee2e Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 11 May 2023 14:52:19 +0000 Subject: [PATCH 11/30] fix validation Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 51aa5f5b8..1fbfc4512 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3791,5 +3791,4 @@ components: - $ref: '#/components/schemas/AfFunction-Single' - $ref: '#/components/schemas/DccfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' - - $ref: '#/components/schemas/ChfFunction-Single' - - $ref: '#/components/schemas/MfacfFunction-Single' + - $ref: '#/components/schemas/MfafFunction-Single' -- GitLab From 1b6edc30d1c01fa82be64e12c3b20a966db9240e Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 25 May 2023 20:51:40 +0000 Subject: [PATCH 12/30] updated per review comments. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1fbfc4512..329aabba2 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1441,19 +1441,16 @@ components: type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - minItems: 1 servingNfSetIdList: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' - minItems: 1 taiList: $ref: '#/components/schemas/TaiList' taiRangeList: type: array items: $ref: '#/components/schemas/TaiRange' - minItems: 1 ChfInfo: description: Information of a CHF NF Instance -- GitLab From 857fc6c280650b8a9da716bc51c5f54637cb35b0 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 29 May 2023 07:47:23 +0000 Subject: [PATCH 13/30] Ts28.541 rel18 cr0894 nrm enhancements for nrf function --- OpenAPI/TS28541_5GcNrm.yaml | 73 +++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 329aabba2..6831c4180 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1480,6 +1480,71 @@ components: secondaryChfInstance: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + NrfInfo: + description: Information of an NRF NF Instance, used in hierarchical NRF deployments + type: object + properties: + servedUdrInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdrInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdmInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdmInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedAusfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AusfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedNwdafInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/NwdafInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedLmfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/LmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUdsfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdsfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedTrustAfInfo: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + $ref: '#/components/schemas/TrustAfInfo' + minProperties: 1 + servedNssaafInfo: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + $ref: '#/components/schemas/NssaafInfo' + minProperties: 1 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -2058,16 +2123,16 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - plmnIdList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + plmnInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' sBIFqdn: type: string cNSIIdList: $ref: '#/components/schemas/CNSIIdList' nFProfileList: $ref: '#/components/schemas/NFProfileList' - snssaiList: - $ref: '#/components/schemas/SnssaiList' + nrfInfo: + $ref: '#/components/schemas/NrfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From c1ab36f58b6e2e24da14d593d7e9e76bdc410e5f Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 29 May 2023 07:52:43 +0000 Subject: [PATCH 14/30] Auto-merger correction Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 0600a30be..67b9a8cb9 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -596,10 +596,10 @@ components: enum: - VLAN - MPLS - - Segment + - SEGMENT - IPV4 - IPV6 - - Attachment_Circuit + - ATTACHMENT_CIRCUIT ServiceProfileList: type: array -- GitLab From 4463427a6056b1b3a2ab87ac727912dbd4a33739 Mon Sep 17 00:00:00 2001 From: gautamd Date: Mon, 29 May 2023 11:52:59 +0000 Subject: [PATCH 15/30] S5 234812 rel 18 cr 28.541 fixing coverage area --- OpenAPI/TS28541_SliceNrm.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 67b9a8cb9..0833703e6 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -513,10 +513,8 @@ components: $ref: '#/components/schemas/UserMgmtOpen' v2XCommModels: $ref: '#/components/schemas/V2XCommModels' - coverageAreas: - type: array - items: - type: string + coverageArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' termDensity: $ref: '#/components/schemas/TermDensity' activityFactor: -- GitLab From f84662ad7060523bcca2e273e2dbe67a32f399a5 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 30 May 2023 07:13:48 +0000 Subject: [PATCH 16/30] TS28.541 Rel18 CR0800 Add NetworkSliceController and NetworkSliceSubnetController... --- OpenAPI/TS28541_SliceNrm.yaml | 71 ++++++++++++++++++++++++++++++++++- OpenAPI/TS28623_ComDefs.yaml | 12 ++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 0833703e6..f38138861 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -690,6 +690,10 @@ components: $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple' FeasibilityCheckAndReservationJob: $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple' + NetworkSliceController: + $ref: '#/components/schemas/NetworkSliceController-Multiple' + NetworkSliceSubnetController: + $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple' NetworkSlice-Single: @@ -709,6 +713,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' serviceProfileList: $ref: '#/components/schemas/ServiceProfileList' + networkSliceControllerRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' NetworkSliceSubnet-Single: allOf: @@ -741,6 +747,8 @@ components: - TOP_SLICESUBNET - RAN_SLICESUBNET - CN_SLICESUBNET + networkSliceSubnetControllerRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' EP_Transport-Single: allOf: @@ -815,6 +823,52 @@ components: recommendedRequirements: $ref: '#/components/schemas/RecommendedRequirements' + NetworkSliceController-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + inputServiceProfile: + $ref: '#/components/schemas/ServiceProfile' + serviceProfileId: + type: string + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + availabilityStatus: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AvailabilityStatus' + processMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + networkSliceRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + NetworkSliceSubnetController-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + inputSliceProfile: + $ref: '#/components/schemas/SliceProfile' + sliceProfileId: + type: string + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + availabilityStatus: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AvailabilityStatus' + processMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + networkSliceSubnetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: type: array @@ -844,7 +898,17 @@ components: type: array items: $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' - + + NetworkSliceController-Multiple: + type: array + items: + $ref: '#/components/schemas/NetworkSliceController-Single' + + NetworkSliceSubnetController-Multiple: + type: array + items: + $ref: '#/components/schemas/NetworkSliceSubnetController-Single' + #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-sliceNrm: @@ -856,4 +920,7 @@ components: - $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/EP_Transport-Single' - $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single' - - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' + - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' + - $ref: '#/components/schemas/NetworkSliceController-Single' + - $ref: '#/components/schemas/NetworkSliceSubnetController-Single' + diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index c54fc8107..e0a125724 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -166,6 +166,18 @@ components: - IDEL - ACTIVE - BUSY + AvailabilityStatus: + type: string + enum: + - IN_TEST + - FAILED + - POWER_OFF + - OFF_LINE + - OFF_DUTY + - DEPENDENCY + - DEGRADED + - NOT_INSTALLED + - LOG_FULL AttributeNameValuePairSet: description: >- -- GitLab From c76e378790a3228267b0d7d23c4b42d6d306b89f Mon Sep 17 00:00:00 2001 From: niuyu Date: Tue, 30 May 2023 13:28:32 +0000 Subject: [PATCH 17/30] 28.541 rel18 cr0921 update nrm enhancements for nwdaf function --- OpenAPI/TS28541_5GcNrm.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6831c4180..cee4bdd3b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -972,6 +972,32 @@ components: items: $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' minItems: 1 + taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + nwdafCapability: + $ref: '#/components/schemas/NwdafCapability' + analyticsDelay: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec' + servingNfSetIdList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId' + minItems: 1 + servingNfTypeList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' + minItems: 1 + mlAnalyticsList: + type: array + items: + $ref: '#/components/schemas/MlAnalyticsInfo' + minItems: 1 ScpInfo: description: Information of an SCP Instance -- GitLab From da6c2c1d34f6112d7d9223cb02ff23770082fc9b Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 11 May 2023 06:10:14 +0000 Subject: [PATCH 18/30] Correct the range of excessPacketDelayThresholds --- OpenAPI/TS28623_GenericNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index e5d16a194..3152c0754 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1485,6 +1485,8 @@ components: - 150ms - 300ms - 500ms + minItems: 0 + maxItems: 255 #-------- end of Definition of types used in Trace control NRM fragment ---------- -- GitLab From c3b27a45c275d2ebe676b6779d4cd7aeaeb4b6d5 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 11 May 2023 05:37:14 +0000 Subject: [PATCH 19/30] Modelling ML Entity --- OpenAPI/TS28105_AiMlNrm.yaml | 61 +++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 77b62f530..429d72af9 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -15,27 +15,6 @@ components: #-------- Definition of types----------------------------------------------------- - MLEntityList: - type: array - items: - $ref: '#/components/schemas/MLEntity' - - MLEntity: - type: object - properties: - mLEntityId: - type: string - inferenceType: - type: string - mLEntityVersion: - type: string - expectedRunTimeContext: - $ref: '#/components/schemas/MLContext' - trainingContext: - $ref: '#/components/schemas/MLContext' - runTimeContext: - $ref: '#/components/schemas/MLContext' - MLContext: type: object properties: @@ -146,8 +125,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityList: - $ref: '#/components/schemas/MLEntityList' + mLEntityRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -167,8 +146,6 @@ components: allOf: - type: object properties: - mLEntityId: - type: string candidateTrainingDataSource: type: array items: @@ -188,6 +165,8 @@ components: type: boolean suspendRequest: type: boolean + mlEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -214,7 +193,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - + mlEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingReport-Single: allOf: @@ -225,8 +205,6 @@ components: allOf: - type: object properties: - mLEntityId: - type: string areConsumerTrainingDataUsed: type: boolean usedConsumerTrainingData: @@ -249,6 +227,27 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mlEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntity-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + inferenceType: + type: string + mLEntityVersion: + type: string + expectedRunTimeContext: + $ref: '#/components/schemas/MLContext' + trainingContext: + $ref: '#/components/schemas/MLContext' + runTimeContext: + $ref: '#/components/schemas/MLContext' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -276,6 +275,10 @@ components: type: array items: $ref: '#/components/schemas/MLTrainingReport-Single' + MLEntity-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntity-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -289,3 +292,5 @@ components: - $ref: '#/components/schemas/MLTrainingRequest-Single' - $ref: '#/components/schemas/MLTrainingProcess-Single' - $ref: '#/components/schemas/MLTrainingReport-Single' + - $ref: '#/components/schemas/MLEntity-Single' + -- GitLab From 3282cc715227918ceed2549623227fac1fa165c9 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 25 May 2023 18:38:45 +0000 Subject: [PATCH 20/30] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 38 +++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 429d72af9..028e8a7ac 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -125,8 +125,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + mLEntityList: + $ref: '#/components/schemas/MLEntityList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -146,6 +146,8 @@ components: allOf: - type: object properties: + mLEntityId: + type: string candidateTrainingDataSource: type: array items: @@ -165,8 +167,6 @@ components: type: boolean suspendRequest: type: boolean - mlEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -193,8 +193,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mlEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + MLTrainingReport-Single: allOf: @@ -205,6 +204,8 @@ components: allOf: - type: object properties: + mLEntityId: + type: string areConsumerTrainingDataUsed: type: boolean usedConsumerTrainingData: @@ -227,8 +228,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - mlEntityRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntity-Single: allOf: @@ -238,6 +237,8 @@ components: attributes: type: object properties: + mLEntityId: + type: string inferenceType: type: string mLEntityVersion: @@ -247,7 +248,18 @@ components: trainingContext: $ref: '#/components/schemas/MLContext' runTimeContext: - $ref: '#/components/schemas/MLContext' + $ref: '#/components/schemas/MLContext' + + MLEntityRepository-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + mLRepositoryId: + type: string #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -278,8 +290,11 @@ components: MLEntity-Multiple: type: array items: - $ref: '#/components/schemas/MLEntity-Single' - + $ref: '#/components/schemas/MLEntity-Single' + MLEntityRepository-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityRepository-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -293,4 +308,5 @@ components: - $ref: '#/components/schemas/MLTrainingProcess-Single' - $ref: '#/components/schemas/MLTrainingReport-Single' - $ref: '#/components/schemas/MLEntity-Single' + - $ref: '#/components/schemas/MLEntityRepository-Single' -- GitLab From 87b3b6f1350ea73629709edb7315b4838f79ef32 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 25 May 2023 18:44:57 +0000 Subject: [PATCH 21/30] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 028e8a7ac..6f9c318d8 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -125,8 +125,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityList: - $ref: '#/components/schemas/MLEntityList' + mLEntityRepositoryRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -148,6 +148,8 @@ components: properties: mLEntityId: type: string + inferenceType: + type: string candidateTrainingDataSource: type: array items: @@ -167,6 +169,8 @@ components: type: boolean suspendRequest: type: boolean + mLEntityToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -228,6 +232,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEnityGeneratedRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLEntity-Single: allOf: -- GitLab From b31117623a3476b7fcf381afaef6a812658e6d9b Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 25 May 2023 18:59:23 +0000 Subject: [PATCH 22/30] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 6f9c318d8..e806df534 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -101,6 +101,8 @@ components: $ref: '#/components/schemas/ManagedElement-Multiple' MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' ManagedElement-Single: allOf: @@ -114,6 +116,8 @@ components: properties: MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' MLTrainingFunction-Single: allOf: @@ -266,6 +270,8 @@ components: properties: mLRepositoryId: type: string + MLEntity: + $ref: '#/components/schemas/MLEntity-Multiple' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -296,7 +302,7 @@ components: MLEntity-Multiple: type: array items: - $ref: '#/components/schemas/MLEntity-Single' + $ref: '#/components/schemas/MLEntity-Single' MLEntityRepository-Multiple: type: array items: -- GitLab From 26bfcd6a9ad3b695e78ded1532150881b9df4b34 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 11 May 2023 14:03:41 +0000 Subject: [PATCH 23/30] Update OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index f38138861..2e74dfd6a 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -163,7 +163,9 @@ components: servAttrCom: $ref: '#/components/schemas/ServAttrCom' nROperatingBands: - type: string + type: array + items: + type: string Synchronicity: type: object properties: @@ -228,6 +230,8 @@ components: type: string nsName: type: string + description: + type: string EmbbEEPerfReq: type: object properties: @@ -379,7 +383,9 @@ components: uLMaxPktSize: type: integer nROperatingBands: - type: string + type: array + items: + type: string delayTolerance: $ref: '#/components/schemas/DelayTolerance' positioning: @@ -422,7 +428,9 @@ components: maxNumberOfPDUSessions: type: integer nROperatingBands: - type: string + type: array + items: + type: string sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: @@ -542,7 +550,7 @@ components: SliceProfile: type: object properties: - serviceProfileId: + sliceProfileId: type: string plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' -- GitLab From 2d801f268e8b08e72d82fe1ead417886ec995005 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 5 Jun 2023 02:20:08 +0000 Subject: [PATCH 24/30] =?UTF-8?q?The=20latest=20base=20for=20R18=20?= =?UTF-8?q?=EF=BC=88Copy=20from=20latest=20R17=20branch=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAPI/TS28312_IntentExpectations.yaml | 644 ++++++++++++++++++++++++ 1 file changed, 644 insertions(+) create mode 100644 OpenAPI/TS28312_IntentExpectations.yaml diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml new file mode 100644 index 000000000..d7336467d --- /dev/null +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -0,0 +1,644 @@ +openapi: 3.0.1 +info: + title: Scenario specific Intent Expectations + version: 17.3.0 + description: >- + OAS 3.0.1 definition of scenario specific Intent Expectations + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.312; Intent driven management services for mobile networks + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.312/ +paths: {} +components: + schemas: + + #-------Definition of the Scenario specific IntentExpectation dataType ----------# + RadioNetworkExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio network delivering and performance assurance + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/RadioNetworkExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/WeakRSRPRatioTarget" + - $ref: "#/components/schemas/LowSINRRatioTarget" + - $ref: "#/components/schemas/AveULRANUEThptTarget" + - $ref: "#/components/schemas/AveDLRANUEThptTarget" + - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" + - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + expectationContexts: + type: array + items: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + expectationfulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + ServiceSupportExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/ServiceSupportExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/DLThptPerUETarget" + - $ref: "#/components/schemas/ULThptPerUETarget" + - $ref: "#/components/schemas/DLLatencyTarget" + - $ref: "#/components/schemas/ULLatencyTarget" + - $ref: "#/components/schemas/MaxNumberofUEsTarget" + - $ref: "#/components/schemas/ActivityFactorTarget" + - $ref: "#/components/schemas/UESpeedTarget" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/ServiceStartTimeContext" + - $ref: "#/components/schemas/ServiceEndTimeContext" + - $ref: "#/components/schemas/UEMobilityLevelContext" + - $ref: "#/components/schemas/ResourceSharingLevelContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + expectationfulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + #-------Definition of the IntentExpectation dataType ----------# + + #-------Definition of the scenario specific ExpectationObject dataType ----------# + RadioNetworkExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation + type: object + properties: + objectType: + type: string + enum: + - RAN_SubNetwork #value for Radio Network Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/CoverageAreaPolygonContext" + - $ref: "#/components/schemas/CoverageTACContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/NRFqBandContext" + - $ref: "#/components/schemas/RATContext" + - $ref: "#/components/schemas/ObjectContext" + ServiceSupportExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation + type: object + properties: + objectType: + type: string + enum: + - Service_Support #value for Service Support Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" + - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" + - $ref: "#/components/schemas/CoverageAreaTAContext" + - $ref: "#/components/schemas/ObjectContext" + #-------Definition of the ExpectationObject dataType ----------# + + + #-------Definition of the Scenario specific ExpectationTarget dataType----------# + WeakRSRPRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget + type: object + properties: + targetName: + type: string + enum: + - WeakRSRPRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/WeakRSRPContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + WeakRSRPContext: + description: >- + This data type is the "TargetContext" data type with specialisations for WeakRSRPContext + type: object + properties: + contextAttribute: + type: string + enum: + - WeakRSRPThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: number + LowSINRRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget + type: object + properties: + targetName: + type: string + enum: + - LowSINRRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowSINRContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + LowSINRContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowSINRContext + type: object + properties: + contextAttribute: + type: string + enum: + - LowSINRThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: integer + AveULRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget + type: object + properties: + targetName: + type: string + enum: + - AveULRANUEThpt + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + type: integer + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + AveDLRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget + type: object + properties: + targetName: + type: string + enum: + - AveDLRANUEThpt + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + type: integer + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + LowULRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget + type: object + properties: + targetName: + type: string + enum: + - LowULRANUEThptRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowULRANUEThptContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + LowULRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext + type: object + properties: + contextAttribute: + type: string + enum: + - LowULRANUEThptThreshold + contextCondition: + type: string + enum: + - Is_less_than + contextValueRange: + type: number + LowDLRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget + type: object + properties: + targetName: + type: string + enum: + - LowDLRANUEThptRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowDLRANUEThptContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + LowDLRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext + type: object + properties: + contextAttribute: + type: string + enum: + - LowDLRANUEThptThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: number + DLThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget + type: object + properties: + targetName: + type: string + enum: + - DlThptPerUE + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + ULThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget + type: object + properties: + targetName: + type: string + enum: + - UlThptPerUE + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + DLLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget + type: object + properties: + targetName: + type: string + enum: + - DlLatency + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + ULLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget + type: object + properties: + targetName: + type: string + enum: + - UlLatency + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + MaxNumberofUEsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget + type: object + properties: + targetName: + type: string + enum: + - maxNumberofUEs + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + ActivityFactorTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget + type: object + properties: + targetName: + type: string + enum: + - activityFactor + targetCondition: + type: string + enum: + - IS_EQUAL_TO + targetValueRange: + type: integer + UESpeedTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget + type: object + properties: + targetName: + type: string + enum: + - uESpeed + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + #-------Definition of the concrete ExpectationTarget dataType----------# + + #-------Definition of the concrete ObjectTarget dataType----------------# + ObjectContext: + description: >- + This data type is the "ObjectContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number + CoverageAreaPolygonContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext + type: object + properties: + contextAttribute: + type: string + enum: + - CoverageAreaPolygon + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "#/components/schemas/CoverageArea" + CoverageArea: + type: string + CoverageTACContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageTACContext + type: object + properties: + contextAttribute: + type: string + enum: + - CoverageAreaTac + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" + PLMNContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for PLMNContext + type: object + properties: + contextAttribute: + type: string + enum: + - PLMN + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" + NRFqBandContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for NRFqBandContext + type: object + properties: + contextAttribute: + type: string + enum: + - NRFqBand + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + type: string + RATContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for RATContext + type: object + properties: + contextAttribute: + type: string + enum: + - RAT + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + type: string + enum: + - UTRAN + - EUTRAN + - NR + EdgeIdenfiticationIdContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext + type: object + properties: + contextAttribute: + type: string + enum: + - edgeIdentificationId + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: array + items: + type: string + EdgeIdenfiticationLocContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext + type: object + properties: + contextAttribute: + type: string + enum: + - edgeIdentificationTarget + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: array + items: + type: string + CoverageAreaTAContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext + type: object + properties: + contextAttribute: + type: string + enum: + - coverageAreaTA + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "#/components/schemas/CoverageAreaTAList" + CoverageAreaTAList: + type: integer + #-------Definition of the scenario specific ObjectTarget dataType----------------# + + #-------Definition of the concrete ExpectionContext dataType----------------# + ServiceStartTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServiceStartTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: string + ServiceEndTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServiceEndTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: string + UEMobilityLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext + type: object + properties: + contextAttribute: + type: string + enum: + - UEMobilityLevel + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" + ResourceSharingLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext + type: object + properties: + contextAttribute: + type: string + enum: + - ResourceSharingLevel + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From 72399bab17a30587141abc1e6b7f6df4ae5d180a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 5 Jun 2023 02:26:14 +0000 Subject: [PATCH 25/30] The latest baseline for R18 (copy from R17 branch) --- OpenAPI/TS28312_IntentNrm.yaml | 640 +-------------------------------- 1 file changed, 19 insertions(+), 621 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index a9fb33655..35f3e137d 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 17.3.0 + version: 18.0.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -13,7 +13,7 @@ paths: {} components: schemas: - #-------Definition of concrete IOCs ----------# + #-------Definition of generic IOCs ----------# SubNetwork-Single: allOf: @@ -43,17 +43,17 @@ components: type: object oneOf: - $ref: "#/components/schemas/IntentExpectation" - - $ref: "#/components/schemas/RadioNetworkExpectation" - - $ref: "#/components/schemas/ServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation" intentContexts: type: array items: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - #-------Definition of concrete IOCs ----------# + #-------Definition of generic IOCs ----------# - #-------Definition of the IntentExpectation dataType ----------# + #-------Definition of the generic IntentExpectation dataType ----------# IntentExpectation: description: >- This data type is the "IntentExpectation" data type without specialisations @@ -76,79 +76,10 @@ components: items: $ref: "#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - RadioNetworkExpectation: - description: >- - This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio network delivering and performance assurance - type: object - properties: - expectationId: - type: string - expectationVerb: - $ref: "#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/RadioNetworkExpectationObject" - expectationTargets: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/WeakRSRPRatioTarget" - - $ref: "#/components/schemas/LowSINRRatioTarget" - - $ref: "#/components/schemas/AveULRANUEThptTarget" - - $ref: "#/components/schemas/AveDLRANUEThptTarget" - - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" - - $ref: "#/components/schemas/ExpectationTarget" - expectationContexts: - type: array - items: - $ref: "#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - ServiceSupportExpectation: - description: >- - This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment - type: object - properties: - expectationId: - type: string - expectationVerb: - $ref: "#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" - expectationTargets: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/DLThptPerUETarget" - - $ref: "#/components/schemas/ULThptPerUETarget" - - $ref: "#/components/schemas/DLLatencyTarget" - - $ref: "#/components/schemas/ULLatencyTarget" - - $ref: "#/components/schemas/MaxNumberofUEsTarget" - - $ref: "#/components/schemas/ActivityFactorTarget" - - $ref: "#/components/schemas/UESpeedTarget" - - $ref: "#/components/schemas/ExpectationTarget" - expectationContexts: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/ServiceStartTimeContext" - - $ref: "#/components/schemas/ServiceEndTimeContext" - - $ref: "#/components/schemas/UEMobilityLevelContext" - - $ref: "#/components/schemas/ResourceSharingLevelContext" - - $ref: "#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - #-------Definition of the IntentExpectation dataType ----------# + $ref: "#/components/schemas/FulfilmentInfo" + #-------Definition of the generic IntentExpectation dataType ----------# - #-------Definition of the ExpectationObject dataType ----------# + #-------Definition of the generic ExpectationObject dataType ----------# ExpectationObject: description: >- This data type is the "ExpectationObject" data type without specialisations @@ -166,49 +97,8 @@ components: type: array items: $ref: "#/components/schemas/ObjectContext" - RadioNetworkExpectationObject: - description: >- - This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation - type: object - properties: - objectType: - type: string - enum: - - RAN_SubNetwork #value for Radio Network Expectation--# - objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" - objectContexts: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/CoverageAreaPolygonContext" - - $ref: "#/components/schemas/CoverageTACContext" - - $ref: "#/components/schemas/PLMNContext" - - $ref: "#/components/schemas/NRFqBandContext" - - $ref: "#/components/schemas/RATContext" - - $ref: "#/components/schemas/ObjectContext" - ServiceSupportExpectationObject: - description: >- - This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation - type: object - properties: - objectType: - type: string - enum: - - Service_Support #value for Radio Network Expectation--# - objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" - objectContexts: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - - $ref: "#/components/schemas/CoverageAreaTAContext" - - $ref: "#/components/schemas/ObjectContext" - #-------Definition of the ExpectationObject dataType ----------# + + #-------Definition of the generic ExpectationObject dataType ----------# #-------Definition of the generic dataType --------------# Condition: @@ -257,7 +147,7 @@ components: - ENSURE #-------Definition of the generic dataType --------------# - #-------Definition of the IntentContext dataType --------------# + #-------Definition of the generic IntentContext dataType --------------# IntentContext: description: >- This data type is the "IntentContext" data type without specialisations @@ -271,9 +161,9 @@ components: type: array items: type: number - #-------Definition of the IntentContext dataType --------------# + #-------Definition of the generic IntentContext dataType --------------# - #-------Definition of the ExpectationTarget dataType----------# + #-------Definition of the generic ExpectationTarget dataType----------# ExpectationTarget: description: >- This data type is the "ExpectationTarget" data type without specialisations @@ -300,292 +190,9 @@ components: $ref: "#/components/schemas/Condition" contextValueRange: type: number - WeakRSRPRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget - type: object - properties: - targetName: - type: string - enum: - - WeakRSRPRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/WeakRSRPContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - WeakRSRPContext: - description: >- - This data type is the "TargetContext" data type with specialisations for WeakRSRPContext - type: object - properties: - contextAttribute: - type: string - enum: - - WeakRSRPThreshold - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: number - LowSINRRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget - type: object - properties: - targetName: - type: string - enum: - - LowSINRRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/LowSINRContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowSINRContext: - description: >- - This data type is the "TargetContext" data type with specialisations for LowSINRContext - type: object - properties: - contextAttribute: - type: string - enum: - - LowSINRThreshold - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: integer - AveULRANUEThptTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget - type: object - properties: - targetName: - type: string - enum: - - AveULRANUEThpt - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - type: integer - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - AveDLRANUEThptTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget - type: object - properties: - targetName: - type: string - enum: - - AveDLRANUEThpt - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - type: integer - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget - type: object - properties: - targetName: - type: string - enum: - - LowULRANUEThptRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/LowULRANUEThptContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptContext: - description: >- - This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext - type: object - properties: - contextAttribute: - type: string - enum: - - LowULRANUEThptThreshold - contextCondition: - type: string - enum: - - Is_less_than - contextValueRange: - type: number - LowDLRANUEThptRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget - type: object - properties: - targetName: - type: string - enum: - - LowDLRANUEThptRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/LowDLRANUEThptContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowDLRANUEThptContext: - description: >- - This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext - type: object - properties: - contextAttribute: - type: string - enum: - - LowDLRANUEThptThreshold - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: number - DLThptPerUETarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget - type: object - properties: - targetName: - type: string - enum: - - DlThptPerUE - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" - ULThptPerUETarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget - type: object - properties: - targetName: - type: string - enum: - - UlThptPerUE - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" - DLLatencyTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget - type: object - properties: - targetName: - type: string - enum: - - DlLatency - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - ULLatencyTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget - type: object - properties: - targetName: - type: string - enum: - - UlLatency - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - MaxNumberofUEsTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget - type: object - properties: - targetName: - type: string - enum: - - maxNumberofUEs - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - ActivityFactorTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget - type: object - properties: - targetName: - type: string - enum: - - activityFactor - targetCondition: - type: string - enum: - - IS_EQUAL_TO - targetValueRange: - type: integer - UESpeedTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget - type: object - properties: - targetName: - type: string - enum: - - uESpeed - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - #-------Definition of the concrete ExpectationTarget dataType----------# + #-------Definition of the generic ExpectationTarget dataType----------# - #-------Definition of the concrete ObjectTarget dataType----------------# + #-------Definition of the generic ObjectContext dataType----------------# ObjectContext: description: >- This data type is the "ObjectContext" data type without specialisations @@ -599,153 +206,9 @@ components: type: array items: type: number - CoverageAreaPolygonContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext - type: object - properties: - contextAttribute: - type: string - enum: - - CoverageAreaPolygon - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "#/components/schemas/CoverageArea" - CoverageArea: - type: string - CoverageTACContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageTACContext - type: object - properties: - contextAttribute: - type: string - enum: - - CoverageAreaTac - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" - PLMNContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for PLMNContext - type: object - properties: - contextAttribute: - type: string - enum: - - PLMN - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" - NRFqBandContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for NRFqBandContext - type: object - properties: - contextAttribute: - type: string - enum: - - NRFqBand - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - type: string - RATContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for RATContext - type: object - properties: - contextAttribute: - type: string - enum: - - RAT - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - type: string - enum: - - UTRAN - - EUTRAN - - NR - EdgeIdenfiticationIdContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext - type: object - properties: - contextAttribute: - type: string - enum: - - edgeIdentificationId - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: array - items: - type: string - EdgeIdenfiticationLocContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext - type: object - properties: - contextAttribute: - type: string - enum: - - edgeIdentificationTarget - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: array - items: - type: string - CoverageAreaTAContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext - type: object - properties: - contextAttribute: - type: string - enum: - - coverageAreaTA - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "#/components/schemas/CoverageAreaTAList" - CoverageAreaTAList: - type: integer - #-------Definition of the concrete ObjectTarget dataType----------------# - - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the generic ObjectContext dataType----------------# + + #-------Definition of the generic ExpectionContext dataType----------------# ExpectationContext: description: >- This data type is the "ExpectationContext" data type without specialisations @@ -759,72 +222,7 @@ components: type: array items: type: number - ServiceStartTimeContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext - type: object - properties: - contextAttribute: - type: string - enum: - - ServiceStartTime - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: string - ServiceEndTimeContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext - type: object - properties: - contextAttribute: - type: string - enum: - - ServiceEndTime - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: string - UEMobilityLevelContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext - type: object - properties: - contextAttribute: - type: string - enum: - - UEMobilityLevel - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" - ResourceSharingLevelContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext - type: object - properties: - contextAttribute: - type: string - enum: - - ResourceSharingLevel - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" #-------Definition of the concrete ExpectionContext dataType----------------# - #------Definition of JSON arrays for name-contained IOCs ---------------# -- GitLab From 4ee55f4f019d12cbdd0783f702e43da5b7f6d71b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 5 Jun 2023 02:26:31 +0000 Subject: [PATCH 26/30] Update OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index d7336467d..1466aa127 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 17.3.0 + version: 18.0.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From dc9208fe10137e61fb234e3c38552333a68fa672 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 5 Jun 2023 06:19:28 +0000 Subject: [PATCH 27/30] Update OpenAPI/TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 35f3e137d..bd3c83c28 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -4,7 +4,7 @@ info: version: 18.0.0 description: >- OAS 3.0.1 definition of the Intent NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.312; Intent driven management services for mobile networks @@ -76,7 +76,9 @@ components: items: $ref: "#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: "#/components/schemas/FulfilmentInfo" + required: + - expectationId #-------Definition of the generic IntentExpectation dataType ----------# #-------Definition of the generic ExpectationObject dataType ----------# @@ -113,13 +115,16 @@ components: - IS_NOT_ONE_OF - IS_EQUAL_TO_OR_LESS_THAN - IS_EQUAL_TO_OR_GREATER_THAN + - IS_ALL_OF FulfilStatus: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED NotFulfilledState: type: string + readOnly: true enum: - ACKNOWLEDGED - COMPLIANT @@ -140,6 +145,7 @@ components: description: -> An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo type: string + readOnly: true ExpectationVerb: type: string enum: @@ -243,3 +249,4 @@ components: - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/Intent-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# + -- GitLab From bed03c7ef0a024c2e55ed4e937b30663ee04e523 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 5 Jun 2023 06:20:37 +0000 Subject: [PATCH 28/30] Update OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 1466aa127..971302e2a 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -43,7 +43,9 @@ components: items: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + required: + - expectationId ServiceSupportExpectation: description: >- This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment @@ -81,7 +83,9 @@ components: - $ref: "#/components/schemas/ResourceSharingLevelContext" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + required: + - expectationId #-------Definition of the IntentExpectation dataType ----------# #-------Definition of the scenario specific ExpectationObject dataType ----------# @@ -442,7 +446,7 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_ALL_OF contextValueRange: type: array items: @@ -461,7 +465,7 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_ALL_OF contextValueRange: type: array items: @@ -478,7 +482,7 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_ALL_OF contextValueRange: type: array items: @@ -495,7 +499,7 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_ALL_OF contextValueRange: type: array items: @@ -512,7 +516,7 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_ALL_OF contextValueRange: type: array items: @@ -567,7 +571,7 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_ALL_OF contextValueRange: type: array items: -- GitLab From bb4627b0c262640a6e66879ba15754735d387b38 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 6 Jun 2023 13:24:39 +0000 Subject: [PATCH 29/30] update versions for #149 and replace TS28532_ProvMnS.yaml to Rel17 latest version --- OpenAPI/README.md | 2 +- OpenAPI/TS28104_MdaNrm.yaml | 4 ++-- OpenAPI/TS28104_MdaReport.yaml | 14 +++++++------- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- OpenAPI/TS28532_FaultMnS.yaml | 2 +- OpenAPI/TS28532_FileDataReportingMnS.yaml | 2 +- OpenAPI/TS28532_HeartbeatNtf.yaml | 2 +- OpenAPI/TS28532_PerfMnS.yaml | 2 +- OpenAPI/TS28532_ProvMnS.yaml | 11 ++++++++--- OpenAPI/TS28532_StreamingDataMnS.yaml | 2 +- OpenAPI/TS28536_CoslaNrm.yaml | 2 +- OpenAPI/TS28538_EdgeNrm.yaml | 4 ++-- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml | 4 ++-- OpenAPI/TS28623_ComDefs.yaml | 4 ++-- OpenAPI/TS28623_GenericNrm.yaml | 4 ++-- 18 files changed, 40 insertions(+), 35 deletions(-) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index d1b602dc1..5a86008c5 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -1,6 +1,6 @@ # 3GPP SA5 models and MnS OpenAPI definitions -(c) 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. +(c) 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML file of each API: diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 0250ccdd0..758a190c8 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA NRM - version: 17.2.0 + version: 18.0.0 description: >- OAS 3.0.1 specification of the MDA NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 8e0f871b2..670f57a03 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA Report - version: 17.2.0 + version: 18.0.0 description: >- OAS 3.0.1 specification of the MDA Report - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA Report @@ -26,6 +26,11 @@ components: $ref: '#/components/schemas/MDAOutputEntry' mDARequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + analyticsWindow: + $ref: '#/components/schemas/TimeWindow' + confidenceDegree: + type: number + format: float MDAOutputEntry: type: object @@ -33,11 +38,6 @@ components: mDAOutputIEName: type: string mdaOutputIEValue: {} - analyticsWindow: - $ref: '#/components/schemas/TimeWindow' - confidenceDegree: - type: number - format: float TimeWindow: diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index e806df534..ee7d24d29 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 17.3.0 + version: 18.0.0 description: >- OAS 3.0.1 specification of the AI/ML NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.105; AI/ML Management diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index 62d44a536..fdb9a540a 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -4,7 +4,7 @@ info: version: 17.2.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 7bf7ba0c8..0690f0064 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -4,7 +4,7 @@ info: version: 17.1.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS - © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_HeartbeatNtf.yaml b/OpenAPI/TS28532_HeartbeatNtf.yaml index 4fb1f6d29..4d10cac8a 100755 --- a/OpenAPI/TS28532_HeartbeatNtf.yaml +++ b/OpenAPI/TS28532_HeartbeatNtf.yaml @@ -4,7 +4,7 @@ info: version: 17.1.0 description: >- OAS 3.0.1 definition of the heartbeat notification - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_PerfMnS.yaml b/OpenAPI/TS28532_PerfMnS.yaml index d75bcdc22..c2eabb541 100644 --- a/OpenAPI/TS28532_PerfMnS.yaml +++ b/OpenAPI/TS28532_PerfMnS.yaml @@ -4,7 +4,7 @@ info: version: 17.1.0 description: >- OAS 3.0.1 definition of the Performance Threshold Monitoring MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 959349fdc..f2cacf0ed 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 17.2.0 + version: 17.5.0 description: >- OAS 3.0.1 definition of the Provisioning MnS - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services @@ -396,6 +396,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' + - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' Scope: type: object properties: @@ -507,4 +508,8 @@ components: type: string path: type: string - value: {} + value: + nullable: true + required: + - op + - path diff --git a/OpenAPI/TS28532_StreamingDataMnS.yaml b/OpenAPI/TS28532_StreamingDataMnS.yaml index 3d1e82ef2..ef587dac1 100755 --- a/OpenAPI/TS28532_StreamingDataMnS.yaml +++ b/OpenAPI/TS28532_StreamingDataMnS.yaml @@ -4,7 +4,7 @@ info: version: 17.1.0 description: >- OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS) - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. servers: - url: '{MnSRoot}/StreamingDataReportingMnS/{MnSVersion}' diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 7545b1282..3ae269c54 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -5,7 +5,7 @@ info: version: 17.3.0 description: >- OAS 3.0.1 specification of the Cosla NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 75dc8c0d1..8500267e7 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the Edge NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.538; Edge NRM diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index cee4bdd3b..01955c331 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 specification of the 5GC NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, 5GC NRM diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index a8af4bf15..9ba9997e3 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 specification of the NR NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, NR NRM diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2e74dfd6a..2803d6d87 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.3.0 + version: 18.4.0 description: >- OAS 3.0.1 specification of the Slice NRM - @ 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, Slice NRM diff --git a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml index 973f2820b..7de08a785 100755 --- a/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml +++ b/OpenAPI/TS28550_PerfMeasJobCtrlMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: TS 28.550 Performance Measurement Job Control Service - version: 17.1.0 + version: 18.1.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). + @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.550 Performance assurance diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index e0a125724..eb9723510 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM; Common type definitions diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3152c0754..f6522edc4 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 definition of the Generic NRM - © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM -- GitLab From 94673363c4d2b30a6510e78408c0887c88e27e03 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 7 Jun 2023 04:28:33 +0000 Subject: [PATCH 30/30] cleanup for inconsistent finding. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 01955c331..7eeb11a6c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1425,18 +1425,6 @@ components: $ref: '#/components/schemas/PlmnRange' minItems: 1 - LogicalInterfaceInfo: - type: object - properties: - logicalInterfaceType: - type: string - enum: - - VLAN - - MPLS - - Segment - logicalInterfaceId: - type: string - DccfInfo: description: Specific Data for DCCF type: object @@ -3852,7 +3840,7 @@ components: - $ref: '#/components/schemas/EP_N40-Single' - $ref: '#/components/schemas/EP_N41-Single' - $ref: '#/components/schemas/EP_N42-Single' - + - $ref: '#/components/schemas/EP_N58-Single' - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' -- GitLab