From d50f2a4a316a4ea87a313d26669f48d395b8ef3d Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 06:42:47 +0000 Subject: [PATCH 01/70] CR0870 fix IpAddr definition and reference, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 15125e2b0..fb3a37b93 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -587,16 +587,6 @@ components: type: array items: $ref: '#/components/schemas/DnnSmfInfoItem' - - IpAddr: - type: object - properties: - ipv4Addr: - type: string - ipv6Addr: - type: string - ipv6Prefix: - type: string 5GCNfConnEcmInfoList: type: array @@ -1383,7 +1373,7 @@ components: pgwAddrList: type: array items: - $ref: '#/components/schemas/IpAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' accessType: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' priority: -- GitLab From 7bb2f5237161478d64a44f9dcf47feb63ae1fb15 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:36:41 +0000 Subject: [PATCH 02/70] CR0862 AFFunction NRM, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 57 +++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 15125e2b0..78f980373 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1136,6 +1136,33 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + TrustAfInfo: + description: Information of a trusted AF Instance + type: object + properties: + sNssaiInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiInfoItem' + minItems: 1 + afEvents: + type: array + items: + $ref: '#/components/schemas/AfEvent' + minItems: 1 + appIds: + type: array + items: + type: string + minItems: 1 + internalGroupId: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/GroupId' + minItems: 1 + mappingInd: + type: boolean + default: False #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1236,6 +1263,8 @@ components: $ref: '#/components/schemas/EcmConnectionInfo-Multiple' EASDFFunction: $ref: '#/components/schemas/EASDFFunction-Multiple' + AFFunction: + $ref: '#/components/schemas/AfFunction-Multiple' AmfFunction-Single: allOf: @@ -2810,6 +2839,26 @@ components: type: array items: $ref: '#/components/schemas/PccRule' + + AfFunction-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: + plmnIdList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + trustAfInfo: + $ref: '#/components/schemas/TrustAfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -3089,9 +3138,10 @@ components: type: array items: $ref: '#/components/schemas/EcmConnectionInfo-Single' - - - + AfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3178,4 +3228,5 @@ components: - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' - $ref: '#/components/schemas/EcmConnectionInfo-Single' + - $ref: '#/components/schemas/AfFunction-Single' -- GitLab From e0edca663ae0b99cd53f882d92a2bb6222b15609 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:48:07 +0000 Subject: [PATCH 03/70] CR0861 LMFFunction NRM enhancement, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 81 +++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 15125e2b0..6b80fe574 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1136,6 +1136,85 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + ExternalClientType: + description: Indicates types of External Clients. + anyOf: + - type: string + enum: + - EMERGENCY_SERVICES + - VALUE_ADDED_SERVICES + - PLMN_OPERATOR_SERVICES + - LAWFUL_INTERCEPT_SERVICES + - PLMN_OPERATOR_BROADCAST_SERVICES + - PLMN_OPERATOR_OM + - PLMN_OPERATOR_ANONYMOUS_STATISTICS + - PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT + - type: string + SupportedGADShapes: + description: Indicates supported GAD shapes. + anyOf: + - type: string + enum: + - POINT + - POINT_UNCERTAINTY_CIRCLE + - POINT_UNCERTAINTY_ELLIPSE + - POLYGON + - POINT_ALTITUDE + - POINT_ALTITUDE_UNCERTAINTY + - ELLIPSOID_ARC + - LOCAL_2D_POINT_UNCERTAINTY_ELLIPSE + - LOCAL_3D_POINT_UNCERTAINTY_ELLIPSOID + - type: string + AnNodeType: + description: Access Network Node Type (gNB, ng-eNB...) + anyOf: + - type: string + enum: + - GNB + - NG_ENB + - type: string + + LmfInfo: + description: Information of an LMF NF Instance + type: object + properties: + servingClientTypes: + type: array + items: + $ref: '#/components/schemas/ExternalClientType' + minItems: 1 + lmfId: + type: string + servingAccessTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' + minItems: 1 + servingAnNodeTypes: + type: array + items: + $ref: '#/components/schemas/AnNodeType' + minItems: 1 + servingRatTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/RatType' + 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 + supportedGADShapes: + type: array + items: + $ref: '#/components/schemas/SupportedGADShapes' + minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1802,6 +1881,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + lmfInfo: + $ref: '#/components/schemas/LmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 760fe1f5b962d66bd9553b67f339d51b2418c7c9 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:51:46 +0000 Subject: [PATCH 04/70] CR0859 SMSFFunction NRM enhancement, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 15125e2b0..937811f24 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1136,6 +1136,33 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + PlmnRange: + description: Range of PLMN IDs + type: object + oneOf: + - required: [ start, end ] + - required: [ pattern ] + properties: + start: + type: string + pattern: '^[0-9]{3}[0-9]{2,3}$' + end: + type: string + pattern: '^[0-9]{3}[0-9]{2,3}$' + pattern: + type: string + + SmsfInfo: + description: Specific Data for SMSF + type: object + properties: + roamingUeInd: + type: boolean + remotePlmnRangeList: + type: array + items: + $ref: '#/components/schemas/PlmnRange' + minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1777,6 +1804,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + smsfInfo: + $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 53455f6c692846bb07cfbafc6d168cab8fa0d7bf Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 17 Feb 2023 07:12:21 +0000 Subject: [PATCH 05/70] adding EP_N5, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 78f980373..21c6b5bb7 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2859,6 +2859,10 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N5: + $ref: '#/components/schemas/EP_N5-Multiple' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From c40eae6c622ec8bb4dc6ef21ea8dc4bb21a6abc7 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 17 Feb 2023 15:39:52 +0000 Subject: [PATCH 06/70] CR0860 NRF NRM --- OpenAPI/TS28541_5GcNrm.yaml | 275 ++++++++++++++++++++++++++++---- OpenAPI/TS29571_CommonData.yaml | 19 ++- 2 files changed, 265 insertions(+), 29 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 15125e2b0..90cccac7c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1136,6 +1136,249 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + UdrInfo: + description: Information of an UDR NF Instance + type: object + properties: + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + supportedDataSets: + type: array + items: + $ref: '#/components/schemas/DataSetId' + minItems: 1 + sharedDataIdRanges: + type: array + items: + $ref: '#/components/schemas/SharedDataIdRange' + minItems: 1 + + UdmInfo: + description: Information of an UDM NF Instance + type: object + properties: + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + routingIndicators: + type: array + items: + type: string + pattern: '^[0-9]{1,4}$' + minItems: 1 + internalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/InternalGroupIdRange' + minItems: 1 + suciInfos: + type: array + items: + $ref: '#/components/schemas/SuciInfo' + minItems: 1 + 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 + servedUdrInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdrInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + 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 + servedUdmInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdmInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + 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 + servedAusfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AusfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + 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 + servedNwdafInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + type: object + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/NwdafInfo' + minProperties: 1 + 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 + servedUdsfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UdsfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedScpInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/ScpInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedSeppInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/SeppInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedEasdfInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + type: object + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/EasdfInfo' + 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 + +# note to code moderator: the following are only dummy xxxInfo for validation, actual definition are from new CR as below +# CR0861 TS28.541 Rel-18 NRM enhancements for LMFFunction (LmfInfo) +# CR0862 TS28.541 Rel-18 NRM enhancements for AFFunction (TrustAfInfo) +# CR0863 TS28.541 Rel-18 NRM enhancements for EASDFFunction (EasdfInfo) +# CR0864 TS28.541 Rel-18 NRM enhancements for NSSAAFFunction (NssaafInfo) + LmfInfo: + type: object + properties: + dummy: + type: string + TrustAfInfo: + type: object + properties: + dummy: + type: string + EasdfInfo: + type: object + properties: + dummy: + type: string + NssaafInfo: + type: object + properties: + dummy: + type: string +# End of dummy datatype #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1634,22 +1877,8 @@ components: $ref: '#/components/schemas/CommModelList' eCSAddrConfigInfo: $ref: '#/components/schemas/ECSAddrConfigInfo' - groupId: - type: string - supiRanges: - $ref: '#/components/schemas/SupiRangeList' - gpsiRanges: - $ref: '#/components/schemas/IdentityRangeList' - externalGroupIdentifiersRanges: - $ref: '#/components/schemas/IdentityRangeList' - routingIndicators: - type: array - items: - type: string - internalGroupIdentifiersRanges: - $ref: '#/components/schemas/InternalGroupIdRangeList' - suciInfos: - $ref: '#/components/schemas/SuciInfoList' + udmInfo: + $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1675,18 +1904,8 @@ components: type: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' - groupId: - type: string - supiRanges: - $ref: '#/components/schemas/SupiRangeList' - gpsiRanges: - $ref: '#/components/schemas/IdentityRangeList' - externalGroupIdentifiersRanges: - $ref: '#/components/schemas/IdentityRangeList' - supportedDataSets: - $ref: '#/components/schemas/SupportedDataSetList' - sharedDataIdRanges: - $ref: '#/components/schemas/SharedDataIdRangeList' + udrInfo: + $ref: '#/components/schemas/UdrInfo' UdsfFunction-Single: allOf: diff --git a/OpenAPI/TS29571_CommonData.yaml b/OpenAPI/TS29571_CommonData.yaml index 76cf71d61..86a4a4de6 100644 --- a/OpenAPI/TS29571_CommonData.yaml +++ b/OpenAPI/TS29571_CommonData.yaml @@ -1,4 +1,4 @@ -##### Special note: CT R16 local copy for SA5 OAM Forge branch only, it shall not be used otherwise. S5-222029 on 4.4.2022 +##### Special note: CT R16 local copy for SA5 OAM Forge branch only, it shall not be used otherwise. S5-222029 on 4.4.2022. Updated to sync with 1.5.0 for SA5#147 (17.02.2023) openapi: 3.0.0 info: @@ -217,6 +217,23 @@ components: TimeOfDay: type: string description: String with format partial-time or full-time as defined in clause 5.6 of IETF RFC 3339. Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC). + EmptyObject: + description: Empty JSON object { }, it is defined with the keyword additionalProperties false + type: object + additionalProperties: false + + Fqdn: + description: Fully Qualified Domain Name + type: string + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 + + FqdnRm: + description: Fully Qualified Domain Name, but it also allows the null value + anyOf: + - $ref: '#/components/schemas/Fqdn' + - $ref: '#/components/schemas/NullValue' # # COMMON ENUMERATED DATA TYPES # -- GitLab From f58b8357ad078c8f1724418c6d459a5f0b52eaf1 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 17 Feb 2023 15:52:44 +0000 Subject: [PATCH 07/70] validation fix Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 90cccac7c..549c8652b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1153,20 +1153,11 @@ components: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: - type: array - items: - $ref: '#/components/schemas/IdentityRange' - minItems: 1 + $ref: '#/components/schemas/IdentityRangeList' supportedDataSets: - type: array - items: - $ref: '#/components/schemas/DataSetId' - minItems: 1 + $ref: '#/components/schemas/SupportedDataSetList' sharedDataIdRanges: - type: array - items: - $ref: '#/components/schemas/SharedDataIdRange' - minItems: 1 + $ref: '#/components/schemas/SharedDataIdRangeList' UdmInfo: description: Information of an UDM NF Instance -- GitLab From facfec8b0b57279cfbeb6f4eb4e326e8ff10d64d Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 3 Mar 2023 10:02:04 +0000 Subject: [PATCH 08/70] updated as per the agreed change during the meeting. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 174 ------------------------------------ 1 file changed, 174 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 549c8652b..62374dd58 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1196,180 +1196,6 @@ components: items: $ref: '#/components/schemas/SuciInfo' minItems: 1 - 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 - servedUdrInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - description: A map (list of key-value pairs) where a valid JSON string serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/UdrInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - 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 - servedUdmInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - description: A map (list of key-value pairs) where a valid JSON string serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/UdmInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - 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 - servedAusfInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - description: A map (list of key-value pairs) where a valid JSON string serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/AusfInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - 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 - servedNwdafInfoList: - type: object - description: A map (list of key-value pairs) where NF Instance Id serves as key - additionalProperties: - type: object - description: A map (list of key-value pairs) where a valid JSON string serves as key - additionalProperties: - $ref: '#/components/schemas/NwdafInfo' - minProperties: 1 - 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 - servedUdsfInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - description: A map (list of key-value pairs) where a valid JSON string serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/UdsfInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - minProperties: 1 - servedScpInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/ScpInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - servedSeppInfoList: - description: A map (list of key-value pairs) where nfInstanceId serves as key - type: object - additionalProperties: - anyOf: - - $ref: '#/components/schemas/SeppInfo' - - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - minProperties: 1 - servedEasdfInfoList: - type: object - description: A map (list of key-value pairs) where NF Instance Id serves as key - additionalProperties: - type: object - description: A map (list of key-value pairs) where a valid JSON string serves as key - additionalProperties: - $ref: '#/components/schemas/EasdfInfo' - 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 - -# note to code moderator: the following are only dummy xxxInfo for validation, actual definition are from new CR as below -# CR0861 TS28.541 Rel-18 NRM enhancements for LMFFunction (LmfInfo) -# CR0862 TS28.541 Rel-18 NRM enhancements for AFFunction (TrustAfInfo) -# CR0863 TS28.541 Rel-18 NRM enhancements for EASDFFunction (EasdfInfo) -# CR0864 TS28.541 Rel-18 NRM enhancements for NSSAAFFunction (NssaafInfo) - LmfInfo: - type: object - properties: - dummy: - type: string - TrustAfInfo: - type: object - properties: - dummy: - type: string - EasdfInfo: - type: object - properties: - dummy: - type: string - NssaafInfo: - type: object - properties: - dummy: - type: string -# End of dummy datatype #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: -- GitLab From d6e0b59272605d4b337a0c530d520b58723a5d5f Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 04:17:49 +0000 Subject: [PATCH 09/70] CR0223 IpAddr fix, Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 70a9630d2..de0cc05af 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -133,6 +133,7 @@ components: oneOf: - $ref: '#/components/schemas/Ipv4Addr' - $ref: '#/components/schemas/Ipv6Addr' + - $ref: '#/components/schemas/Ipv6Prefix' HostAddr: # This definition will be deprecated, when all occurances of HostAddr # are replaced by Host. -- GitLab From 7b934d2e65c33f33e4ed0b9d2f95169289caac40 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 08:06:33 +0000 Subject: [PATCH 10/70] CR0867 fix redundant definition, and impact to IntentNrm and EdgeNrm --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 20 ++++++++++---------- OpenAPI/TS28541_NrNrm.yaml | 26 ++++++++------------------ 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 54a5bc028..f6e77381f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -484,7 +484,7 @@ components: contextValueRange: type: array items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnId" + $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" NRFqBandContext: type: object diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 91f638a44..fdd59687d 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -31,7 +31,7 @@ components: trackingAreaIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' servingPLMN: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' GeoLoc: type: object properties: diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index fb3a37b93..4fef4d884 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -67,7 +67,7 @@ components: nFStatus: $ref: '#/components/schemas/NFStatus' plmn: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: @@ -101,7 +101,7 @@ components: apiPrfix: type: string allowedPlmns: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedNfTypes: type: array items: @@ -212,7 +212,7 @@ components: allowedPLMNs: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedSNPNs: type: array items: @@ -544,7 +544,7 @@ components: type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nRTACRangelist: type: array items: @@ -554,7 +554,7 @@ components: type: object properties: pLMNId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' aMFIdentifier: type: integer @@ -1833,7 +1833,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPType: $ref: '#/components/schemas/SEPPType' sEPPId: @@ -1993,7 +1993,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sBIFqdn: type: string managedNFProfile: @@ -2023,7 +2023,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sBIFqdn: type: string managedNFProfile: @@ -2120,7 +2120,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPId: type: integer fqdn: @@ -2453,7 +2453,7 @@ components: - type: object properties: remotePlmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' remoteSeppAddress: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' remoteSeppId: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 54e1117a1..ea213f8a6 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -44,25 +44,15 @@ components: sd: type: string - Mnc: - type: string - pattern: '[0-9]{3}|[0-9]{2}' - PlmnId: - type: object - properties: - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: '#/components/schemas/Mnc' PlmnIdList: type: array items: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' PlmnInfo: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' PlmnInfoList: @@ -77,7 +67,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cagidList: $ref: '#/components/schemas/cagId' nidList: @@ -117,7 +107,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' TaiList: @@ -287,7 +277,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' RrmPolicyMemberList: @@ -587,7 +577,7 @@ components: TceID: type: integer PlmnTarget: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' TceMappingInfoList: type: array items: @@ -824,7 +814,7 @@ components: gnbCuName: $ref: '#/components/schemas/GnbName' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' x2BlockList: $ref: '#/components/schemas/GGnbIdList' xnBlockList: @@ -1601,7 +1591,7 @@ components: gnbIdLength: $ref: '#/components/schemas/GnbIdLength' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 3e2eefedfb46fa35e2b8b9360b883aa0f56d407f Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:01:52 +0000 Subject: [PATCH 11/70] CR0872 ManagedNFProfile stage3 inconsistent with stage2, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 4fef4d884..44940764f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -253,6 +253,22 @@ components: type: array items: type: string + recoveryTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + nfServicePersistence: + type: boolean + nfProfileChangesSupportInd: + type: boolean + defaultNotificationSubscriptions: + type: array + items: + $ref: '#/components/schemas/DefaultNotificationSubscription' + minItems: 1 + serviceSetRecoveryTimeList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + minItems: 1 vendorId: type: string SEPPType: -- GitLab From f5257d8b3dd91e4ab7a477a493a54295834e1d6c Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:21:15 +0000 Subject: [PATCH 12/70] CR0864 NSSAAFFunction Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 48 ++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44940764f..995c33dad 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1142,6 +1142,20 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + NssaafInfo: + description: Information of a NSSAAF Instance + type: object + properties: + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + internalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/InternalGroupIdRange' + minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1242,6 +1256,8 @@ components: $ref: '#/components/schemas/EcmConnectionInfo-Multiple' EASDFFunction: $ref: '#/components/schemas/EASDFFunction-Multiple' + NSSAAFFunction: + $ref: '#/components/schemas/NssaafFunction-Multiple' AmfFunction-Single: allOf: @@ -2817,6 +2833,30 @@ components: items: $ref: '#/components/schemas/PccRule' + NssaafFunction-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 + cNSIIdList: + $ref: '#/components/schemas/CNSIIdList' + nFProfileList: + $ref: '#/components/schemas/NFProfileList' + commModelList: + $ref: '#/components/schemas/CommModelList' + nssafInfo: + $ref: '#/components/schemas/NssaafInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -3095,9 +3135,10 @@ components: type: array items: $ref: '#/components/schemas/EcmConnectionInfo-Single' - - - + NssaafFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/NssaafFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3184,4 +3225,5 @@ components: - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' - $ref: '#/components/schemas/EcmConnectionInfo-Single' + - $ref: '#/components/schemas/NssaafFunction-Single' -- GitLab From 47e905fe8915af2d1e1420348e8d6d87a29e5ca0 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 17 Feb 2023 06:43:45 +0000 Subject: [PATCH 13/70] additional change Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 995c33dad..04fbd6a7e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1332,6 +1332,8 @@ components: $ref: '#/components/schemas/EP_NLS-Multiple' EP_NLG: $ref: '#/components/schemas/EP_NLG-Multiple' + EP_N58: + $ref: '#/components/schemas/EP_N13-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1681,6 +1683,8 @@ components: $ref: '#/components/schemas/EP_N10-Multiple' EP_N13: $ref: '#/components/schemas/EP_N13-Multiple' + EP_N59: + $ref: '#/components/schemas/EP_N13-Multiple' UdrFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2856,6 +2860,35 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EP_N58-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_N59-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 ---------------------- @@ -3139,6 +3172,14 @@ components: type: array items: $ref: '#/components/schemas/NssaafFunction-Single' + EP_N58-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N58-Single' + EP_N59-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N59-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3205,6 +3246,8 @@ components: - $ref: '#/components/schemas/EP_N31-Single' - $ref: '#/components/schemas/EP_N32-Single' - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N58-Single' + - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' - $ref: '#/components/schemas/EP_N88-Single' -- GitLab From 65a06106b0014956adc19c46a398df9a779e0521 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 7 Mar 2023 11:37:29 +0000 Subject: [PATCH 14/70] 28.541 rel18 cr0863 nrm enhancements for easdf function --- OpenAPI/TS28541_5GcNrm.yaml | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44940764f..57cc9d17f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1142,6 +1142,56 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + EasdfInfo: + description: Information of an EASDF NF Instance + type: object + properties: + sNssaiEasdfInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiEasdfInfoItem' + minItems: 1 + easdfN6IpAddressList: + type: array + items: + $ref: '#/components/schemas/IpAddr' + minItems: 1 + upfN6IpAddressList: + type: array + items: + $ref: '#/components/schemas/IpAddr' + minItems: 1 + + SnssaiEasdfInfoItem: + description: Set of parameters supported by EASDF for a given S-NSSAI + type: object + required: + - sNssai + - dnnEasdfInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnEasdfInfoList: + type: array + items: + $ref: '#/components/schemas/DnnEasdfInfoItem' + minItems: 1 + + DnnEasdfInfoItem: + description: Set of parameters supported by EASDF for a given DNN + type: object + required: + - dnn + properties: + dnn: + anyOf: + - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + dnaiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -2046,6 +2096,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' serverAddr: type: string + easdfInfo: + $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 54d48ea1bb05d10f8e4d47b099c02a9e3e6b197f Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 7 Mar 2023 11:39:33 +0000 Subject: [PATCH 15/70] Fix IpAddr Reference as that in base branch has been updated. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 57cc9d17f..5e8919ede 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1154,12 +1154,12 @@ components: easdfN6IpAddressList: type: array items: - $ref: '#/components/schemas/IpAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 upfN6IpAddressList: type: array items: - $ref: '#/components/schemas/IpAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 SnssaiEasdfInfoItem: -- GitLab From 79189dafaedd2a179ed8553ff1491122e3504b8d Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 7 Mar 2023 13:02:52 +0000 Subject: [PATCH 16/70] Fix validation issue from merge, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b352c1306..364240c2e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3273,7 +3273,6 @@ components: type: array items: $ref: '#/components/schemas/EcmConnectionInfo-Single' -<<<<<<< HEAD NssaafFunction-Multiple: type: array items: @@ -3286,12 +3285,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N59-Single' -======= AfFunction-Multiple: type: array items: $ref: '#/components/schemas/AfFunction-Single' ->>>>>>> 28.541_Rel18_CR0862_NRM_enhancements_for_AFFunction #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3380,9 +3377,6 @@ components: - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' - $ref: '#/components/schemas/EcmConnectionInfo-Single' -<<<<<<< HEAD - $ref: '#/components/schemas/NssaafFunction-Single' -======= - $ref: '#/components/schemas/AfFunction-Single' ->>>>>>> 28.541_Rel18_CR0862_NRM_enhancements_for_AFFunction -- GitLab From 4a303895e3ead6405bf8884ab210e345e8bedf3b Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Tue, 14 Feb 2023 16:38:57 +0000 Subject: [PATCH 17/70] CR0857 - delete duplicate SST from RANSliceSubnetProfile and TopSliceSubnetProfile --- OpenAPI/TS28541_SliceNrm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index d1d15e7ef..5ca23564f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -374,8 +374,6 @@ components: type: integer reliability: type: number - sST: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLMaxPktSize: type: integer uLMaxPktSize: @@ -449,8 +447,6 @@ components: type: integer reliability: type: number - sST: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: -- GitLab From f249a4e5c34b3525d83fa1055eed6af88cdd5578 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 15 Feb 2023 08:39:51 +0000 Subject: [PATCH 18/70] Adding altitude to ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index de0cc05af..e0e926b6c 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -78,6 +78,8 @@ components: $ref: '#/components/schemas/Latitude' longitude: $ref: '#/components/schemas/Longitude' + altitude: + $ref: '#/components/schemas/Float' ConvexGeoPolygon: type: array items: -- GitLab From 83d06df0b5f64b013eec36b71c737289ba88266d Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 17 Feb 2023 17:44:27 +0000 Subject: [PATCH 19/70] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 98ceba531..431a4c56d 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -194,7 +194,7 @@ components: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - STREAM_BASED - monitorGranularityPeriods: + reportingPeriods: type: array items: type: integer -- GitLab From c9ae41a6a400d0d5927531eeaab3e5dc961abcd2 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 2 Mar 2023 23:52:01 +0000 Subject: [PATCH 20/70] Update _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 72c892906..558e8a86f 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -55,6 +55,7 @@ module _3gpp-common-measurements { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-02-16 { reference "CR-0240"; } revision 2022-11-04 { reference "CR-0212 CR-0194"; } revision 2022-10-24 { reference CR-0196; } revision 2022-09-30 { reference CR-0191; } @@ -195,6 +196,8 @@ module _3gpp-common-measurements { range 1..max ; } units seconds; + description "Granularity periods supported for the associated + measurement types. The period is defined in seconds."; } leaf-list reportingMethods { @@ -206,13 +209,13 @@ module _3gpp-common-measurements { min-elements 1; } - leaf-list monitorGranularityPeriods { + leaf-list reportingPeriods { type uint32 { range 1..max ; } units seconds; - description "Granularity periods supported for the monitoring of - associated measurement types for thresholds"; + description "Reporting periods supported for the associated + measurement types. The period is defined in seconds."; } } } @@ -320,6 +323,7 @@ module _3gpp-common-measurements { min-elements 1; leaf idx { type uint32 ; } uses ThresholdInfoGrp; + description "List of threshold info."; } leaf monitorGranularityPeriod { @@ -457,6 +461,9 @@ module _3gpp-common-measurements { A threshold monitor checks for threshold crossings of performance metric values and generates a notification when that happens. + The ThresholdMonitor is used only when NRM based threshold + monitoring is supported. + To activate threshold monitoring, a MnS consumer needs to create a ThresholdMonitor instance on the MnS producer. For ultimate deactivation of threshold monitoring, the MnS consumer should delete the monitor to @@ -488,6 +495,8 @@ module _3gpp-common-measurements { Multiple thresholds can be defined for multiple performance metric sets in a single monitor using thresholdInfoList. The attribute monitorGranularityPeriod defines the granularity period to be applied. + The value is a multiple of a supported granularity period for the + measurements being monitored. Each threshold is identified with a number (key) called thresholdLevel. A threshold is defined using the attributes thresholdValue , @@ -527,4 +536,4 @@ module _3gpp-common-measurements { } } } -} \ No newline at end of file +} -- GitLab From bf2f8aba554d3e01be4f08f8ee70b9fc9b00a15c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 17 Feb 2023 07:06:09 +0000 Subject: [PATCH 21/70] Update OpenAPI/TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ea213f8a6..ae1133003 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -720,6 +720,10 @@ components: $ref: '#/components/schemas/GnbIdLength' rimRSReportConf: $ref: '#/components/schemas/RimRSReportConf' + configurable5QISetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + dynamic5QISetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -741,6 +745,10 @@ components: $ref: '#/components/schemas/OperatorDu-Multiple' BWPSet: $ref: '#/components/schemas/BWPSet-Multiple' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' OperatorDu-Single: allOf: @@ -797,6 +805,11 @@ components: $ref: '#/components/schemas/EP_X2U-Multiple' EP_S1U: $ref: '#/components/schemas/EP_S1U-Multiple' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + GnbCuCpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -864,6 +877,10 @@ components: $ref: '#/components/schemas/DMROFunction-Single' DLBOFunction: $ref: '#/components/schemas/DLBOFunction-Single' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' NrCellCu-Single: allOf: -- GitLab From b2382149accbea154b88e2cdbb74711e243627d9 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 3 Mar 2023 06:13:03 +0000 Subject: [PATCH 22/70] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 431a4c56d..2d4f38df1 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1683,8 +1683,6 @@ components: $ref: '#/components/schemas/traceDepth-Type' traceReference: $ref: '#/components/schemas/traceReference-Type' - traceRecordingSessionReference: - type: string jobId: type: string traceReportingFormat: -- GitLab From 9119dc7a5636651087e4e55af19a0d864d04c4e6 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 2 Mar 2023 14:52:45 +0000 Subject: [PATCH 23/70] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 5ca23564f..ea52ce68b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -513,8 +513,10 @@ components: $ref: '#/components/schemas/UserMgmtOpen' v2XCommModels: $ref: '#/components/schemas/V2XCommModels' - coverageArea: - type: string + coverageAreas: + type: array + items: + type: string termDensity: $ref: '#/components/schemas/TermDensity' activityFactor: -- GitLab From 0bcad512654bfa532f89ce5ab63f7892aaa38cd3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:55:31 +0000 Subject: [PATCH 24/70] Update the version to align with the latest version --- 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 eb4708988..aaf8bc79f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 56cb98ed7206c7c1a13e6d2e987537bb5a2d6485 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:56:06 +0000 Subject: [PATCH 25/70] Update the version to align with the latest version --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ae1133003..973445b50 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the NR NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From e4cce0ff8eb0a594f00a0cd6850b2a5f638b4868 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:56:35 +0000 Subject: [PATCH 26/70] Update the version to align with the latest version --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index ea52ce68b..3f363913d 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 07704d3e744e2bed1e665ea7482711150adc2da2 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:57:10 +0000 Subject: [PATCH 27/70] Update the version to align with the latest version --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index e0e926b6c..c54fc8107 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.1.0 + version: 18.2.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). -- GitLab From e479c397a862ab52bf9cc7bd70676f21704bbd8e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:57:21 +0000 Subject: [PATCH 28/70] Update the version to align with the latest version --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 2d4f38df1..b0d7caec8 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 6b81935ab6a3b7fd4aded3acee80ca43d3db4154 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:58:37 +0000 Subject: [PATCH 29/70] Replace TS28104_MdaNrm.yaml with the latest R17 YAML file --- OpenAPI/TS28104_MdaNrm.yaml | 67 +++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index b74804c5e..0250ccdd0 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 17.0.0 + version: 17.2.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -43,11 +43,9 @@ components: filterValue: type: string threshold: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdInfo' analyticsPeriod: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: '#/components/schemas/AnalyticsSchedule' timeOut: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' @@ -61,7 +59,7 @@ components: ReportingTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - AnalyticsScope: + AnalyticsScopeType: oneOf: - type: object properties: @@ -70,32 +68,43 @@ components: - type: object properties: areaScope: - $ref: '#/components/schemas/GeoAreaList' - - GeoAreaList: - type: array - items: - $ref: '#/components/schemas/GeoArea' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - GeoArea: - type: object - properties: - coordinates: - type: array - items: - $ref: '#/components/schemas/Coordinate' - altitude: - type: number - format: float + AnalyticsSchedule: + oneOf: + - type: object + properties: + timeDurations: + type: array + items: + $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow' + - type: object + properties: + granularityPeriod: + type: integer - Coordinate: + ThresholdInfo: type: object properties: - latitude: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude' - longitude: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude' - + monitoredMDAOutputIE: + type: string + thresholdDirection: + type: string + enum: + - UP + - DOWN + - UP_AND_DOWN + thresholdValue: + oneOf: + - type: integer + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + hysteresis: + oneOf: + - type: integer + minimum: 0 + - type: number + format: float + minimum: 0 #-------- Definition of abstract IOCs -------------------------------------------- @@ -170,7 +179,7 @@ components: reportingTarget: $ref: '#/components/schemas/ReportingTarget' analyticsScope: - $ref: '#/components/schemas/AnalyticsScope' + $ref: '#/components/schemas/AnalyticsScopeType' startTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' stopTime: -- GitLab From aa630b29147eb39fbb97be11c1cabb94632c7dd5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:19:21 +0000 Subject: [PATCH 30/70] Replace TS28104_MdaReport.yaml with the yaml file in the latest R17 branch --- OpenAPI/TS28104_MdaReport.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 3f8dcf237..8e0f871b2 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 17.0.0 + version: 17.2.0 description: >- OAS 3.0.1 specification of the MDA Report © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -43,9 +43,9 @@ components: TimeWindow: type: object properties: - startTime: + mDAOutputStartTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - endTime: + mDAOutputEndTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' -- GitLab From d72a1e783ca1e9e02552b7cc2c235a9ed0780c2e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:22:58 +0000 Subject: [PATCH 31/70] Replace TS28105_AiMlNrm.yaml with the latest yaml file from R17 branch --- OpenAPI/TS28105_AiMlNrm.yaml | 109 ++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 47 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index a4afbb619..77b62f530 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 17.0.0 + version: 17.3.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -15,26 +15,34 @@ components: #-------- Definition of types----------------------------------------------------- - AIMLEntityList: + MLEntityList: type: array items: - $ref: '#/components/schemas/AIMLEntity' + $ref: '#/components/schemas/MLEntity' - AIMLEntity: + MLEntity: type: object properties: - aIMLEntityId: + mLEntityId: type: string inferenceType: type: string - aIMLEntityVersion: + mLEntityVersion: type: string expectedRunTimeContext: - type: string + $ref: '#/components/schemas/MLContext' trainingContext: - type: string + $ref: '#/components/schemas/MLContext' runTimeContext: - type: string + $ref: '#/components/schemas/MLContext' + + MLContext: + type: object + properties: + inferenceEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + dataProviderRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' RequestStatus: type: string @@ -66,10 +74,10 @@ components: TrainingProcessMonitor: description: >- - This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "AIMLTrainingProcess". + This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLTrainingProcess". type: object properties: - aIMLTrainingProcessId: + mLTrainingProcessId: type: string status: type: string @@ -112,8 +120,8 @@ components: $ref: '#/components/schemas/SubNetwork-Multiple' ManagedElement: $ref: '#/components/schemas/ManagedElement-Multiple' - AIMLTrainingFunction: - $ref: '#/components/schemas/AIMLTrainingFunction-Multiple' + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' ManagedElement-Single: allOf: @@ -125,10 +133,10 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO' - type: object properties: - AIMLTrainingFunction: - $ref: '#/components/schemas/AIMLTrainingFunction-Multiple' + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' - AIMLTrainingFunction-Single: + MLTrainingFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -138,19 +146,19 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - aIMLEntityList: - $ref: '#/components/schemas/AIMLEntityList' + mLEntityList: + $ref: '#/components/schemas/MLEntityList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - AIMLTrainingRequest: - $ref: '#/components/schemas/AIMLTrainingRequest-Multiple' - AIMLTrainingProcess: - $ref: '#/components/schemas/AIMLTrainingProcess-Multiple' - AIMLTrainingReport: - $ref: '#/components/schemas/AIMLTrainingReport-Multiple' + MLTrainingRequest: + $ref: '#/components/schemas/MLTrainingRequest-Multiple' + MLTrainingProcess: + $ref: '#/components/schemas/MLTrainingProcess-Multiple' + MLTrainingReport: + $ref: '#/components/schemas/MLTrainingReport-Multiple' - AIMLTrainingRequest-Single: + MLTrainingRequest-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -159,21 +167,21 @@ components: allOf: - type: object properties: - aIMLEntityId: + mLEntityId: type: string - candidateTraingDataSource: + candidateTrainingDataSource: type: array items: type: string - traingDataQualityScore: + trainingDataQualityScore: type: number format: float trainingRequestSource: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' requestStatus: $ref: '#/components/schemas/RequestStatus' expectedRuntimeContext: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: '#/components/schemas/MLContext' performanceRequirements: $ref: '#/components/schemas/PerformanceRequirements' cancelRequest: @@ -181,7 +189,7 @@ components: suspendRequest: type: boolean - AIMLTrainingProcess-Single: + MLTrainingProcess-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -190,7 +198,7 @@ components: allOf: - type: object properties: - aIMLTrainingProcessId: + mLTrainingProcessId: type: string priority: type: integer @@ -208,7 +216,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - AIMLTrainingReport-Single: + MLTrainingReport-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -217,7 +225,7 @@ components: allOf: - type: object properties: - aIMLEntityId: + mLEntityId: type: string areConsumerTrainingDataUsed: type: boolean @@ -233,7 +241,14 @@ components: $ref: '#/components/schemas/ModelPerformance' areNewTrainingDataUsed: type: boolean - + trainingRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + trainingProcessRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + trainingReportRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + lastTrainingRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -245,22 +260,22 @@ components: type: array items: $ref: '#/components/schemas/ManagedElement-Single' - AIMLTrainingFunction-Multiple: + MLTrainingFunction-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingFunction-Single' - AIMLTrainingRequest-Multiple: + $ref: '#/components/schemas/MLTrainingFunction-Single' + MLTrainingRequest-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingRequest-Single' - AIMLTrainingProcess-Multiple: + $ref: '#/components/schemas/MLTrainingRequest-Single' + MLTrainingProcess-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingProcess-Single' - AIMLTrainingReport-Multiple: + $ref: '#/components/schemas/MLTrainingProcess-Single' + MLTrainingReport-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingReport-Single' + $ref: '#/components/schemas/MLTrainingReport-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -270,7 +285,7 @@ components: - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' - - $ref: '#/components/schemas/AIMLTrainingFunction-Single' - - $ref: '#/components/schemas/AIMLTrainingRequest-Single' - - $ref: '#/components/schemas/AIMLTrainingProcess-Single' - - $ref: '#/components/schemas/AIMLTrainingReport-Single' + - $ref: '#/components/schemas/MLTrainingFunction-Single' + - $ref: '#/components/schemas/MLTrainingRequest-Single' + - $ref: '#/components/schemas/MLTrainingProcess-Single' + - $ref: '#/components/schemas/MLTrainingReport-Single' -- GitLab From 7df630ad24da7ffd38fbd525353dfd2322927b1c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:24:12 +0000 Subject: [PATCH 32/70] Replace TS28312_IntentNrm.yaml with the latest yaml file from R17 branch --- OpenAPI/TS28312_IntentNrm.yaml | 440 ++++++++++++++++++++++++--------- 1 file changed, 321 insertions(+), 119 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index f6e77381f..a9fb33655 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.0.0 + version: 17.3.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,23 @@ externalDocs: paths: {} components: schemas: + + #-------Definition of concrete IOCs ----------# + + SubNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + Intent: + $ref: '#/components/schemas/Intent-Multiple' Intent-Single: allOf: @@ -23,14 +40,23 @@ components: intentExpectations: type: array items: - $ref: "#/components/schemas/IntentExpectation" + type: object + oneOf: + - $ref: "#/components/schemas/IntentExpectation" + - $ref: "#/components/schemas/RadioNetworkExpectation" + - $ref: "#/components/schemas/ServiceSupportExpectation" intentContexts: type: array items: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" + #-------Definition of concrete IOCs ----------# + + #-------Definition of the IntentExpectation dataType ----------# IntentExpectation: + description: >- + This data type is the "IntentExpectation" data type without specialisations type: object properties: expectationId: @@ -50,15 +76,88 @@ components: items: $ref: "#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - + $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 ----------# + + #-------Definition of the ExpectationObject dataType ----------# ExpectationObject: + description: >- + This data type is the "ExpectationObject" data type without specialisations type: object properties: objectType: type: string enum: - - RAN_SubNetwrok #value for Radio Network Expectation--# + - RAN_SubNetwork #value for Radio Network Expectation--# - Service_Support #value for Service Support Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: @@ -66,84 +165,69 @@ components: objectContexts: type: array items: - $ref: "#/components/schemas/ObjectContext" - - ExpectationTarget: - oneOf: - #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # - - $ref: "#/components/schemas/WeakRSRPRatioTarget" - - $ref: "#/components/schemas/LowSINRRatioTarget" - - $ref: "#/components/schemas/AveULRANUEThptTarget" - - $ref: "#/components/schemas/AveDLRANUEThptTarget" - - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" - #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # - #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- # - - $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" - #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- # - #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# - #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# - - - ObjectContext: - oneOf: - #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# - - $ref: "#/components/schemas/CoverageAreaPolygonContext" - - $ref: "#/components/schemas/CoverageTACContext" - - $ref: "#/components/schemas/PLMNContext" - - $ref: "#/components/schemas/NRFqBandContext" - - $ref: "#/components/schemas/RATContext" - #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# - #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------# - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - - $ref: "#/components/schemas/CoverageAreaTAContext" - #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------# - - #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# - #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# - - - ExpectationContext: - oneOf: - #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- # - - $ref: "#/components/schemas/ServiceStartTimeContext" - - $ref: "#/components/schemas/ServiceEndTimeContext" - - $ref: "#/components/schemas/UEMobilityLevelContext" - - $ref: "#/components/schemas/ResourceSharingLevelContext" - #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- # - - IntentContext: + $ref: "#/components/schemas/ObjectContext" + RadioNetworkExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation type: object properties: - contextAttribute: + objectType: type: string - contextCondition: - $ref: "#/components/schemas/Condition" - contextValueRange: + enum: + - RAN_SubNetwork #value for Radio Network Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: type: array items: - type: number + 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 dataType --------------# Condition: type: string enum: - - Is_equal_to - - Is_less_than - - Is_greater_than - - Is_within_the_range - + - IS_EQUAL_TO + - IS_LESS_THAN + - IS_GREATER_THAN + - IS_WITHIN_RANGE + - IS_OUTSIDE_RANGE + - IS_ONE_OF + - IS_NOT_ONE_OF + - IS_EQUAL_TO_OR_LESS_THAN + - IS_EQUAL_TO_OR_GREATER_THAN FulfilStatus: type: string enum: - FULFILLED - NOT_FULFILLED - NotFulfilledState: type: string enum: @@ -153,7 +237,6 @@ components: - SUSPENDED - TERMINATED - FULFILMENTFAILED - FulfilmentInfo: type: object properties: @@ -167,15 +250,59 @@ components: description: -> An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo type: string - ExpectationVerb: type: string enum: - DELIVER - ENSURE + #-------Definition of the generic dataType --------------# - #-------Definition of the concrete ExpectationTarget dataType----------# + #-------Definition of the IntentContext dataType --------------# + IntentContext: + description: >- + This data type is the "IntentContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number + #-------Definition of the IntentContext dataType --------------# + + #-------Definition of the ExpectationTarget dataType----------# + ExpectationTarget: + description: >- + This data type is the "ExpectationTarget" data type without specialisations + type: object + properties: + targetName: + type: string + targetCondition: + $ref: "#/components/schemas/Condition" + targetValueRange: + type: number + targetContexts: + type: array + items: + $ref: "#/components/schemas/TargetContext" + TargetContext: + description: >- + This data type is the "TargetContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $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: @@ -185,7 +312,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -194,8 +321,9 @@ components: $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: @@ -205,11 +333,12 @@ components: contextCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN contextValueRange: type: number - LowSINRRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget type: object properties: targetName: @@ -219,7 +348,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -228,8 +357,9 @@ components: $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: @@ -239,11 +369,12 @@ components: contextCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN contextValueRange: type: integer - AveULRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget type: object properties: targetName: @@ -253,13 +384,14 @@ components: targetCondition: type: string enum: - - Is_greater_than + - 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: @@ -269,13 +401,14 @@ components: targetCondition: type: string enum: - - Is_greater_than + - 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: @@ -285,7 +418,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -294,8 +427,9 @@ components: $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: @@ -308,8 +442,9 @@ components: - Is_less_than contextValueRange: type: number - LowDLRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget type: object properties: targetName: @@ -319,7 +454,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -328,8 +463,9 @@ components: $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: @@ -339,10 +475,12 @@ components: contextCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN contextValueRange: type: number DLThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget type: object properties: targetName: @@ -352,10 +490,12 @@ components: targetCondition: type: string enum: - - Is_greater_than + - 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: @@ -365,10 +505,12 @@ components: targetCondition: type: string enum: - - Is_greater_than + - 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: @@ -378,10 +520,12 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer ULLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget type: object properties: targetName: @@ -391,53 +535,73 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer MaxNumberofUEsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget type: object properties: - targetAttribute: + targetName: type: string enum: - maxNumberofUEs targetCondition: type: string enum: - - Is_less _than + - IS_LESS_THAN targetValueRange: type: integer ActivityFactorTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget type: object properties: - targetAttribute: + targetName: type: string enum: - activityFactor targetCondition: type: string enum: - - Is_equal _than + - IS_EQUAL_TO targetValueRange: type: integer UESpeedTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget type: object properties: - targetAttribute: + targetName: type: string enum: - uESpeed targetCondition: type: string enum: - - Is_less _than + - IS_LESS_THAN targetValueRange: type: integer - #-------Definition of the concrete ExpectationTarget dataType----------# - #-------Definition of the concrete ObjectTarget 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: "#/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: @@ -447,7 +611,7 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: @@ -455,6 +619,8 @@ components: CoverageArea: type: string CoverageTACContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageTACContext type: object properties: contextAttribute: @@ -464,13 +630,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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: @@ -480,13 +647,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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: @@ -496,13 +664,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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: @@ -512,7 +681,7 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: @@ -522,6 +691,8 @@ components: - EUTRAN - NR EdgeIdenfiticationIdContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext type: object properties: contextAttribute: @@ -531,12 +702,14 @@ components: contextCondition: type: string enum: - - Is_equal_than + - 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: @@ -546,12 +719,14 @@ components: contextCondition: type: string enum: - - Is_equal_than + - 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: @@ -561,17 +736,32 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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----------------# + ExpectationContext: + description: >- + This data type is the "ExpectationContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number ServiceStartTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext type: object properties: contextAttribute: @@ -581,10 +771,12 @@ components: contextCondition: type: string enum: - - Is_equal_than + - IS_EQUAL_TO contextValueRange: type: string ServiceEndTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext type: object properties: contextAttribute: @@ -594,10 +786,12 @@ components: contextCondition: type: string enum: - - Is_equal_than + - IS_EQUAL_TO contextValueRange: type: string UEMobilityLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext type: object properties: contextAttribute: @@ -607,12 +801,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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: @@ -622,7 +818,7 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: @@ -631,6 +827,11 @@ components: #------Definition of JSON arrays for name-contained IOCs ---------------# + + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' Intent-Multiple: type: array @@ -641,5 +842,6 @@ components: #----- Definitions in TS 28.312 for TS 28.532 --------------------------# resources-intentNrm: oneOf: + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/Intent-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From 60f37025f3ec7030424a3075eaaee68c79fdab1d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:25:01 +0000 Subject: [PATCH 33/70] Replace TS28532_FaultMnS.yaml with the latest yaml file from R17 branch --- OpenAPI/TS28532_FaultMnS.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index ff66bf004..62d44a536 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 17.1.0 + version: 17.2.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services @@ -546,9 +546,7 @@ components: observedMeasurement: type: string observedValue: - oneOf: - - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + type: number thresholdLevel: $ref: '#/components/schemas/ThresholdLevelInd' armTime: -- GitLab From f08c9b913c56030895cfddefa237989ad0a98810 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:25:36 +0000 Subject: [PATCH 34/70] Replace TS28532_ProvMnS.yaml with the latest yaml file from R17 branch --- OpenAPI/TS28532_ProvMnS.yaml | 142 +++++++++++++++++------------------ 1 file changed, 70 insertions(+), 72 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index fbe380538..959349fdc 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.1.0 + version: 17.2.0 description: >- OAS 3.0.1 definition of the Provisioning MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services @@ -237,6 +237,14 @@ paths: application/json: schema: $ref: '#/components/schemas/Resource' + application/vnd.3gpp.object-tree-hierarchical+json: + schema: + $ref: '#/components/schemas/Resource' + application/vnd.3gpp.object-tree-flat+json: + schema: + type: array + items: + $ref: '#/components/schemas/Resource' default: description: Error case. content: @@ -269,12 +277,12 @@ paths: schema: type: array items: - type: object + $ref: '#/components/schemas/PatchItem' application/3gpp-json-patch+json: schema: type: array items: - type: object + $ref: '#/components/schemas/PatchItem' responses: '200': description: >- @@ -301,52 +309,16 @@ paths: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' delete: - summary: Deletes one or multiple resources + summary: Deletes one resource description: >- - With HTTP DELETE resources are deleted. The resources to be deleted are + With HTTP DELETE one resource is deleted. The resources to be deleted is identified with the target URI. - parameters: - - name: scope - in: query - description: >- - This parameter extends the set of targeted resources beyond the base - resource identified with the path component of the URI. No scoping - mechanism is specified in the present document. - required: false - schema: - $ref: '#/components/schemas/Scope' - style: form - explode: true - - name: filter - in: query - description: >- - This parameter reduces the targeted set of resources by applying a - filter to the scoped set of resource representations. Only resources - representations for which the filter construct evaluates to "true" - are returned. No filter language is specified in the present - document. - required: false - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' responses: '200': description: >- Success case ("200 OK"). - This status code shall be returned, when query parameters are present in - the request and one or multiple resources are deleted. - The URIs of the deleted resources are returned in the response message body. - '204': - description: >- - Success case ("204 No Content"). - This status code shall be returned, when no query parameters are present in - the request and only one resource is deleted. - The message body is empty. - content: - application/json: - schema: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + This status code is returned, when the resource has been successfully deleted. + The response body is empty. default: description: Error case. content: @@ -355,18 +327,6 @@ paths: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - CorrelatedNotification: - type: object - properties: - source: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - notificationIds: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' - required: - - source - - notificationIds CmNotificationTypes: type: string enum: @@ -381,27 +341,33 @@ components: - MANAGEMENT_OPERATION - SON_OPERATION - UNKNOWN + ScopeType: + type: string + enum: + - BASE_ONLY + - BASE_NTH_LEVEL + - BASE_SUBTREE + - BASE_ALL Operation: type: string enum: - add - remove - replace - ScopeType: + Insert: type: string enum: - - BASE_ONLY - - BASE_NTH_LEVEL - - BASE_SUBTREE - - BASE_ALL - Scope: - type: object - properties: - scopeType: - $ref: '#/components/schemas/ScopeType' - scopeLevel: - type: integer - + - before + - after + PatchOperation: + type: string + enum: + - add + - replace + - remove + - copy + - move + - test Resource: oneOf: @@ -426,8 +392,29 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' - + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' + Scope: + type: object + properties: + scopeType: + $ref: '#/components/schemas/ScopeType' + scopeLevel: + type: integer + CorrelatedNotification: + type: object + properties: + source: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + notificationIds: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' + required: + - source + - notificationIds MoiChange: type: object properties: @@ -445,13 +432,14 @@ components: $ref: '#/components/schemas/Operation' path: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + insert: + $ref: '#/components/schemas/Insert' value: {} oldValue: {} required: - notificationId - op - path - NotifyMoiCreation: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -510,3 +498,13 @@ components: $ref: '#/components/schemas/MoiChange' required: - moiChanges + PatchItem: + type: object + properties: + op: + $ref: '#/components/schemas/PatchOperation' + from: + type: string + path: + type: string + value: {} -- GitLab From 89c6596537a63868f4626c95766bc2c85e7c21d2 Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 15 Mar 2023 05:44:05 +0000 Subject: [PATCH 35/70] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 66 ++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index fdd59687d..8b4bd52f5 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -86,6 +86,33 @@ components: type: string swImageRef: type: string + Duration: + type: object + properties: + startTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + endTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + EASServicePermission: + type: string + description: any of enumrated value + enum: + - TRIAL + - SILVER + - GOLD + EASFeature: + type: string + description: any of enumrated value + enum: + - SINGLE + - MULTIPLE + EASStatus: + type: string + description: any of enumrated value + enum: + - ENABLED + - DISABLED + #-------- Definition of concrete IOCs -------------------------------------------- MnS: @@ -152,6 +179,35 @@ components: items: type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EASProfile-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + aCID: + type: string + eASProvider: + type: string + eASdescription: + type: string + eASSchedule: + $ref: '#/components/schemas/Duration' + eASGeographicalServiceArea: + $ref: '#/components/schemas/GeoLoc' + eASTopologicalServiceArea: + $ref: '#/components/schemas/TopologicalServiceArea' + eASServicePermissionLevel: + $ref: '#/components/schemas/EASServicePermission' + eASFeature: + $ref: '#/components/schemas/EASFeature' + eASServiceContinuitySupport: + type: boolean + eASDNAI: + type: string + eASAvailabilityReportingPeriod: + type: integer + eASStatus: + $ref: '#/components/schemas/EASStatus' EESFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -223,6 +279,11 @@ components: $ref: '#/components/schemas/VirtualResource' softwareImageInfo: $ref: '#/components/schemas/SoftwareImageInfo' + eASSchedule: + $ref: '#/components/schemas/Duration' + eASFeature: + $ref: '#/components/schemas/EASFeature' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -246,6 +307,10 @@ components: type: array items: $ref: '#/components/schemas/EdgeDataNetwork-Single' + EASProfile-Multiple: + type: array + items: + $ref: '#/components/schemas/EASProfile-Single' #--------------------------------- Definition ------------------------------------ @@ -258,3 +323,4 @@ components: - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' - $ref: '#/components/schemas/EASRequirements-Single' + - $ref: '#/components/schemas/EASProfile-Single' -- GitLab From b40b312bfd7dc44a99489d0a6357c0b4aad09c61 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 08:52:39 +0000 Subject: [PATCH 36/70] Update the version to alignw with the latest TS version --- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 8b4bd52f5..75dc8c0d1 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 17.1.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From addbe5e87b373aafaffa1fd9168db30657900daf Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 06:42:47 +0000 Subject: [PATCH 37/70] CR0870 fix IpAddr definition and reference, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 15125e2b0..fb3a37b93 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -587,16 +587,6 @@ components: type: array items: $ref: '#/components/schemas/DnnSmfInfoItem' - - IpAddr: - type: object - properties: - ipv4Addr: - type: string - ipv6Addr: - type: string - ipv6Prefix: - type: string 5GCNfConnEcmInfoList: type: array @@ -1383,7 +1373,7 @@ components: pgwAddrList: type: array items: - $ref: '#/components/schemas/IpAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' accessType: $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' priority: -- GitLab From f9a241adc2a14ba66242f5be1d2854ef9f750fa4 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 04:17:49 +0000 Subject: [PATCH 38/70] CR0223 IpAddr fix, Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 70a9630d2..de0cc05af 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -133,6 +133,7 @@ components: oneOf: - $ref: '#/components/schemas/Ipv4Addr' - $ref: '#/components/schemas/Ipv6Addr' + - $ref: '#/components/schemas/Ipv6Prefix' HostAddr: # This definition will be deprecated, when all occurances of HostAddr # are replaced by Host. -- GitLab From b945a0dab3fc840fd72c01b0c052b528230cf778 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 15 Feb 2023 08:06:33 +0000 Subject: [PATCH 39/70] CR0867 fix redundant definition, and impact to IntentNrm and EdgeNrm --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 20 ++++++++++---------- OpenAPI/TS28541_NrNrm.yaml | 26 ++++++++------------------ 4 files changed, 20 insertions(+), 30 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 54a5bc028..f6e77381f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -484,7 +484,7 @@ components: contextValueRange: type: array items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnId" + $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" NRFqBandContext: type: object diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 91f638a44..fdd59687d 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -31,7 +31,7 @@ components: trackingAreaIdList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' servingPLMN: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' GeoLoc: type: object properties: diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index fb3a37b93..4fef4d884 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -67,7 +67,7 @@ components: nFStatus: $ref: '#/components/schemas/NFStatus' plmn: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sNssais: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' fqdn: @@ -101,7 +101,7 @@ components: apiPrfix: type: string allowedPlmns: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedNfTypes: type: array items: @@ -212,7 +212,7 @@ components: allowedPLMNs: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' allowedSNPNs: type: array items: @@ -544,7 +544,7 @@ components: type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nRTACRangelist: type: array items: @@ -554,7 +554,7 @@ components: type: object properties: pLMNId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' aMFIdentifier: type: integer @@ -1833,7 +1833,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPType: $ref: '#/components/schemas/SEPPType' sEPPId: @@ -1993,7 +1993,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sBIFqdn: type: string managedNFProfile: @@ -2023,7 +2023,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sBIFqdn: type: string managedNFProfile: @@ -2120,7 +2120,7 @@ components: - type: object properties: plmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' sEPPId: type: integer fqdn: @@ -2453,7 +2453,7 @@ components: - type: object properties: remotePlmnId: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' remoteSeppAddress: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' remoteSeppId: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 54e1117a1..ea213f8a6 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -44,25 +44,15 @@ components: sd: type: string - Mnc: - type: string - pattern: '[0-9]{3}|[0-9]{2}' - PlmnId: - type: object - properties: - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: '#/components/schemas/Mnc' PlmnIdList: type: array items: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' PlmnInfo: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' PlmnInfoList: @@ -77,7 +67,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cagidList: $ref: '#/components/schemas/cagId' nidList: @@ -117,7 +107,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' nrTac: $ref: '#/components/schemas/NrTac' TaiList: @@ -287,7 +277,7 @@ components: type: object properties: plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' RrmPolicyMemberList: @@ -587,7 +577,7 @@ components: TceID: type: integer PlmnTarget: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' TceMappingInfoList: type: array items: @@ -824,7 +814,7 @@ components: gnbCuName: $ref: '#/components/schemas/GnbName' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' x2BlockList: $ref: '#/components/schemas/GGnbIdList' xnBlockList: @@ -1601,7 +1591,7 @@ components: gnbIdLength: $ref: '#/components/schemas/GnbIdLength' plmnId: - $ref: '#/components/schemas/PlmnId' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 118de0e7f028ad4134bbaf21e7ca72541aa4a422 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:01:52 +0000 Subject: [PATCH 40/70] CR0872 ManagedNFProfile stage3 inconsistent with stage2, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 4fef4d884..44940764f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -253,6 +253,22 @@ components: type: array items: type: string + recoveryTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + nfServicePersistence: + type: boolean + nfProfileChangesSupportInd: + type: boolean + defaultNotificationSubscriptions: + type: array + items: + $ref: '#/components/schemas/DefaultNotificationSubscription' + minItems: 1 + serviceSetRecoveryTimeList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + minItems: 1 vendorId: type: string SEPPType: -- GitLab From 79b725c444ba4059a6f2139d0200a00584fe9e0c Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 7 Mar 2023 11:37:29 +0000 Subject: [PATCH 41/70] 28.541 rel18 cr0863 nrm enhancements for easdf function --- OpenAPI/TS28541_5GcNrm.yaml | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 44940764f..57cc9d17f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1142,6 +1142,56 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + EasdfInfo: + description: Information of an EASDF NF Instance + type: object + properties: + sNssaiEasdfInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiEasdfInfoItem' + minItems: 1 + easdfN6IpAddressList: + type: array + items: + $ref: '#/components/schemas/IpAddr' + minItems: 1 + upfN6IpAddressList: + type: array + items: + $ref: '#/components/schemas/IpAddr' + minItems: 1 + + SnssaiEasdfInfoItem: + description: Set of parameters supported by EASDF for a given S-NSSAI + type: object + required: + - sNssai + - dnnEasdfInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnEasdfInfoList: + type: array + items: + $ref: '#/components/schemas/DnnEasdfInfoItem' + minItems: 1 + + DnnEasdfInfoItem: + description: Set of parameters supported by EASDF for a given DNN + type: object + required: + - dnn + properties: + dnn: + anyOf: + - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + dnaiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -2046,6 +2096,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' serverAddr: type: string + easdfInfo: + $ref: '#/components/schemas/EasdfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 756009aaac82cfb013180268de0006c06f32f2f0 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 7 Mar 2023 11:39:33 +0000 Subject: [PATCH 42/70] Fix IpAddr Reference as that in base branch has been updated. Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 57cc9d17f..5e8919ede 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1154,12 +1154,12 @@ components: easdfN6IpAddressList: type: array items: - $ref: '#/components/schemas/IpAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 upfN6IpAddressList: type: array items: - $ref: '#/components/schemas/IpAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' minItems: 1 SnssaiEasdfInfoItem: -- GitLab From 24f4f316d94dbcf742b7dd2df04b9c5eb2c3dd8c Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:21:15 +0000 Subject: [PATCH 43/70] CR0864 NSSAAFFunction Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 47 ++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5e8919ede..4dc835d87 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1191,6 +1191,19 @@ components: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + NssaafInfo: + description: Information of a NSSAAF Instance + type: object + properties: + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + internalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/InternalGroupIdRange' minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- @@ -1292,6 +1305,8 @@ components: $ref: '#/components/schemas/EcmConnectionInfo-Multiple' EASDFFunction: $ref: '#/components/schemas/EASDFFunction-Multiple' + NSSAAFFunction: + $ref: '#/components/schemas/NssaafFunction-Multiple' AmfFunction-Single: allOf: @@ -2869,6 +2884,30 @@ components: items: $ref: '#/components/schemas/PccRule' + NssaafFunction-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 + cNSIIdList: + $ref: '#/components/schemas/CNSIIdList' + nFProfileList: + $ref: '#/components/schemas/NFProfileList' + commModelList: + $ref: '#/components/schemas/CommModelList' + nssafInfo: + $ref: '#/components/schemas/NssaafInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -3147,9 +3186,10 @@ components: type: array items: $ref: '#/components/schemas/EcmConnectionInfo-Single' - - - + NssaafFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/NssaafFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3236,4 +3276,5 @@ components: - $ref: '#/components/schemas/Dynamic5QISet-Single' - $ref: '#/components/schemas/EASDFFunction-Single' - $ref: '#/components/schemas/EcmConnectionInfo-Single' + - $ref: '#/components/schemas/NssaafFunction-Single' -- GitLab From 0c57b4dbb0b37b1f8f376df1ffe538dcb14e1e11 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 17 Feb 2023 06:43:45 +0000 Subject: [PATCH 44/70] additional change Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 4dc835d87..969e6ec9f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1381,6 +1381,8 @@ components: $ref: '#/components/schemas/EP_NLS-Multiple' EP_NLG: $ref: '#/components/schemas/EP_NLG-Multiple' + EP_N58: + $ref: '#/components/schemas/EP_N13-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -1730,6 +1732,8 @@ components: $ref: '#/components/schemas/EP_N10-Multiple' EP_N13: $ref: '#/components/schemas/EP_N13-Multiple' + EP_N59: + $ref: '#/components/schemas/EP_N13-Multiple' UdrFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2907,6 +2911,35 @@ components: nssafInfo: $ref: '#/components/schemas/NssaafInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EP_N58-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_N59-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 ---------------------- @@ -3190,6 +3223,14 @@ components: type: array items: $ref: '#/components/schemas/NssaafFunction-Single' + EP_N58-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N58-Single' + EP_N59-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N59-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3256,6 +3297,8 @@ components: - $ref: '#/components/schemas/EP_N31-Single' - $ref: '#/components/schemas/EP_N32-Single' - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N58-Single' + - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' - $ref: '#/components/schemas/EP_N88-Single' -- GitLab From 1f97f965c9ce147426e290431620e3590140ce0e Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:36:41 +0000 Subject: [PATCH 45/70] CR0862 AFFunction NRM, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 54 +++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 969e6ec9f..659c67f2b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1205,6 +1205,33 @@ components: items: $ref: '#/components/schemas/InternalGroupIdRange' minItems: 1 + TrustAfInfo: + description: Information of a trusted AF Instance + type: object + properties: + sNssaiInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiInfoItem' + minItems: 1 + afEvents: + type: array + items: + $ref: '#/components/schemas/AfEvent' + minItems: 1 + appIds: + type: array + items: + type: string + minItems: 1 + internalGroupId: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/GroupId' + minItems: 1 + mappingInd: + type: boolean + default: False #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1307,6 +1334,8 @@ components: $ref: '#/components/schemas/EASDFFunction-Multiple' NSSAAFFunction: $ref: '#/components/schemas/NssaafFunction-Multiple' + AFFunction: + $ref: '#/components/schemas/AfFunction-Multiple' AmfFunction-Single: allOf: @@ -2887,6 +2916,26 @@ components: type: array items: $ref: '#/components/schemas/PccRule' + + AfFunction-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: + plmnIdList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + trustAfInfo: + $ref: '#/components/schemas/TrustAfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' NssaafFunction-Single: allOf: @@ -3231,6 +3280,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N59-Single' + AfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3320,4 +3373,5 @@ components: - $ref: '#/components/schemas/EASDFFunction-Single' - $ref: '#/components/schemas/EcmConnectionInfo-Single' - $ref: '#/components/schemas/NssaafFunction-Single' + - $ref: '#/components/schemas/AfFunction-Single' -- GitLab From e17fc2d941dc84d1cff353de487ffec0f0da8fdf Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 17 Feb 2023 07:12:21 +0000 Subject: [PATCH 46/70] adding EP_N5, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 659c67f2b..a2bc16dc8 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2936,6 +2936,10 @@ components: trustAfInfo: $ref: '#/components/schemas/TrustAfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N5: + $ref: '#/components/schemas/EP_N5-Multiple' NssaafFunction-Single: allOf: -- GitLab From 44a9d24d39818631b7bc2cb0f192f500690a612a Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:48:07 +0000 Subject: [PATCH 47/70] CR0861 LMFFunction NRM enhancement, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 82 +++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a2bc16dc8..1f5dceab7 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1233,6 +1233,86 @@ components: type: boolean default: False + ExternalClientType: + description: Indicates types of External Clients. + anyOf: + - type: string + enum: + - EMERGENCY_SERVICES + - VALUE_ADDED_SERVICES + - PLMN_OPERATOR_SERVICES + - LAWFUL_INTERCEPT_SERVICES + - PLMN_OPERATOR_BROADCAST_SERVICES + - PLMN_OPERATOR_OM + - PLMN_OPERATOR_ANONYMOUS_STATISTICS + - PLMN_OPERATOR_TARGET_MS_SERVICE_SUPPORT + - type: string + SupportedGADShapes: + description: Indicates supported GAD shapes. + anyOf: + - type: string + enum: + - POINT + - POINT_UNCERTAINTY_CIRCLE + - POINT_UNCERTAINTY_ELLIPSE + - POLYGON + - POINT_ALTITUDE + - POINT_ALTITUDE_UNCERTAINTY + - ELLIPSOID_ARC + - LOCAL_2D_POINT_UNCERTAINTY_ELLIPSE + - LOCAL_3D_POINT_UNCERTAINTY_ELLIPSOID + - type: string + AnNodeType: + description: Access Network Node Type (gNB, ng-eNB...) + anyOf: + - type: string + enum: + - GNB + - NG_ENB + - type: string + + LmfInfo: + description: Information of an LMF NF Instance + type: object + properties: + servingClientTypes: + type: array + items: + $ref: '#/components/schemas/ExternalClientType' + minItems: 1 + lmfId: + type: string + servingAccessTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' + minItems: 1 + servingAnNodeTypes: + type: array + items: + $ref: '#/components/schemas/AnNodeType' + minItems: 1 + servingRatTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/RatType' + 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 + supportedGADShapes: + type: array + items: + $ref: '#/components/schemas/SupportedGADShapes' + minItems: 1 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1906,6 +1986,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + lmfInfo: + $ref: '#/components/schemas/LmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From bfc0bfa2edf9b018805c5883e4980d5ee9a5f734 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 17 Feb 2023 15:39:52 +0000 Subject: [PATCH 48/70] CR0860 NRF NRM --- OpenAPI/TS28541_5GcNrm.yaml | 104 +++++++++++++++++++++++--------- OpenAPI/TS29571_CommonData.yaml | 19 +++++- 2 files changed, 93 insertions(+), 30 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1f5dceab7..a2cfb7408 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1142,6 +1142,7 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' +<<<<<<< HEAD EasdfInfo: description: Information of an EASDF NF Instance type: object @@ -1232,7 +1233,6 @@ components: mappingInd: type: boolean default: False - ExternalClientType: description: Indicates types of External Clients. anyOf: @@ -1311,6 +1311,76 @@ components: type: array items: $ref: '#/components/schemas/SupportedGADShapes' + minItems: 1 + + UdrInfo: + description: Information of an UDR NF Instance + type: object + properties: + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + supportedDataSets: + type: array + items: + $ref: '#/components/schemas/DataSetId' + minItems: 1 + sharedDataIdRanges: + type: array + items: + $ref: '#/components/schemas/SharedDataIdRange' + minItems: 1 + + UdmInfo: + description: Information of an UDM NF Instance + type: object + properties: + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + routingIndicators: + type: array + items: + type: string + pattern: '^[0-9]{1,4}$' + minItems: 1 + internalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/InternalGroupIdRange' + minItems: 1 + suciInfos: + type: array + items: + $ref: '#/components/schemas/SuciInfo' minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- @@ -1816,22 +1886,8 @@ components: $ref: '#/components/schemas/CommModelList' eCSAddrConfigInfo: $ref: '#/components/schemas/ECSAddrConfigInfo' - groupId: - type: string - supiRanges: - $ref: '#/components/schemas/SupiRangeList' - gpsiRanges: - $ref: '#/components/schemas/IdentityRangeList' - externalGroupIdentifiersRanges: - $ref: '#/components/schemas/IdentityRangeList' - routingIndicators: - type: array - items: - type: string - internalGroupIdentifiersRanges: - $ref: '#/components/schemas/InternalGroupIdRangeList' - suciInfos: - $ref: '#/components/schemas/SuciInfoList' + udmInfo: + $ref: '#/components/schemas/UdmInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1859,18 +1915,8 @@ components: type: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' - groupId: - type: string - supiRanges: - $ref: '#/components/schemas/SupiRangeList' - gpsiRanges: - $ref: '#/components/schemas/IdentityRangeList' - externalGroupIdentifiersRanges: - $ref: '#/components/schemas/IdentityRangeList' - supportedDataSets: - $ref: '#/components/schemas/SupportedDataSetList' - sharedDataIdRanges: - $ref: '#/components/schemas/SharedDataIdRangeList' + udrInfo: + $ref: '#/components/schemas/UdrInfo' UdsfFunction-Single: allOf: diff --git a/OpenAPI/TS29571_CommonData.yaml b/OpenAPI/TS29571_CommonData.yaml index 76cf71d61..86a4a4de6 100644 --- a/OpenAPI/TS29571_CommonData.yaml +++ b/OpenAPI/TS29571_CommonData.yaml @@ -1,4 +1,4 @@ -##### Special note: CT R16 local copy for SA5 OAM Forge branch only, it shall not be used otherwise. S5-222029 on 4.4.2022 +##### Special note: CT R16 local copy for SA5 OAM Forge branch only, it shall not be used otherwise. S5-222029 on 4.4.2022. Updated to sync with 1.5.0 for SA5#147 (17.02.2023) openapi: 3.0.0 info: @@ -217,6 +217,23 @@ components: TimeOfDay: type: string description: String with format partial-time or full-time as defined in clause 5.6 of IETF RFC 3339. Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC). + EmptyObject: + description: Empty JSON object { }, it is defined with the keyword additionalProperties false + type: object + additionalProperties: false + + Fqdn: + description: Fully Qualified Domain Name + type: string + pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$' + minLength: 4 + maxLength: 253 + + FqdnRm: + description: Fully Qualified Domain Name, but it also allows the null value + anyOf: + - $ref: '#/components/schemas/Fqdn' + - $ref: '#/components/schemas/NullValue' # # COMMON ENUMERATED DATA TYPES # -- GitLab From 29cc6a24d4b16790ffaef09257d99d6231b2f643 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 17 Feb 2023 15:52:44 +0000 Subject: [PATCH 49/70] validation fix Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a2cfb7408..016e16f2d 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1330,20 +1330,11 @@ components: $ref: '#/components/schemas/IdentityRange' minItems: 1 externalGroupIdentifiersRanges: - type: array - items: - $ref: '#/components/schemas/IdentityRange' - minItems: 1 + $ref: '#/components/schemas/IdentityRangeList' supportedDataSets: - type: array - items: - $ref: '#/components/schemas/DataSetId' - minItems: 1 + $ref: '#/components/schemas/SupportedDataSetList' sharedDataIdRanges: - type: array - items: - $ref: '#/components/schemas/SharedDataIdRange' - minItems: 1 + $ref: '#/components/schemas/SharedDataIdRangeList' UdmInfo: description: Information of an UDM NF Instance -- GitLab From e41988e65c75f69591c4c0ae1bcb480ddcc0fae3 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 16 Feb 2023 06:51:46 +0000 Subject: [PATCH 50/70] CR0859 SMSFFunction NRM enhancement, Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 016e16f2d..de37dfc65 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1142,7 +1142,6 @@ components: anyOf: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' -<<<<<<< HEAD EasdfInfo: description: Information of an EASDF NF Instance type: object @@ -1372,6 +1371,33 @@ components: type: array items: $ref: '#/components/schemas/SuciInfo' + + PlmnRange: + description: Range of PLMN IDs + type: object + oneOf: + - required: [ start, end ] + - required: [ pattern ] + properties: + start: + type: string + pattern: '^[0-9]{3}[0-9]{2,3}$' + end: + type: string + pattern: '^[0-9]{3}[0-9]{2,3}$' + pattern: + type: string + + SmsfInfo: + description: Specific Data for SMSF + type: object + properties: + roamingUeInd: + type: boolean + remotePlmnRangeList: + type: array + items: + $ref: '#/components/schemas/PlmnRange' minItems: 1 #-------- Definition of concrete IOCs -------------------------------------------- @@ -1998,6 +2024,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + smsfInfo: + $ref: '#/components/schemas/SmsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 4aaccd6fcb39ddb0101dc042379d89277f6f4f16 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Tue, 14 Feb 2023 16:38:57 +0000 Subject: [PATCH 51/70] CR0857 - delete duplicate SST from RANSliceSubnetProfile and TopSliceSubnetProfile --- OpenAPI/TS28541_SliceNrm.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index d1d15e7ef..5ca23564f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -374,8 +374,6 @@ components: type: integer reliability: type: number - sST: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLMaxPktSize: type: integer uLMaxPktSize: @@ -449,8 +447,6 @@ components: type: integer reliability: type: number - sST: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: -- GitLab From 9bcc1ecc85c07a4c92f588a2bdd872d39fa3c1db Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 15 Feb 2023 08:39:51 +0000 Subject: [PATCH 52/70] Adding altitude to ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index de0cc05af..e0e926b6c 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -78,6 +78,8 @@ components: $ref: '#/components/schemas/Latitude' longitude: $ref: '#/components/schemas/Longitude' + altitude: + $ref: '#/components/schemas/Float' ConvexGeoPolygon: type: array items: -- GitLab From 38f0cf6001402b6a4fe1a054646ff9cde2879bfa Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 17 Feb 2023 17:44:27 +0000 Subject: [PATCH 53/70] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 98ceba531..431a4c56d 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -194,7 +194,7 @@ components: - FILE_BASED_LOC_SET_BY_PRODUCER - FILE_BASED_LOC_SET_BY_CONSUMER - STREAM_BASED - monitorGranularityPeriods: + reportingPeriods: type: array items: type: integer -- GitLab From d83fa24c557bd78c68f437858654f0a57292dbe2 Mon Sep 17 00:00:00 2001 From: scottma Date: Thu, 2 Mar 2023 23:52:01 +0000 Subject: [PATCH 54/70] Update _3gpp-common-measurements.yang --- yang-models/_3gpp-common-measurements.yang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-measurements.yang b/yang-models/_3gpp-common-measurements.yang index 37e01006b..b3a6d6911 100755 --- a/yang-models/_3gpp-common-measurements.yang +++ b/yang-models/_3gpp-common-measurements.yang @@ -210,7 +210,7 @@ module _3gpp-common-measurements { min-elements 1; } - leaf-list reportingPeriods { + leaf-list reportingPeriods { type uint32 { range 1..max ; } @@ -462,9 +462,9 @@ module _3gpp-common-measurements { A threshold monitor checks for threshold crossings of performance metric values and generates a notification when that happens. - The ThresholdMonitor shall be used only when NRM based threshold + The ThresholdMonitor is used only when NRM based threshold monitoring is supported. - + To activate threshold monitoring, a MnS consumer needs to create a ThresholdMonitor instance on the MnS producer. For ultimate deactivation of threshold monitoring, the MnS consumer should delete the monitor to @@ -496,8 +496,8 @@ module _3gpp-common-measurements { Multiple thresholds can be defined for multiple performance metric sets in a single monitor using thresholdInfoList. The attribute monitorGranularityPeriod defines the granularity period to be applied. - The value is a supported GP for the measurements being monitored. - Threshold crossing behaviour is as defined in [54], Annex F. + The value is a multiple of a supported granularity period for the + measurements being monitored. Each threshold is identified with a number (key) called thresholdLevel. A threshold is defined using the attributes thresholdValue , @@ -537,4 +537,4 @@ module _3gpp-common-measurements { } } } -} \ No newline at end of file +} -- GitLab From 3f1a0c0c46c6f0dedc6858dec7df9bfeef8c7b69 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 17 Feb 2023 07:06:09 +0000 Subject: [PATCH 55/70] Update OpenAPI/TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ea213f8a6..ae1133003 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -720,6 +720,10 @@ components: $ref: '#/components/schemas/GnbIdLength' rimRSReportConf: $ref: '#/components/schemas/RimRSReportConf' + configurable5QISetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + dynamic5QISetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -741,6 +745,10 @@ components: $ref: '#/components/schemas/OperatorDu-Multiple' BWPSet: $ref: '#/components/schemas/BWPSet-Multiple' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' OperatorDu-Single: allOf: @@ -797,6 +805,11 @@ components: $ref: '#/components/schemas/EP_X2U-Multiple' EP_S1U: $ref: '#/components/schemas/EP_S1U-Multiple' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + GnbCuCpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -864,6 +877,10 @@ components: $ref: '#/components/schemas/DMROFunction-Single' DLBOFunction: $ref: '#/components/schemas/DLBOFunction-Single' + Configurable5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' + Dynamic5QISet: + $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' NrCellCu-Single: allOf: -- GitLab From 862be2325661f6430dbbf20261a970145bf47904 Mon Sep 17 00:00:00 2001 From: scottma Date: Fri, 3 Mar 2023 06:13:03 +0000 Subject: [PATCH 56/70] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 431a4c56d..2d4f38df1 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1683,8 +1683,6 @@ components: $ref: '#/components/schemas/traceDepth-Type' traceReference: $ref: '#/components/schemas/traceReference-Type' - traceRecordingSessionReference: - type: string jobId: type: string traceReportingFormat: -- GitLab From 5cfc54c0f6091633d8508d5014d4e611e59afde9 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 2 Mar 2023 14:52:45 +0000 Subject: [PATCH 57/70] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 5ca23564f..ea52ce68b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -513,8 +513,10 @@ components: $ref: '#/components/schemas/UserMgmtOpen' v2XCommModels: $ref: '#/components/schemas/V2XCommModels' - coverageArea: - type: string + coverageAreas: + type: array + items: + type: string termDensity: $ref: '#/components/schemas/TermDensity' activityFactor: -- GitLab From e9182d734b21e5444ffd63012dfb70b072d2ae65 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:55:31 +0000 Subject: [PATCH 58/70] Update the version to align with the latest version --- 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 de37dfc65..ff40de9c3 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From ab5687ec3b227f66555aff4c8490a9fcf266fd1c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:56:06 +0000 Subject: [PATCH 59/70] Update the version to align with the latest version --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ae1133003..973445b50 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the NR NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 96b997c6aeb46a919b33ba891fadfb90d9ac6356 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:56:35 +0000 Subject: [PATCH 60/70] Update the version to align with the latest version --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index ea52ce68b..3f363913d 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 3471c08d22379421a1ec373f700fb15d63e0e321 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:57:10 +0000 Subject: [PATCH 61/70] Update the version to align with the latest version --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index e0e926b6c..c54fc8107 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.1.0 + version: 18.2.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). -- GitLab From 6f9db02cdb8d22a632971d153adf7c5eaf9250c8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:57:21 +0000 Subject: [PATCH 62/70] Update the version to align with the latest version --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 2d4f38df1..b0d7caec8 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From 40f3d8c7f37519189238b2f7a393f02ce1c61136 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 14 Mar 2023 10:58:37 +0000 Subject: [PATCH 63/70] Replace TS28104_MdaNrm.yaml with the latest R17 YAML file --- OpenAPI/TS28104_MdaNrm.yaml | 67 +++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index b74804c5e..0250ccdd0 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 17.0.0 + version: 17.2.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -43,11 +43,9 @@ components: filterValue: type: string threshold: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdInfo' analyticsPeriod: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: '#/components/schemas/AnalyticsSchedule' timeOut: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' @@ -61,7 +59,7 @@ components: ReportingTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - AnalyticsScope: + AnalyticsScopeType: oneOf: - type: object properties: @@ -70,32 +68,43 @@ components: - type: object properties: areaScope: - $ref: '#/components/schemas/GeoAreaList' - - GeoAreaList: - type: array - items: - $ref: '#/components/schemas/GeoArea' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - GeoArea: - type: object - properties: - coordinates: - type: array - items: - $ref: '#/components/schemas/Coordinate' - altitude: - type: number - format: float + AnalyticsSchedule: + oneOf: + - type: object + properties: + timeDurations: + type: array + items: + $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow' + - type: object + properties: + granularityPeriod: + type: integer - Coordinate: + ThresholdInfo: type: object properties: - latitude: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude' - longitude: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude' - + monitoredMDAOutputIE: + type: string + thresholdDirection: + type: string + enum: + - UP + - DOWN + - UP_AND_DOWN + thresholdValue: + oneOf: + - type: integer + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + hysteresis: + oneOf: + - type: integer + minimum: 0 + - type: number + format: float + minimum: 0 #-------- Definition of abstract IOCs -------------------------------------------- @@ -170,7 +179,7 @@ components: reportingTarget: $ref: '#/components/schemas/ReportingTarget' analyticsScope: - $ref: '#/components/schemas/AnalyticsScope' + $ref: '#/components/schemas/AnalyticsScopeType' startTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' stopTime: -- GitLab From 4e5274f07cd67d85557f935e7044685bee454f70 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:19:21 +0000 Subject: [PATCH 64/70] Replace TS28104_MdaReport.yaml with the yaml file in the latest R17 branch --- OpenAPI/TS28104_MdaReport.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 3f8dcf237..8e0f871b2 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 17.0.0 + version: 17.2.0 description: >- OAS 3.0.1 specification of the MDA Report © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -43,9 +43,9 @@ components: TimeWindow: type: object properties: - startTime: + mDAOutputStartTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - endTime: + mDAOutputEndTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' -- GitLab From 348073d8ffd93467ce1d1567eb98907ad88e611f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:22:58 +0000 Subject: [PATCH 65/70] Replace TS28105_AiMlNrm.yaml with the latest yaml file from R17 branch --- OpenAPI/TS28105_AiMlNrm.yaml | 109 ++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 47 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index a4afbb619..77b62f530 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 17.0.0 + version: 17.3.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -15,26 +15,34 @@ components: #-------- Definition of types----------------------------------------------------- - AIMLEntityList: + MLEntityList: type: array items: - $ref: '#/components/schemas/AIMLEntity' + $ref: '#/components/schemas/MLEntity' - AIMLEntity: + MLEntity: type: object properties: - aIMLEntityId: + mLEntityId: type: string inferenceType: type: string - aIMLEntityVersion: + mLEntityVersion: type: string expectedRunTimeContext: - type: string + $ref: '#/components/schemas/MLContext' trainingContext: - type: string + $ref: '#/components/schemas/MLContext' runTimeContext: - type: string + $ref: '#/components/schemas/MLContext' + + MLContext: + type: object + properties: + inferenceEntityRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + dataProviderRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' RequestStatus: type: string @@ -66,10 +74,10 @@ components: TrainingProcessMonitor: description: >- - This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "AIMLTrainingProcess". + This data type is the "ProcessMonitor" data type defined in “genericNrm.yaml” with specialisations for usage in the "MLTrainingProcess". type: object properties: - aIMLTrainingProcessId: + mLTrainingProcessId: type: string status: type: string @@ -112,8 +120,8 @@ components: $ref: '#/components/schemas/SubNetwork-Multiple' ManagedElement: $ref: '#/components/schemas/ManagedElement-Multiple' - AIMLTrainingFunction: - $ref: '#/components/schemas/AIMLTrainingFunction-Multiple' + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' ManagedElement-Single: allOf: @@ -125,10 +133,10 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO' - type: object properties: - AIMLTrainingFunction: - $ref: '#/components/schemas/AIMLTrainingFunction-Multiple' + MLTrainingFunction: + $ref: '#/components/schemas/MLTrainingFunction-Multiple' - AIMLTrainingFunction-Single: + MLTrainingFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -138,19 +146,19 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - aIMLEntityList: - $ref: '#/components/schemas/AIMLEntityList' + mLEntityList: + $ref: '#/components/schemas/MLEntityList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - AIMLTrainingRequest: - $ref: '#/components/schemas/AIMLTrainingRequest-Multiple' - AIMLTrainingProcess: - $ref: '#/components/schemas/AIMLTrainingProcess-Multiple' - AIMLTrainingReport: - $ref: '#/components/schemas/AIMLTrainingReport-Multiple' + MLTrainingRequest: + $ref: '#/components/schemas/MLTrainingRequest-Multiple' + MLTrainingProcess: + $ref: '#/components/schemas/MLTrainingProcess-Multiple' + MLTrainingReport: + $ref: '#/components/schemas/MLTrainingReport-Multiple' - AIMLTrainingRequest-Single: + MLTrainingRequest-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -159,21 +167,21 @@ components: allOf: - type: object properties: - aIMLEntityId: + mLEntityId: type: string - candidateTraingDataSource: + candidateTrainingDataSource: type: array items: type: string - traingDataQualityScore: + trainingDataQualityScore: type: number format: float trainingRequestSource: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' requestStatus: $ref: '#/components/schemas/RequestStatus' expectedRuntimeContext: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: '#/components/schemas/MLContext' performanceRequirements: $ref: '#/components/schemas/PerformanceRequirements' cancelRequest: @@ -181,7 +189,7 @@ components: suspendRequest: type: boolean - AIMLTrainingProcess-Single: + MLTrainingProcess-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -190,7 +198,7 @@ components: allOf: - type: object properties: - aIMLTrainingProcessId: + mLTrainingProcessId: type: string priority: type: integer @@ -208,7 +216,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - AIMLTrainingReport-Single: + MLTrainingReport-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -217,7 +225,7 @@ components: allOf: - type: object properties: - aIMLEntityId: + mLEntityId: type: string areConsumerTrainingDataUsed: type: boolean @@ -233,7 +241,14 @@ components: $ref: '#/components/schemas/ModelPerformance' areNewTrainingDataUsed: type: boolean - + trainingRequestRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + trainingProcessRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + trainingReportRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + lastTrainingRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -245,22 +260,22 @@ components: type: array items: $ref: '#/components/schemas/ManagedElement-Single' - AIMLTrainingFunction-Multiple: + MLTrainingFunction-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingFunction-Single' - AIMLTrainingRequest-Multiple: + $ref: '#/components/schemas/MLTrainingFunction-Single' + MLTrainingRequest-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingRequest-Single' - AIMLTrainingProcess-Multiple: + $ref: '#/components/schemas/MLTrainingRequest-Single' + MLTrainingProcess-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingProcess-Single' - AIMLTrainingReport-Multiple: + $ref: '#/components/schemas/MLTrainingProcess-Single' + MLTrainingReport-Multiple: type: array items: - $ref: '#/components/schemas/AIMLTrainingReport-Single' + $ref: '#/components/schemas/MLTrainingReport-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -270,7 +285,7 @@ components: - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ManagedElement-Single' - - $ref: '#/components/schemas/AIMLTrainingFunction-Single' - - $ref: '#/components/schemas/AIMLTrainingRequest-Single' - - $ref: '#/components/schemas/AIMLTrainingProcess-Single' - - $ref: '#/components/schemas/AIMLTrainingReport-Single' + - $ref: '#/components/schemas/MLTrainingFunction-Single' + - $ref: '#/components/schemas/MLTrainingRequest-Single' + - $ref: '#/components/schemas/MLTrainingProcess-Single' + - $ref: '#/components/schemas/MLTrainingReport-Single' -- GitLab From 4a49abfe92fd8af1ee0d70eae5db3f22466853ee Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:24:12 +0000 Subject: [PATCH 66/70] Replace TS28312_IntentNrm.yaml with the latest yaml file from R17 branch --- OpenAPI/TS28312_IntentNrm.yaml | 440 ++++++++++++++++++++++++--------- 1 file changed, 321 insertions(+), 119 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index f6e77381f..a9fb33655 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.0.0 + version: 17.3.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -12,6 +12,23 @@ externalDocs: paths: {} components: schemas: + + #-------Definition of concrete IOCs ----------# + + SubNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + Intent: + $ref: '#/components/schemas/Intent-Multiple' Intent-Single: allOf: @@ -23,14 +40,23 @@ components: intentExpectations: type: array items: - $ref: "#/components/schemas/IntentExpectation" + type: object + oneOf: + - $ref: "#/components/schemas/IntentExpectation" + - $ref: "#/components/schemas/RadioNetworkExpectation" + - $ref: "#/components/schemas/ServiceSupportExpectation" intentContexts: type: array items: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" + #-------Definition of concrete IOCs ----------# + + #-------Definition of the IntentExpectation dataType ----------# IntentExpectation: + description: >- + This data type is the "IntentExpectation" data type without specialisations type: object properties: expectationId: @@ -50,15 +76,88 @@ components: items: $ref: "#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - + $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 ----------# + + #-------Definition of the ExpectationObject dataType ----------# ExpectationObject: + description: >- + This data type is the "ExpectationObject" data type without specialisations type: object properties: objectType: type: string enum: - - RAN_SubNetwrok #value for Radio Network Expectation--# + - RAN_SubNetwork #value for Radio Network Expectation--# - Service_Support #value for Service Support Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: @@ -66,84 +165,69 @@ components: objectContexts: type: array items: - $ref: "#/components/schemas/ObjectContext" - - ExpectationTarget: - oneOf: - #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # - - $ref: "#/components/schemas/WeakRSRPRatioTarget" - - $ref: "#/components/schemas/LowSINRRatioTarget" - - $ref: "#/components/schemas/AveULRANUEThptTarget" - - $ref: "#/components/schemas/AveDLRANUEThptTarget" - - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" - #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # - #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- # - - $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" - #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- # - #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# - #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# - - - ObjectContext: - oneOf: - #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# - - $ref: "#/components/schemas/CoverageAreaPolygonContext" - - $ref: "#/components/schemas/CoverageTACContext" - - $ref: "#/components/schemas/PLMNContext" - - $ref: "#/components/schemas/NRFqBandContext" - - $ref: "#/components/schemas/RATContext" - #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# - #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------# - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - - $ref: "#/components/schemas/CoverageAreaTAContext" - #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------# - - #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# - #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# - - - ExpectationContext: - oneOf: - #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- # - - $ref: "#/components/schemas/ServiceStartTimeContext" - - $ref: "#/components/schemas/ServiceEndTimeContext" - - $ref: "#/components/schemas/UEMobilityLevelContext" - - $ref: "#/components/schemas/ResourceSharingLevelContext" - #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- # - - IntentContext: + $ref: "#/components/schemas/ObjectContext" + RadioNetworkExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation type: object properties: - contextAttribute: + objectType: type: string - contextCondition: - $ref: "#/components/schemas/Condition" - contextValueRange: + enum: + - RAN_SubNetwork #value for Radio Network Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: type: array items: - type: number + 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 dataType --------------# Condition: type: string enum: - - Is_equal_to - - Is_less_than - - Is_greater_than - - Is_within_the_range - + - IS_EQUAL_TO + - IS_LESS_THAN + - IS_GREATER_THAN + - IS_WITHIN_RANGE + - IS_OUTSIDE_RANGE + - IS_ONE_OF + - IS_NOT_ONE_OF + - IS_EQUAL_TO_OR_LESS_THAN + - IS_EQUAL_TO_OR_GREATER_THAN FulfilStatus: type: string enum: - FULFILLED - NOT_FULFILLED - NotFulfilledState: type: string enum: @@ -153,7 +237,6 @@ components: - SUSPENDED - TERMINATED - FULFILMENTFAILED - FulfilmentInfo: type: object properties: @@ -167,15 +250,59 @@ components: description: -> An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo type: string - ExpectationVerb: type: string enum: - DELIVER - ENSURE + #-------Definition of the generic dataType --------------# - #-------Definition of the concrete ExpectationTarget dataType----------# + #-------Definition of the IntentContext dataType --------------# + IntentContext: + description: >- + This data type is the "IntentContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number + #-------Definition of the IntentContext dataType --------------# + + #-------Definition of the ExpectationTarget dataType----------# + ExpectationTarget: + description: >- + This data type is the "ExpectationTarget" data type without specialisations + type: object + properties: + targetName: + type: string + targetCondition: + $ref: "#/components/schemas/Condition" + targetValueRange: + type: number + targetContexts: + type: array + items: + $ref: "#/components/schemas/TargetContext" + TargetContext: + description: >- + This data type is the "TargetContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $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: @@ -185,7 +312,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -194,8 +321,9 @@ components: $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: @@ -205,11 +333,12 @@ components: contextCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN contextValueRange: type: number - LowSINRRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget type: object properties: targetName: @@ -219,7 +348,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -228,8 +357,9 @@ components: $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: @@ -239,11 +369,12 @@ components: contextCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN contextValueRange: type: integer - AveULRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget type: object properties: targetName: @@ -253,13 +384,14 @@ components: targetCondition: type: string enum: - - Is_greater_than + - 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: @@ -269,13 +401,14 @@ components: targetCondition: type: string enum: - - Is_greater_than + - 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: @@ -285,7 +418,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -294,8 +427,9 @@ components: $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: @@ -308,8 +442,9 @@ components: - Is_less_than contextValueRange: type: number - LowDLRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget type: object properties: targetName: @@ -319,7 +454,7 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer minimum: 0 @@ -328,8 +463,9 @@ components: $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: @@ -339,10 +475,12 @@ components: contextCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN contextValueRange: type: number DLThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget type: object properties: targetName: @@ -352,10 +490,12 @@ components: targetCondition: type: string enum: - - Is_greater_than + - 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: @@ -365,10 +505,12 @@ components: targetCondition: type: string enum: - - Is_greater_than + - 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: @@ -378,10 +520,12 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer ULLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget type: object properties: targetName: @@ -391,53 +535,73 @@ components: targetCondition: type: string enum: - - Is_less_than + - IS_LESS_THAN targetValueRange: type: integer MaxNumberofUEsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget type: object properties: - targetAttribute: + targetName: type: string enum: - maxNumberofUEs targetCondition: type: string enum: - - Is_less _than + - IS_LESS_THAN targetValueRange: type: integer ActivityFactorTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget type: object properties: - targetAttribute: + targetName: type: string enum: - activityFactor targetCondition: type: string enum: - - Is_equal _than + - IS_EQUAL_TO targetValueRange: type: integer UESpeedTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget type: object properties: - targetAttribute: + targetName: type: string enum: - uESpeed targetCondition: type: string enum: - - Is_less _than + - IS_LESS_THAN targetValueRange: type: integer - #-------Definition of the concrete ExpectationTarget dataType----------# - #-------Definition of the concrete ObjectTarget 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: "#/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: @@ -447,7 +611,7 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: @@ -455,6 +619,8 @@ components: CoverageArea: type: string CoverageTACContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageTACContext type: object properties: contextAttribute: @@ -464,13 +630,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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: @@ -480,13 +647,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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: @@ -496,13 +664,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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: @@ -512,7 +681,7 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: @@ -522,6 +691,8 @@ components: - EUTRAN - NR EdgeIdenfiticationIdContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext type: object properties: contextAttribute: @@ -531,12 +702,14 @@ components: contextCondition: type: string enum: - - Is_equal_than + - 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: @@ -546,12 +719,14 @@ components: contextCondition: type: string enum: - - Is_equal_than + - 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: @@ -561,17 +736,32 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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----------------# + ExpectationContext: + description: >- + This data type is the "ExpectationContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number ServiceStartTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext type: object properties: contextAttribute: @@ -581,10 +771,12 @@ components: contextCondition: type: string enum: - - Is_equal_than + - IS_EQUAL_TO contextValueRange: type: string ServiceEndTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext type: object properties: contextAttribute: @@ -594,10 +786,12 @@ components: contextCondition: type: string enum: - - Is_equal_than + - IS_EQUAL_TO contextValueRange: type: string UEMobilityLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext type: object properties: contextAttribute: @@ -607,12 +801,14 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - 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: @@ -622,7 +818,7 @@ components: contextCondition: type: string enum: - - Is_within_the_range + - IS_WITHIN_RANGE contextValueRange: type: array items: @@ -631,6 +827,11 @@ components: #------Definition of JSON arrays for name-contained IOCs ---------------# + + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' Intent-Multiple: type: array @@ -641,5 +842,6 @@ components: #----- Definitions in TS 28.312 for TS 28.532 --------------------------# resources-intentNrm: oneOf: + - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/Intent-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From bbcb1cd080ccc38e8a502e41702b96f58bb2f657 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:25:01 +0000 Subject: [PATCH 67/70] Replace TS28532_FaultMnS.yaml with the latest yaml file from R17 branch --- OpenAPI/TS28532_FaultMnS.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index ff66bf004..62d44a536 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 17.1.0 + version: 17.2.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services @@ -546,9 +546,7 @@ components: observedMeasurement: type: string observedValue: - oneOf: - - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + type: number thresholdLevel: $ref: '#/components/schemas/ThresholdLevelInd' armTime: -- GitLab From fc4a17f04974b29bf662ef4df3eb32129cff268a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 00:25:36 +0000 Subject: [PATCH 68/70] Replace TS28532_ProvMnS.yaml with the latest yaml file from R17 branch --- OpenAPI/TS28532_ProvMnS.yaml | 142 +++++++++++++++++------------------ 1 file changed, 70 insertions(+), 72 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index fbe380538..959349fdc 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.1.0 + version: 17.2.0 description: >- OAS 3.0.1 definition of the Provisioning MnS - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.532; Generic management services @@ -237,6 +237,14 @@ paths: application/json: schema: $ref: '#/components/schemas/Resource' + application/vnd.3gpp.object-tree-hierarchical+json: + schema: + $ref: '#/components/schemas/Resource' + application/vnd.3gpp.object-tree-flat+json: + schema: + type: array + items: + $ref: '#/components/schemas/Resource' default: description: Error case. content: @@ -269,12 +277,12 @@ paths: schema: type: array items: - type: object + $ref: '#/components/schemas/PatchItem' application/3gpp-json-patch+json: schema: type: array items: - type: object + $ref: '#/components/schemas/PatchItem' responses: '200': description: >- @@ -301,52 +309,16 @@ paths: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' delete: - summary: Deletes one or multiple resources + summary: Deletes one resource description: >- - With HTTP DELETE resources are deleted. The resources to be deleted are + With HTTP DELETE one resource is deleted. The resources to be deleted is identified with the target URI. - parameters: - - name: scope - in: query - description: >- - This parameter extends the set of targeted resources beyond the base - resource identified with the path component of the URI. No scoping - mechanism is specified in the present document. - required: false - schema: - $ref: '#/components/schemas/Scope' - style: form - explode: true - - name: filter - in: query - description: >- - This parameter reduces the targeted set of resources by applying a - filter to the scoped set of resource representations. Only resources - representations for which the filter construct evaluates to "true" - are returned. No filter language is specified in the present - document. - required: false - schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' responses: '200': description: >- Success case ("200 OK"). - This status code shall be returned, when query parameters are present in - the request and one or multiple resources are deleted. - The URIs of the deleted resources are returned in the response message body. - '204': - description: >- - Success case ("204 No Content"). - This status code shall be returned, when no query parameters are present in - the request and only one resource is deleted. - The message body is empty. - content: - application/json: - schema: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + This status code is returned, when the resource has been successfully deleted. + The response body is empty. default: description: Error case. content: @@ -355,18 +327,6 @@ paths: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - CorrelatedNotification: - type: object - properties: - source: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - notificationIds: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' - required: - - source - - notificationIds CmNotificationTypes: type: string enum: @@ -381,27 +341,33 @@ components: - MANAGEMENT_OPERATION - SON_OPERATION - UNKNOWN + ScopeType: + type: string + enum: + - BASE_ONLY + - BASE_NTH_LEVEL + - BASE_SUBTREE + - BASE_ALL Operation: type: string enum: - add - remove - replace - ScopeType: + Insert: type: string enum: - - BASE_ONLY - - BASE_NTH_LEVEL - - BASE_SUBTREE - - BASE_ALL - Scope: - type: object - properties: - scopeType: - $ref: '#/components/schemas/ScopeType' - scopeLevel: - type: integer - + - before + - after + PatchOperation: + type: string + enum: + - add + - replace + - remove + - copy + - move + - test Resource: oneOf: @@ -426,8 +392,29 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' - + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' + Scope: + type: object + properties: + scopeType: + $ref: '#/components/schemas/ScopeType' + scopeLevel: + type: integer + CorrelatedNotification: + type: object + properties: + source: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + notificationIds: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' + required: + - source + - notificationIds MoiChange: type: object properties: @@ -445,13 +432,14 @@ components: $ref: '#/components/schemas/Operation' path: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + insert: + $ref: '#/components/schemas/Insert' value: {} oldValue: {} required: - notificationId - op - path - NotifyMoiCreation: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -510,3 +498,13 @@ components: $ref: '#/components/schemas/MoiChange' required: - moiChanges + PatchItem: + type: object + properties: + op: + $ref: '#/components/schemas/PatchOperation' + from: + type: string + path: + type: string + value: {} -- GitLab From 776b53b5fb51d5d286e84afbff31f1a513f2618b Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 15 Mar 2023 05:44:05 +0000 Subject: [PATCH 69/70] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 66 ++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index fdd59687d..8b4bd52f5 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -86,6 +86,33 @@ components: type: string swImageRef: type: string + Duration: + type: object + properties: + startTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + endTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + EASServicePermission: + type: string + description: any of enumrated value + enum: + - TRIAL + - SILVER + - GOLD + EASFeature: + type: string + description: any of enumrated value + enum: + - SINGLE + - MULTIPLE + EASStatus: + type: string + description: any of enumrated value + enum: + - ENABLED + - DISABLED + #-------- Definition of concrete IOCs -------------------------------------------- MnS: @@ -152,6 +179,35 @@ components: items: type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + EASProfile-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + aCID: + type: string + eASProvider: + type: string + eASdescription: + type: string + eASSchedule: + $ref: '#/components/schemas/Duration' + eASGeographicalServiceArea: + $ref: '#/components/schemas/GeoLoc' + eASTopologicalServiceArea: + $ref: '#/components/schemas/TopologicalServiceArea' + eASServicePermissionLevel: + $ref: '#/components/schemas/EASServicePermission' + eASFeature: + $ref: '#/components/schemas/EASFeature' + eASServiceContinuitySupport: + type: boolean + eASDNAI: + type: string + eASAvailabilityReportingPeriod: + type: integer + eASStatus: + $ref: '#/components/schemas/EASStatus' EESFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -223,6 +279,11 @@ components: $ref: '#/components/schemas/VirtualResource' softwareImageInfo: $ref: '#/components/schemas/SoftwareImageInfo' + eASSchedule: + $ref: '#/components/schemas/Duration' + eASFeature: + $ref: '#/components/schemas/EASFeature' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -246,6 +307,10 @@ components: type: array items: $ref: '#/components/schemas/EdgeDataNetwork-Single' + EASProfile-Multiple: + type: array + items: + $ref: '#/components/schemas/EASProfile-Single' #--------------------------------- Definition ------------------------------------ @@ -258,3 +323,4 @@ components: - $ref: '#/components/schemas/EESFunction-Single' - $ref: '#/components/schemas/EdgeDataNetwork-Single' - $ref: '#/components/schemas/EASRequirements-Single' + - $ref: '#/components/schemas/EASProfile-Single' -- GitLab From f45197b80d0e7229d40371389e4f7526cdf87eb1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Mar 2023 08:52:39 +0000 Subject: [PATCH 70/70] Update the version to alignw with the latest TS version --- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 8b4bd52f5..75dc8c0d1 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 17.1.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab