From 62051f834b7e5b05516dce35e6830861a10b9644 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 26 Jul 2023 11:59:02 +0000 Subject: [PATCH 01/56] Update TS28312_IntentNrm.yaml, update service support to edge service supprt --- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bd3c83c28..b67594cd6 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -44,7 +44,7 @@ components: oneOf: - $ref: "#/components/schemas/IntentExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" intentContexts: type: array items: @@ -91,7 +91,7 @@ components: type: string enum: - RAN_SubNetwork #value for Radio Network Expectation--# - - Service_Support #value for Service Support Expectation--# + - Edge_Service_Support #value for Edge Service Support Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" -- GitLab From 5a5fd695d1ac352df7291de8fedbc4666de0b0c7 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 26 Jul 2023 12:06:13 +0000 Subject: [PATCH 02/56] Update TS28312_IntentExpectations.yaml update service support to edge service support --- OpenAPI/TS28312_IntentExpectations.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 971302e2a..01ab72781 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -46,7 +46,7 @@ components: $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: - expectationId - ServiceSupportExpectation: + EdgeServiceSupportExpectation: description: >- This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment type: object @@ -58,7 +58,7 @@ components: expectationObjects: type: array items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" + $ref: "#/components/schemas/EdgeServiceSupportExpectationObject" expectationTargets: type: array items: @@ -111,15 +111,15 @@ components: - $ref: "#/components/schemas/NRFqBandContext" - $ref: "#/components/schemas/RATContext" - $ref: "#/components/schemas/ObjectContext" - ServiceSupportExpectationObject: + EdgeServiceSupportExpectationObject: description: >- - This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation + This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation type: object properties: objectType: type: string enum: - - Service_Support #value for Service Support Expectation--# + - EdgeService_Support #value for Edge Service Support Expectation--# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: -- GitLab From 6e90645f93f760612bb5901f2e843dabc9c0a64b Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 8 Aug 2023 13:31:04 +0000 Subject: [PATCH 03/56] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7eeb11a6c..466a86854 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1558,6 +1558,27 @@ components: additionalProperties: $ref: '#/components/schemas/NssaafInfo' minProperties: 1 + NTNPLMNRestrictionsInfo: + description: restrictions per PLMN that relates to non-terrestrial network access + type: object + properties: + pLMNId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + blockedLocationInfoList: + type: array + items: + $ref: '#/components/schemas/BlockedLocationInfoList' + minItems: 1 + BlockedLocationInfoList: + description: location for which the PLMN access restrictions are to be applied in case of NTN + type: object + properties: + blockedLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + blockedDur: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + blockedSlice: + type: string #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1715,6 +1736,9 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + nTNPLMNInfoList: + $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 331d8d2959aef2f6b5fb6c0a1ec782cdcf865f9f Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 9 Aug 2023 09:56:50 +0000 Subject: [PATCH 04/56] TS28.541_Rel18_CR0973 --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++-------- OpenAPI/TS28541_NrNrm.yaml | 12 ++++++------ OpenAPI/TS28541_SliceNrm.yaml | 8 +++++--- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7eeb11a6c..a820a9a02 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -112,7 +112,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' NFStatus: type: string - description: any of enumrated value + description: any of enumerated value enum: - REGISTERED - SUSPENDED @@ -152,7 +152,7 @@ components: minItems: 1 SupportedDataSet: type: string - description: any of enumrated value + description: any of enumerated value enum: - SUBSCRIPTION - POLICY @@ -190,7 +190,7 @@ components: type: string n1MessageClass: type: boolean - n2InfroamtionClass: + n2InformationClass: type: boolean versions: type: string @@ -273,7 +273,7 @@ components: type: string SEPPType: type: string - description: any of enumrated value + description: any of enumerated value enum: - CSEPP - PSEPP @@ -290,7 +290,7 @@ components: $ref: '#/components/schemas/SupportedFunc' CommModelType: type: string - description: any of enumrated value + description: any of enumerated value enum: - DIRECT_COMMUNICATION_WO_NRF - DIRECT_COMMUNICATION_WITH_NRF @@ -533,9 +533,9 @@ components: enum: - INACTIVE - ACTIVE - activeEacThreshhold: + activeEacThreshold: type: integer - deactiveEacThreshhold: + deactiveEacThreshold: type: integer numberofUEs: type: integer @@ -675,7 +675,7 @@ components: ProseCapability: type: object properties: - proseDirectDiscovey: + proseDirectDiscovery: type: boolean proseDirectCommunication: type: boolean diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 9ba9997e3..0b2a1233c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -182,7 +182,7 @@ components: timeDuration: type: integer - UeAccProbilityDist: + UeAccProbabilityDist: type: object properties: targetProbability: @@ -190,7 +190,7 @@ components: numberofpreamblessent: type: integer - UeAccDelayProbilityDist: + UeAccDelayProbabilityDist: type: object properties: targetProbability: @@ -1418,10 +1418,10 @@ components: properties: drachOptimizationControl: type: boolean - ueAccProbilityDist: - $ref: "#/components/schemas/UeAccProbilityDist" - ueAccDelayProbilityDist: - $ref: "#/components/schemas/UeAccDelayProbilityDist" + ueAccProbabilityDist: + $ref: "#/components/schemas/UeAccProbabilityDist" + ueAccDelayProbabilityDist: + $ref: "#/components/schemas/UeAccDelayProbabilityDist" - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' DMROFunction-Single: diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2803d6d87..32f12a050 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -522,7 +522,9 @@ components: v2XCommModels: $ref: '#/components/schemas/V2XCommModels' coverageArea: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' termDensity: $ref: '#/components/schemas/TermDensity' activityFactor: @@ -641,7 +643,7 @@ components: type: boolean RequestedReservationExpiration: description: >- - An attribute which specifes MnS consuner's requirements for the validity period of the resource reservation. + An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. type: string ResourceReservationStatus: description: >- @@ -653,7 +655,7 @@ components: - USED ReservationExpiration: description: >- - An attribute which specifes the actual validity period of the resource reservation.. + An attribute which specifies the actual validity period of the resource reservation.. type: string ReservationFailureReason: description: >- -- GitLab From 2952de3a64271ca309a34d4f4edb06cda7bcfd5d Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 10 Aug 2023 02:48:30 +0000 Subject: [PATCH 05/56] TS28.541_Rel18_CR0962 --- OpenAPI/TS28541_5GcNrm.yaml | 71 +++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7eeb11a6c..eda57f34e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1559,6 +1559,47 @@ components: $ref: '#/components/schemas/NssaafInfo' minProperties: 1 + BsfInfo: + description: Information of a BSF NF Instance + type: object + properties: + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 0 + ipDomainList: + type: array + items: + type: string + minItems: 0 + ipv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 0 + ipv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 0 + rxDiamHost: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + rxDiamRealm: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 0 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 0 + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1668,6 +1709,8 @@ components: $ref: '#/components/schemas/ChfFunction-Multiple' MFAFFunction: $ref: '#/components/schemas/MfafFunction-Multiple' + BSFFunction: + $ref: '#/components/schemas/BsfFunction-Multiple' AmfFunction-Single: allOf: @@ -3446,6 +3489,29 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + BsfFunction-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' + bsfInfo: + $ref: '#/components/schemas/BsfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -3770,6 +3836,10 @@ components: type: array items: $ref: '#/components/schemas/MfafFunction-Single' + BsfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/BsfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3868,3 +3938,4 @@ components: - $ref: '#/components/schemas/DccfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' - $ref: '#/components/schemas/MfafFunction-Single' + - $ref: '#/components/schemas/BsfFunction-Single' -- GitLab From 18be00e6f6487beca3128b97a83dafd23d9b5efb Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 11 Aug 2023 01:07:29 +0000 Subject: [PATCH 06/56] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 74 +++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index f6522edc4..3d99b2570 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1359,6 +1359,70 @@ components: - 32 - 64 - INFINITY + reportAmountM1LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.x. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM4LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.y. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM5LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.z. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM6LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.a. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM7LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.b. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY reportingTrigger-Type: description: See details in 3GPP TS 32.422 clause 5.10.4. @@ -1751,6 +1815,16 @@ components: $ref: '#/components/schemas/positioningMethod-Type' reportAmount: $ref: '#/components/schemas/reportAmount-Type' + reportAmountM1LTE: + $ref: '#/components/schemas/reportAmountM1LTE-Type' + reportAmountM4LTE: + $ref: '#/components/schemas/reportAmountM4LTE-Type' + reportAmountM5LTE: + $ref: '#/components/schemas/reportAmountM5LTE-Type' + reportAmountM6LTE: + $ref: '#/components/schemas/reportAmountM6LTE-Type' + reportAmountM7LTE: + $ref: '#/components/schemas/reportAmountM7LTE-Type' reportingTrigger: $ref: '#/components/schemas/reportingTrigger-Type' reportInterval: -- GitLab From 1e2a18c08101b7aa62e93d6fe21d31160e0bd640 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 09:10:28 +0000 Subject: [PATCH 07/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 971302e2a..395412fec 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -595,7 +595,7 @@ components: enum: - IS_EQUAL_TO contextValueRange: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' ServiceEndTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext @@ -610,7 +610,7 @@ components: enum: - IS_EQUAL_TO contextValueRange: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' UEMobilityLevelContext: description: >- This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext @@ -623,11 +623,9 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_EQUAL_TO contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" + $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" ResourceSharingLevelContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext @@ -640,9 +638,7 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_EQUAL_TO contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From e9cf0e79804977833f7525b854491e85840bcd92 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 09:40:12 +0000 Subject: [PATCH 08/56] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 21 +++++++++------------ OpenAPI/TS28312_IntentNrm.yaml | 7 ++----- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 971302e2a..73b71a754 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -23,10 +23,8 @@ components: type: string expectationVerb: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/RadioNetworkExpectationObject" + expectationObject: + $ref: "#/components/schemas/RadioNetworkExpectationObject" expectationTargets: type: array items: @@ -38,6 +36,7 @@ components: - $ref: "#/components/schemas/AveDLRANUEThptTarget" - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array items: @@ -55,10 +54,8 @@ components: type: string expectationVerb: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" + expectationObject: + $ref: "#/components/schemas/ServiceSupportExpectationObject" expectationTargets: type: array items: @@ -97,7 +94,7 @@ components: objectType: type: string enum: - - RAN_SubNetwork #value for Radio Network Expectation--# + - RAN_SubNetwork objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -110,7 +107,7 @@ components: - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/NRFqBandContext" - $ref: "#/components/schemas/RATContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" ServiceSupportExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation @@ -119,7 +116,7 @@ components: objectType: type: string enum: - - Service_Support #value for Service Support Expectation--# + - Service_Support objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -130,7 +127,7 @@ components: - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - $ref: "#/components/schemas/CoverageAreaTAContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" #-------Definition of the ExpectationObject dataType ----------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bd3c83c28..5516c895b 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -63,10 +63,8 @@ components: type: string expectationVerb: $ref: "#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/ExpectationObject" + expectationObject: + $ref: "#/components/schemas/ExpectationObject" expectationTargets: type: array items: @@ -92,7 +90,6 @@ components: enum: - 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: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: -- GitLab From ee9878bd41ea45fae6e22899355856d6db462364 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 10:15:15 +0000 Subject: [PATCH 09/56] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2803d6d87..6887cdcf3 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -23,14 +23,14 @@ components: enum: - STATIONARY - NOMADIC - - RESTRICTED MOBILITY - - FULLY MOBILITY + - RESTRICTED_MOBILITY + - FULLY_MOBILITY SynAvailability: type: string enum: - - NOT SUPPORTED - - BETWEEN BS AND UE - - BETWEEN BS AND UE & UE AND UE + - NOT_SUPPORTED + - BETWEEN_BS_AND_UE + - BETWEEN_BS_AND_UE_&_UE_AND_UE PositioningAvailability: type: array items: @@ -38,9 +38,9 @@ components: enum: - CIDE-CID - OTDOA - - RF FINGERPRINTING + - RF_FINGERPRINTING - AECID - - HYBRID POSITIONING + - HYBRID_POSITIONING - NET-RTK Predictionfrequency: type: string -- GitLab From 30906018ddf4dde9fff87468e1aed60890492e18 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 12:54:17 +0000 Subject: [PATCH 10/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 971302e2a..4e468d8e2 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -38,6 +38,8 @@ components: - $ref: "#/components/schemas/AveDLRANUEThptTarget" - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + - $ref: "#/components/schemas/RANEnergyConsumptionReductionRatioTarget" + - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" expectationContexts: type: array items: @@ -313,6 +315,38 @@ components: - IS_LESS_THAN contextValueRange: type: number + RANEnergyConsumptionReductionRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionReductionRatioTarget + type: object + properties: + targetName: + type: string + enum: + - RANEnergyConsumptionReductionRatio + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + RANEnergyEfficiencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget + type: object + properties: + targetName: + type: string + enum: + - RANEnergyEfficiency + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + type: integer DLThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget -- GitLab From bf8d3de0423a773bc54e7cf54c89d341164859cd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 13:22:50 +0000 Subject: [PATCH 11/56] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 16 --- OpenAPI/TS28312_IntentNrm.yaml | 158 ++++++++++++++++++++++-- 2 files changed, 150 insertions(+), 24 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 971302e2a..bd5e1f883 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -42,8 +42,6 @@ components: type: array items: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: - expectationId ServiceSupportExpectation: @@ -82,8 +80,6 @@ components: - $ref: "#/components/schemas/UEMobilityLevelContext" - $ref: "#/components/schemas/ResourceSharingLevelContext" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: - expectationId #-------Definition of the IntentExpectation dataType ----------# @@ -154,8 +150,6 @@ components: maximum: 100 targetContexts: $ref: "#/components/schemas/WeakRSRPContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" WeakRSRPContext: description: >- This data type is the "TargetContext" data type with specialisations for WeakRSRPContext @@ -190,8 +184,6 @@ components: maximum: 100 targetContexts: $ref: "#/components/schemas/LowSINRContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowSINRContext: description: >- This data type is the "TargetContext" data type with specialisations for LowSINRContext @@ -222,8 +214,6 @@ components: - IS_GREATER_THAN targetValueRange: type: integer - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" AveDLRANUEThptTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget @@ -239,8 +229,6 @@ components: - IS_GREATER_THAN targetValueRange: type: integer - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowULRANUEThptRatioTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget @@ -260,8 +248,6 @@ components: maximum: 100 targetContexts: $ref: "#/components/schemas/LowULRANUEThptContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowULRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext @@ -296,8 +282,6 @@ components: maximum: 100 targetContexts: $ref: "#/components/schemas/LowDLRANUEThptContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowDLRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bd3c83c28..98247621c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -27,8 +27,8 @@ components: properties: SubNetwork: $ref: '#/components/schemas/SubNetwork-Multiple' - Intent: - $ref: '#/components/schemas/Intent-Multiple' + IntentHandlingFunction: + $ref: '#/components/schemas/IntentHandlingFunction-Multiple' Intent-Single: allOf: @@ -49,8 +49,45 @@ components: type: array items: $ref: "#/components/schemas/IntentContext" - intentFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + observationPeriod: + type: integer + intentReportReference: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + + IntentReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + intentFulfilmentReport: + type: array + items: + $ref: "#/components/schemas/IntentFulfilmentReport" + intentConflictReports: + type: array + items: + $ref: "#/components/schemas/IntentConflictReport" + intentFeasibilityCheckReport: + type: array + items: + $ref: "#/components/schemas/IntentFeasibilityCheckReport" + intentReference: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + + IntentHandlingFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + intentHandlingCapabilityList: + type: array + items: + $ref: "/components/schemas/IntentHandlingCapability" + Intent: + $ref: '#/components/schemas/Intent-Multiple' + IntentReport: + $ref: '#/components/schemas/IntentReport-Multiple' + #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# @@ -75,8 +112,6 @@ components: type: array items: $ref: "#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" required: - expectationId #-------Definition of the generic IntentExpectation dataType ----------# @@ -229,7 +264,102 @@ components: items: type: number #-------Definition of the concrete ExpectionContext dataType----------------# - + #-------Definition of the generic IntentFulfilmentReport dataType----------------# + IntentFulfilmentReport: + description: >- + This data type is the "IntentFulfilmentReport" data type without specialisations + type: object + properties: + intentFulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + expectationFulfilmentResult: + type: array + items: + $ref: "#/components/schemas/ExpectationFulfilmentResult" + #-------Definition of the concrete IntentFulfilmentReport dataType----------------# + + #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# + ExpectationFulfilmentResult: + description: >- + This data type is the "ExpectationFulfilmentResult" data type without specialisations + type: object + properties: + expectaitonId: + type: string + expectationFulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + targetFulfilmentResult: + type: array + items: + $ref: "#/components/schemas/TargetFulfilmentResult" + #-------Definition of the concrete ExpectationFulfilmentResult dataType----------------# + + #-------Definition of the generic TargetFulfilmentResult dataType----------------# + TargetFulfilmentResult: + description: >- + This data type is the "TargetFulfilmentResult" data type without specialisations + type: object + properties: + targetName: + type: string + targetFulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + targetAchievedValue: + type: number + #-------Definition of the concrete TargetFulfilmentResult dataType----------------# + + #-------Definition of the generic IntentConflictReport dataType----------------# + IntentConflictReport: + description: >- + This data type is the "IntentConflictReport" data type without specialisations + type: object + properties: + conflictType: + type: string + enum: + - INTENT_CONFLICT + - EXPECTATION_CONFLICT + - TARGET_CONFLICT + conflictField: + type: string + #-------Definition of the concrete IntentConflictReport dataType----------------# + + #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# + IntentFeasibilityCheckReport: + description: >- + This data type is the "IntentFeasibilityCheckReport" data type without specialisations + type: object + properties: + feasibilityCheckResult: + type: string + enum: + - FEASIBLE + - INFEASIBLE + infeasibilityReason: + description: -> + An attribute which is used when feasibilityCheckResult is INFEASIBLE + type: string + #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# + + #-------Definition of the generic IntentHandlingCapability dataType----------------# + IntentHandlingCapability: + description: >- + This data type is the "IntentHandlingCapability" data type without specialisations + type: object + properties: + intentHandlingCapabilityId: + type: string + supportedExpectationObjectType: + type: string + enum: + - RAN_SUBNETWORK + - EDGE_SERVICE_SUPPORT + supportedExpectationTargetType: + type: array + items: + $ref: "#/components/schemas/ExpectationTarget" + #-------Definition of the concrete IntentHandlingCapability dataType----------------# + #------Definition of JSON arrays for name-contained IOCs ---------------# SubNetwork-Multiple: @@ -240,7 +370,19 @@ components: Intent-Multiple: type: array items: - $ref: '#/components/schemas/Intent-Single' + $ref: '#/components/schemas/Intent-Single' + + IntentReport-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentReport-Single' + + IntentHandlingFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentHandlingFunction-Single' + + #------Definition of JSON arrays for name-contained IOCs ---------------# #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From f8a5e4d51236b53da5f1ce5db29ad2854ef1a749 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 13:45:10 +0000 Subject: [PATCH 12/56] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 98 ++++++++++++------------- OpenAPI/TS28312_IntentNrm.yaml | 60 ++++++++------- 2 files changed, 78 insertions(+), 80 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index bd5e1f883..5e42457aa 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -22,26 +22,26 @@ components: expectationId: type: string expectationVerb: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb' expectationObjects: type: array items: - $ref: "#/components/schemas/RadioNetworkExpectationObject" + $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/WeakRSRPRatioTarget' + - $ref: '#/components/schemas/LowSINRRatioTarget' + - $ref: '#/components/schemas/AveULRANUEThptTarget' + - $ref: '#/components/schemas/AveDLRANUEThptTarget' + - $ref: '#/components/schemas/LowULRANUEThptRatioTarget' + - $ref: '#/components/schemas/LowDLRANUEThptRatioTarget' expectationContexts: type: array items: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId ServiceSupportExpectation: @@ -52,34 +52,34 @@ components: expectationId: type: string expectationVerb: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb' expectationObjects: type: array items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" + $ref: '#/components/schemas/ServiceSupportExpectationObject' expectationTargets: type: array items: type: object oneOf: - - $ref: "#/components/schemas/DLThptPerUETarget" - - $ref: "#/components/schemas/ULThptPerUETarget" - - $ref: "#/components/schemas/DLLatencyTarget" - - $ref: "#/components/schemas/ULLatencyTarget" - - $ref: "#/components/schemas/MaxNumberofUEsTarget" - - $ref: "#/components/schemas/ActivityFactorTarget" - - $ref: "#/components/schemas/UESpeedTarget" - - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" + - $ref: '#/components/schemas/DLThptPerUETarget' + - $ref: '#/components/schemas/ULThptPerUETarget' + - $ref: '#/components/schemas/DLLatencyTarget' + - $ref: '#/components/schemas/ULLatencyTarget' + - $ref: '#/components/schemas/MaxNumberofUEsTarget' + - $ref: '#/components/schemas/ActivityFactorTarget' + - $ref: '#/components/schemas/UESpeedTarget' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array items: type: object oneOf: - - $ref: "#/components/schemas/ServiceStartTimeContext" - - $ref: "#/components/schemas/ServiceEndTimeContext" - - $ref: "#/components/schemas/UEMobilityLevelContext" - - $ref: "#/components/schemas/ResourceSharingLevelContext" - - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + - $ref: '#/components/schemas/ServiceStartTimeContext' + - $ref: '#/components/schemas/ServiceEndTimeContext' + - $ref: '#/components/schemas/UEMobilityLevelContext' + - $ref: '#/components/schemas/ResourceSharingLevelContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId #-------Definition of the IntentExpectation dataType ----------# @@ -95,18 +95,18 @@ components: enum: - RAN_SubNetwork #value for Radio Network Expectation--# objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array items: type: object oneOf: - - $ref: "#/components/schemas/CoverageAreaPolygonContext" - - $ref: "#/components/schemas/CoverageTACContext" - - $ref: "#/components/schemas/PLMNContext" - - $ref: "#/components/schemas/NRFqBandContext" - - $ref: "#/components/schemas/RATContext" - - $ref: "#/components/schemas/ObjectContext" + - $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 @@ -117,16 +117,16 @@ components: enum: - Service_Support #value for Service Support Expectation--# objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $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" + - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' + - $ref: '#/components/schemas/EdgeIdenfiticationLocContext' + - $ref: '#/components/schemas/CoverageAreaTAContext' + - $ref: '#/components/schemas/ObjectContext' #-------Definition of the ExpectationObject dataType ----------# @@ -149,7 +149,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/WeakRSRPContext" + $ref: '#/components/schemas/WeakRSRPContext' WeakRSRPContext: description: >- This data type is the "TargetContext" data type with specialisations for WeakRSRPContext @@ -183,7 +183,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/LowSINRContext" + $ref: '#/components/schemas/LowSINRContext' LowSINRContext: description: >- This data type is the "TargetContext" data type with specialisations for LowSINRContext @@ -247,7 +247,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/LowULRANUEThptContext" + $ref: '#/components/schemas/LowULRANUEThptContext' LowULRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext @@ -281,7 +281,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/LowDLRANUEThptContext" + $ref: '#/components/schemas/LowDLRANUEThptContext' LowDLRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext @@ -311,7 +311,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' ULThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget @@ -326,7 +326,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' DLLatencyTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget @@ -413,7 +413,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Condition" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Condition' contextValueRange: type: array items: @@ -434,7 +434,7 @@ components: contextValueRange: type: array items: - $ref: "#/components/schemas/CoverageArea" + $ref: '#/components/schemas/CoverageArea' CoverageArea: type: string CoverageTACContext: @@ -453,7 +453,7 @@ components: contextValueRange: type: array items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" + $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac' PLMNContext: description: >- This data type is the "ObjectContext" data type with specialisations for PLMNContext @@ -470,7 +470,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' NRFqBandContext: description: >- This data type is the "ObjectContext" data type with specialisations for NRFqBandContext @@ -559,7 +559,7 @@ components: contextValueRange: type: array items: - $ref: "#/components/schemas/CoverageAreaTAList" + $ref: '#/components/schemas/CoverageAreaTAList' CoverageAreaTAList: type: integer #-------Definition of the scenario specific ObjectTarget dataType----------------# @@ -611,7 +611,7 @@ components: contextValueRange: type: array items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel' ResourceSharingLevelContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext @@ -628,5 +628,5 @@ components: contextValueRange: type: array items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SharingLevel' #-------Definition of the concrete ExpectionContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 98247621c..7a641df28 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -42,17 +42,17 @@ components: items: type: object oneOf: - - $ref: "#/components/schemas/IntentExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation" + - $ref: '#/components/schemas/IntentExpectation' + - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation' + - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation' intentContexts: type: array items: - $ref: "#/components/schemas/IntentContext" + $ref: '#/components/schemas/IntentContext' observationPeriod: type: integer intentReportReference: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentReport-Single: allOf: @@ -62,17 +62,17 @@ components: intentFulfilmentReport: type: array items: - $ref: "#/components/schemas/IntentFulfilmentReport" + $ref: '#/components/schemas/IntentFulfilmentReport' intentConflictReports: type: array items: - $ref: "#/components/schemas/IntentConflictReport" + $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: type: array items: - $ref: "#/components/schemas/IntentFeasibilityCheckReport" + $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentReference: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentHandlingFunction-Single: allOf: @@ -82,7 +82,7 @@ components: intentHandlingCapabilityList: type: array items: - $ref: "/components/schemas/IntentHandlingCapability" + $ref: '#/components/schemas/IntentHandlingCapability' Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: @@ -99,19 +99,19 @@ components: expectationId: type: string expectationVerb: - $ref: "#/components/schemas/ExpectationVerb" + $ref: '#/components/schemas/ExpectationVerb' expectationObjects: type: array items: - $ref: "#/components/schemas/ExpectationObject" + $ref: '#/components/schemas/ExpectationObject' expectationTargets: type: array items: - $ref: "#/components/schemas/ExpectationTarget" + $ref: '#/components/schemas/ExpectationTarget' expectationContexts: type: array items: - $ref: "#/components/schemas/ExpectationContext" + $ref: '#/components/schemas/ExpectationContext' required: - expectationId #-------Definition of the generic IntentExpectation dataType ----------# @@ -129,11 +129,11 @@ components: - Service_Support #value for Service Support Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array items: - $ref: "#/components/schemas/ObjectContext" + $ref: '#/components/schemas/ObjectContext' #-------Definition of the generic ExpectationObject dataType ----------# @@ -171,7 +171,7 @@ components: type: object properties: fulfilStatus: - $ref: "#/components/schemas/FulfilStatus" + $ref: '#/components/schemas/FulfilStatus' notFullfilledState: description: -> An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo @@ -197,7 +197,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: type: array items: @@ -213,13 +213,13 @@ components: targetName: type: string targetCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' targetValueRange: type: number targetContexts: type: array items: - $ref: "#/components/schemas/TargetContext" + $ref: '#/components/schemas/TargetContext' TargetContext: description: >- This data type is the "TargetContext" data type without specialisations @@ -228,7 +228,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: type: number #-------Definition of the generic ExpectationTarget dataType----------# @@ -242,7 +242,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: type: array items: @@ -258,7 +258,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: type: array items: @@ -271,11 +271,11 @@ components: type: object properties: intentFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/FulfilmentInfo' expectationFulfilmentResult: type: array items: - $ref: "#/components/schemas/ExpectationFulfilmentResult" + $ref: '#/components/schemas/ExpectationFulfilmentResult' #-------Definition of the concrete IntentFulfilmentReport dataType----------------# #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# @@ -287,11 +287,11 @@ components: expectaitonId: type: string expectationFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/FulfilmentInfo' targetFulfilmentResult: type: array items: - $ref: "#/components/schemas/TargetFulfilmentResult" + $ref: '#/components/schemas/TargetFulfilmentResult' #-------Definition of the concrete ExpectationFulfilmentResult dataType----------------# #-------Definition of the generic TargetFulfilmentResult dataType----------------# @@ -303,7 +303,7 @@ components: targetName: type: string targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: type: number #-------Definition of the concrete TargetFulfilmentResult dataType----------------# @@ -342,9 +342,7 @@ components: #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# #-------Definition of the generic IntentHandlingCapability dataType----------------# - IntentHandlingCapability: - description: >- - This data type is the "IntentHandlingCapability" data type without specialisations + IntentHandlingCapability: type: object properties: intentHandlingCapabilityId: -- GitLab From 215d5ed1a1fa3b1424845b7508d3804c21d8bc73 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 14:10:13 +0000 Subject: [PATCH 13/56] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bd3c83c28..990d43f34 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -51,6 +51,11 @@ components: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" + intentAdminState: + type: string + enum: + - ACTIVATED + - DEACTIVATED #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# -- GitLab From c5c2bacf6c8740cc593402382347207323f6f773 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 14:17:28 +0000 Subject: [PATCH 14/56] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 990d43f34..b6ec1965e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -54,8 +54,8 @@ components: intentAdminState: type: string enum: - - ACTIVATED - - DEACTIVATED + - ACTIVATED + - DEACTIVATED #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# -- GitLab From b7938784a76d11921dfa69e63eb9f1196492328d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 14:23:27 +0000 Subject: [PATCH 15/56] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index b6ec1965e..a65c716b1 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -53,9 +53,10 @@ components: $ref: "#/components/schemas/FulfilmentInfo" intentAdminState: type: string - enum: + enum: - ACTIVATED - DEACTIVATED + #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# -- GitLab From eb89ec81712a1f462890931d8a2f8937ae4bc487 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 14:40:06 +0000 Subject: [PATCH 16/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 971302e2a..b150b8a6a 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -110,6 +110,7 @@ components: - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/NRFqBandContext" - $ref: "#/components/schemas/RATContext" + - $ref: "#/components/schemas/TargetedScopeContext" - $ref: "#/components/schemas/ObjectContext" ServiceSupportExpectationObject: description: >- @@ -525,6 +526,29 @@ components: - UTRAN - EUTRAN - NR + TargetedScopeContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for TargetdScope([5QI, SNSSAI]) + properties: + contextAttribute: + type: string + enum: + - TargetedScope + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "#/components/schemas/TargetedScope" + TargetedScope: + type: object + properties: + fiveQI: + type: integer + sNssai: + 'TS28541_NrNrm.yaml#/components/schemas/snssai' EdgeIdenfiticationIdContext: description: >- This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext -- GitLab From 74280ec87f6ecb80e25af265003d1f05e26df778 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 14:46:25 +0000 Subject: [PATCH 17/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b150b8a6a..ae7590ece 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -527,8 +527,9 @@ components: - EUTRAN - NR TargetedScopeContext: - description: >- + description: >- This data type is the "ObjectContext" data type with specialisations for TargetdScope([5QI, SNSSAI]) + type: object properties: contextAttribute: type: string @@ -543,7 +544,7 @@ components: items: $ref: "#/components/schemas/TargetedScope" TargetedScope: - type: object + type: object properties: fiveQI: type: integer -- GitLab From ac42486fa3598e85fe75740694e148ed6abbe6e5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 14:59:41 +0000 Subject: [PATCH 18/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index ae7590ece..d625d9e8c 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -545,11 +545,11 @@ components: $ref: "#/components/schemas/TargetedScope" TargetedScope: type: object - properties: - fiveQI: - type: integer - sNssai: - 'TS28541_NrNrm.yaml#/components/schemas/snssai' + properties: + fiveQI: + type: integer + sNssai: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/snssai' EdgeIdenfiticationIdContext: description: >- This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext -- GitLab From 7bc72c9fbc2b79b8c65316ea8cf0805f0722576c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 15:14:21 +0000 Subject: [PATCH 19/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index d625d9e8c..6afd4f88d 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -549,7 +549,7 @@ components: fiveQI: type: integer sNssai: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/snssai' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' EdgeIdenfiticationIdContext: description: >- This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext -- GitLab From 29e546921fcdf6fbc337ee1516ff10360c17f948 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 22 Aug 2023 11:18:36 +0000 Subject: [PATCH 20/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 6afd4f88d..b07572ea6 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -110,7 +110,7 @@ components: - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/NRFqBandContext" - $ref: "#/components/schemas/RATContext" - - $ref: "#/components/schemas/TargetedScopeContext" + - $ref: "#/components/schemas/UEGroupContext" - $ref: "#/components/schemas/ObjectContext" ServiceSupportExpectationObject: description: >- @@ -526,15 +526,15 @@ components: - UTRAN - EUTRAN - NR - TargetedScopeContext: + UEGroupContext: description: >- - This data type is the "ObjectContext" data type with specialisations for TargetdScope([5QI, SNSSAI]) + This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI]) type: object properties: contextAttribute: type: string enum: - - TargetedScope + - UEGroup contextCondition: type: string enum: @@ -542,8 +542,8 @@ components: contextValueRange: type: array items: - $ref: "#/components/schemas/TargetedScope" - TargetedScope: + $ref: "#/components/schemas/UEGroup" + UEGroup: type: object properties: fiveQI: -- GitLab From 98cde8d90f57d4b614ae49fad815c4c7d19715f8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 24 Aug 2023 09:13:40 +0000 Subject: [PATCH 21/56] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 6887cdcf3..0e9cc9fe7 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -24,24 +24,24 @@ components: - STATIONARY - NOMADIC - RESTRICTED_MOBILITY - - FULLY_MOBILITY + - FULL_MOBILITY SynAvailability: type: string enum: - NOT_SUPPORTED - BETWEEN_BS_AND_UE - - BETWEEN_BS_AND_UE_&_UE_AND_UE + - BETWEEN_BS_AND_UE_AND_UE_AND_UE PositioningAvailability: type: array items: type: string enum: - - CIDE-CID + - CIDE_CID - OTDOA - RF_FINGERPRINTING - AECID - HYBRID_POSITIONING - - NET-RTK + - NET_RTK Predictionfrequency: type: string enum: @@ -52,22 +52,19 @@ components: type: string enum: - SHARED - - NON-SHARED + - NON_SHARED NetworkSliceSharingIndicator: type: string enum: - SHARED - - NON-SHARED + - NON_SHARED SliceSimultaneousUse: - type: string + type: integer enum: - - ZERO - - ONE - - TWO - - THREE - - FOUR + minimum: 0 + maximum: 4 Category: type: string enum: @@ -98,7 +95,7 @@ components: Support: type: string enum: - - NOT SUPPORTED + - NOT_SUPPORTED - SUPPORTED DelayTolerance: type: object @@ -574,7 +571,7 @@ components: enum: - VLAN - MPLS - - Segment + - SEGMENT logicalInterfaceId: type: string systemName: @@ -590,7 +587,7 @@ components: - EGP - EIGRP - BGP - - IS-IS + - IS_IS ConnectionPointInfo: type: object -- GitLab From 4aa75b9426aa5aa652ba9a3b58e29f7253d5afa6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 24 Aug 2023 09:28:33 +0000 Subject: [PATCH 22/56] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 0e9cc9fe7..3db5c6c55 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -62,7 +62,6 @@ components: SliceSimultaneousUse: type: integer - enum: minimum: 0 maximum: 4 Category: -- GitLab From 775c6bd9fba936c8b710f73dada1de2031d700c9 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 24 Aug 2023 10:21:04 +0000 Subject: [PATCH 23/56] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 466a86854..cca1c76e0 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1576,9 +1576,17 @@ components: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' blockedDur: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: '#/components/schemas/TimeDuration' blockedSlice: type: string + TimeDuration: + description: location for which the PLMN access restrictions are to be applied in case of NTN + type: object + properties: + blockedDurStartTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + blockedDurEndTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: -- GitLab From a8000bf7e3a87dcf05928e5bc8eba8969b12c1ad Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 25 Aug 2023 13:11:38 +0000 Subject: [PATCH 24/56] Ts28.541 rel18 cr0969 removing redundant tai definition in nr nrm --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- OpenAPI/TS28541_NrNrm.yaml | 20 ++++++-------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a820a9a02..a99ad9fb4 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -126,7 +126,7 @@ components: TACList: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' WeightFactor: type: integer AusfInfo: @@ -653,7 +653,7 @@ components: TaiList: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' SupiRange: type: object properties: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 0b2a1233c..3f72009bc 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -97,30 +97,22 @@ components: type: integer maximum: 503 NrTac: - type: integer - maximum: 16777215 + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NrTacList: type: array items: - $ref: '#/components/schemas/NrTac' - Tai: - type: object - properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' TaiList: type: array items: - $ref: '#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' BackhaulAddress: type: object properties: gnbId: $ref: '#/components/schemas/GnbId' tai: - $ref: "#/components/schemas/Tai" + $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" MappingSetIDBackhaulAddress: type: object properties: @@ -949,7 +941,7 @@ components: nrPci: $ref: '#/components/schemas/NrPci' nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' arfcnDL: type: integer arfcnUL: @@ -1039,7 +1031,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NRFrequency-Single: allOf: -- GitLab From ca4a82cdbb3984fd6e7fb5555e0792cb814de254 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 25 Aug 2023 13:16:13 +0000 Subject: [PATCH 25/56] Ts28.541 rel18 cr0970 improve logical interface info model to add support of static route --- OpenAPI/TS28541_SliceNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 32f12a050..9e670a2fd 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -593,6 +593,7 @@ components: - EIGRP - BGP - IS-IS + - STATIC ConnectionPointInfo: type: object -- GitLab From 5880aefc3e5063daf0597c40cf16e0b80c4686c7 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 24 Aug 2023 21:27:43 +0000 Subject: [PATCH 26/56] Rel18_TS28.312_CR0117 --- OpenAPI/TS28312_IntentExpectations.yaml | 16 ++++++++-------- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 971302e2a..a7c0ed1c7 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -127,8 +127,8 @@ components: items: type: object oneOf: - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" + - $ref: "#/components/schemas/EdgeIdentificationIdContext" + - $ref: "#/components/schemas/EdgeIdentificationLocContext" - $ref: "#/components/schemas/CoverageAreaTAContext" - $ref: "#/components/schemas/ObjectContext" #-------Definition of the ExpectationObject dataType ----------# @@ -525,9 +525,9 @@ components: - UTRAN - EUTRAN - NR - EdgeIdenfiticationIdContext: + EdgeIdentificationIdContext: description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext + This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext type: object properties: contextAttribute: @@ -542,9 +542,9 @@ components: type: array items: type: string - EdgeIdenfiticationLocContext: + EdgeIdentificationLocContext: description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext + This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationLocContext type: object properties: contextAttribute: @@ -580,7 +580,7 @@ components: type: integer #-------Definition of the scenario specific ObjectTarget dataType----------------# - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the concrete ExpectationContext dataType----------------# ServiceStartTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext @@ -645,4 +645,4 @@ components: type: array items: $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the concrete ExpectationContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bd3c83c28..ad5776aba 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -92,7 +92,7 @@ components: enum: - 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-# + - TBD #-This will be added based on defined scenario specific intent expectation-# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -228,7 +228,7 @@ components: type: array items: type: number - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the concrete ExpectationContext dataType----------------# #------Definition of JSON arrays for name-contained IOCs ---------------# -- GitLab From 42ec669b03e7f61feccbdd412a1334497ebc2e19 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Aug 2023 09:13:19 +0000 Subject: [PATCH 27/56] Ts28.541 rel18 cr0965 nrm enhancements for gmlc function --- OpenAPI/TS28541_5GcNrm.yaml | 153 ++++++++++++++++++++++++++++++++++-- 1 file changed, 147 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a99ad9fb4..3f60d5ebb 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1558,6 +1558,19 @@ components: additionalProperties: $ref: '#/components/schemas/NssaafInfo' minProperties: 1 + GmlcInfo: + description: Information of a GMLC NF Instance + type: object + properties: + servingClientTypes: + type: array + items: + $ref: '#/components/schemas/ExternalClientType' + gmlcNumbers: + type: array + items: + type: string + pattern: '^[0-9]{5,15}$' #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1668,6 +1681,8 @@ components: $ref: '#/components/schemas/ChfFunction-Multiple' MFAFFunction: $ref: '#/components/schemas/MfafFunction-Multiple' + GMLCFunction: + $ref: '#/components/schemas/GmlcFunction-Multiple' AmfFunction-Single: allOf: @@ -1740,8 +1755,8 @@ components: $ref: '#/components/schemas/EP_N26-Multiple' EP_NLS: $ref: '#/components/schemas/EP_NLS-Multiple' - EP_NLG: - $ref: '#/components/schemas/EP_NLG-Multiple' + EP_NL2: + $ref: '#/components/schemas/EP_NL2-Multiple' EP_N58: $ref: '#/components/schemas/EP_N58-Multiple' EP_N41: @@ -1860,6 +1875,8 @@ components: $ref: '#/components/schemas/EP_S5C-Multiple' EP_N40: $ref: '#/components/schemas/EP_N40-Multiple' + EP_N88: + $ref: '#/components/schemas/EP_N88-Multiple' FiveQiDscpMappingSet: $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' GtpUPathQoSMonitoringControl: @@ -2089,6 +2106,8 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' EP_N59: $ref: '#/components/schemas/EP_N13-Multiple' + EP_NL6: + $ref: '#/components/schemas/EP_NL6-Multiple' UdrFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2307,6 +2326,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' nwdafInfo: $ref: '#/components/schemas/NwdafInfo' + - type: object + properties: + EP_NL3: + $ref: '#/components/schemas/EP_NL3-Multiple' ScpFunction-Single: allOf: @@ -2392,6 +2415,9 @@ components: properties: EP_N33: $ref: '#/components/schemas/EP_N33-Multiple' + EP_NL5: + $ref: '#/components/schemas/EP_NL5-Multiple' + NsacfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2984,7 +3010,63 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_NLG-Single: + EP_NL2-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_NL3-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_NL5-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_NL6-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_NL9-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -3446,6 +3528,39 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + GmlcFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + gmlcInfo: + $ref: '#/components/schemas/GmlcInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_NL2: + $ref: '#/components/schemas/EP_NL2-Multiple' + EP_NL3: + $ref: '#/components/schemas/EP_NL3-Multiple' + EP_NL5: + $ref: '#/components/schemas/EP_NL5-Multiple' + EP_NL6: + $ref: '#/components/schemas/EP_NL6-Multiple' + EP_NL9: + $ref: '#/components/schemas/EP_NL9-Multiple' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -3702,10 +3817,26 @@ components: type: array items: $ref: '#/components/schemas/EP_NLS-Single' - EP_NLG-Multiple: + EP_NL2-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL2-Single' + EP_NL3-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL3-Single' + EP_NL5-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL5-Single' + EP_NL6-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_NL6-Single' + EP_NL9-Multiple: type: array items: - $ref: '#/components/schemas/EP_NLG-Single' + $ref: '#/components/schemas/EP_NL9-Single' EP_N60-Multiple: type: array items: @@ -3770,6 +3901,10 @@ components: type: array items: $ref: '#/components/schemas/MfafFunction-Single' + GmlcFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/GmlcFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3856,7 +3991,12 @@ components: - $ref: '#/components/schemas/EP_Rx-Single' - $ref: '#/components/schemas/EP_MAP_SMSC-Single' - $ref: '#/components/schemas/EP_NLS-Single' - - $ref: '#/components/schemas/EP_NLG-Single' + - $ref: '#/components/schemas/EP_NL2-Single' + - $ref: '#/components/schemas/EP_NL3-Single' + - $ref: '#/components/schemas/EP_NL5-Single' + - $ref: '#/components/schemas/EP_NL6-Single' + - $ref: '#/components/schemas/EP_NL9-Single' + - $ref: '#/components/schemas/Configurable5QISet-Single' - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' @@ -3868,3 +4008,4 @@ components: - $ref: '#/components/schemas/DccfFunction-Single' - $ref: '#/components/schemas/ChfFunction-Single' - $ref: '#/components/schemas/MfafFunction-Single' + - $ref: '#/components/schemas/GmlcFunction-Single' -- GitLab From 8f5b693021a63cea64f7f3ab01e4cf6883dad337 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Aug 2023 10:01:14 +0000 Subject: [PATCH 28/56] Ts28.541 rel18 cr0964 nrm enhancements for tsctsf function --- OpenAPI/TS28541_5GcNrm.yaml | 271 +++++++++++++++++++++++++++++++++++- 1 file changed, 270 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 3f60d5ebb..409e8ad7a 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1572,6 +1572,108 @@ components: type: string pattern: '^[0-9]{5,15}$' + SnssaiTsctsfInfoItem: + description: Set of parameters supported by TSCTSF for a given S-NSSAI + type: object + required: + - sNssai + - dnnInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnInfoList: + type: array + items: + $ref: '#/components/schemas/DnnTsctsfInfoItem' + minItems: 1 + DnnTsctsfInfoItem: + description: Parameters supported by an TSCTSF 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' + TsctsfInfo: + description: Information of a TSCTSF NF Instance + type: object + properties: + sNssaiInfoList: + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/SnssaiTsctsfInfoItem' + minProperties: 0 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + internalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/InternalGroupIdRange' + + + SnssaiTsctsfInfoItem: + description: Set of parameters supported by TSCTSF for a given S-NSSAI + type: object + required: + - sNssai + - dnnInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnInfoList: + type: array + items: + $ref: '#/components/schemas/DnnTsctsfInfoItem' + minItems: 1 + DnnTsctsfInfoItem: + description: Parameters supported by an TSCTSF 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' + TsctsfInfo: + description: Information of a TSCTSF NF Instance + type: object + properties: + sNssaiInfoList: + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/SnssaiTsctsfInfoItem' + minProperties: 0 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + internalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/InternalGroupIdRange' + + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -1683,6 +1785,8 @@ components: $ref: '#/components/schemas/MfafFunction-Multiple' GMLCFunction: $ref: '#/components/schemas/GmlcFunction-Multiple' + TSCTSFFunction: + $ref: '#/components/schemas/TsctsfFunction-Multiple' AmfFunction-Single: allOf: @@ -1763,6 +1867,8 @@ components: $ref: '#/components/schemas/EP_N41-Multiple' EP_N42: $ref: '#/components/schemas/EP_N42-Multiple' + EP_N89: + $ref: '#/components/schemas/EP_N89-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2043,6 +2149,8 @@ components: $ref: '#/components/schemas/EP_N28-Multiple' EP_Rx: $ref: '#/components/schemas/EP_Rx-Multiple' + EP_N84: + $ref: '#/components/schemas/EP_N84-Multiple' PredefinedPccRuleSet: $ref: '#/components/schemas/PredefinedPccRuleSet-Single' @@ -2108,6 +2216,8 @@ components: $ref: '#/components/schemas/EP_N13-Multiple' EP_NL6: $ref: '#/components/schemas/EP_NL6-Multiple' + EP_N87: + $ref: '#/components/schemas/EP_N87-Multiple' UdrFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2171,6 +2281,8 @@ components: properties: EP_N27: $ref: '#/components/schemas/EP_N27-Multiple' + EP_N96: + $ref: '#/components/schemas/EP_N96-Multiple' NssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2417,7 +2529,8 @@ components: $ref: '#/components/schemas/EP_N33-Multiple' EP_NL5: $ref: '#/components/schemas/EP_NL5-Multiple' - + EP_N85: + $ref: '#/components/schemas/EP_N85-Multiple' NsacfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3342,6 +3455,8 @@ components: properties: EP_N5: $ref: '#/components/schemas/EP_N5-Multiple' + EP_N86: + $ref: '#/components/schemas/EP_N86-Multiple' NssaafFunction-Single: allOf: @@ -3561,6 +3676,125 @@ components: $ref: '#/components/schemas/EP_NL6-Multiple' EP_NL9: $ref: '#/components/schemas/EP_NL9-Multiple' + TsctsfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + TsctsfInfo: + $ref: '#/components/schemas/TsctsfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N84: + $ref: '#/components/schemas/EP_N84-Multiple' + EP_N85: + $ref: '#/components/schemas/EP_N85-Multiple' + EP_N86: + $ref: '#/components/schemas/EP_N86-Multiple' + EP_N87: + $ref: '#/components/schemas/EP_N87-Multiple' + EP_N89: + $ref: '#/components/schemas/EP_N89-Multiple' + EP_N96: + $ref: '#/components/schemas/EP_N96-Multiple' + EP_N84-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_N85-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_N86-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_N87-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_N89-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_N96-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 ---------------------- @@ -3857,10 +4091,34 @@ components: type: array items: $ref: '#/components/schemas/EP_Npc8-Single' + EP_N84-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N84-Single' + EP_N85-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N85-Single' + EP_N86-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N86-Single' + EP_N87-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N87-Single' EP_N88-Multiple: type: array items: $ref: '#/components/schemas/EP_N88-Single' + EP_N89-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N89-Single' + EP_N96-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N96-Single' Configurable5QISet-Multiple: type: array items: @@ -3905,6 +4163,10 @@ components: type: array items: $ref: '#/components/schemas/GmlcFunction-Single' + TsctsfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/TsctsfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -3979,7 +4241,13 @@ components: - $ref: '#/components/schemas/EP_N58-Single' - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' + - $ref: '#/components/schemas/EP_N84-Single' + - $ref: '#/components/schemas/EP_N85-Single' + - $ref: '#/components/schemas/EP_N86-Single' + - $ref: '#/components/schemas/EP_N87-Single' - $ref: '#/components/schemas/EP_N88-Single' + - $ref: '#/components/schemas/EP_N89-Single' + - $ref: '#/components/schemas/EP_N96-Single' - $ref: '#/components/schemas/EP_Npc4-Single' - $ref: '#/components/schemas/EP_Npc6-Single' @@ -4009,3 +4277,4 @@ components: - $ref: '#/components/schemas/ChfFunction-Single' - $ref: '#/components/schemas/MfafFunction-Single' - $ref: '#/components/schemas/GmlcFunction-Single' + - $ref: '#/components/schemas/TsctsfFunction-Single' -- GitLab From 295393381cffb420774869dbfe5bbec3d82cb255 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Aug 2023 10:02:52 +0000 Subject: [PATCH 29/56] correction to rebase issue Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 52 ------------------------------------- 1 file changed, 52 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 409e8ad7a..a7c55232d 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1622,58 +1622,6 @@ components: items: $ref: '#/components/schemas/InternalGroupIdRange' - - SnssaiTsctsfInfoItem: - description: Set of parameters supported by TSCTSF for a given S-NSSAI - type: object - required: - - sNssai - - dnnInfoList - properties: - sNssai: - $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' - dnnInfoList: - type: array - items: - $ref: '#/components/schemas/DnnTsctsfInfoItem' - minItems: 1 - DnnTsctsfInfoItem: - description: Parameters supported by an TSCTSF 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' - TsctsfInfo: - description: Information of a TSCTSF NF Instance - type: object - properties: - sNssaiInfoList: - description: A map (list of key-value pairs) where a valid JSON string serves as key - additionalProperties: - $ref: '#/components/schemas/SnssaiTsctsfInfoItem' - minProperties: 0 - externalGroupIdentifiersRanges: - type: array - items: - $ref: '#/components/schemas/IdentityRange' - supiRanges: - type: array - items: - $ref: '#/components/schemas/SupiRange' - gpsiRanges: - type: array - items: - $ref: '#/components/schemas/IdentityRange' - internalGroupIdentifiersRanges: - type: array - items: - $ref: '#/components/schemas/InternalGroupIdRange' - - #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: -- GitLab From 1c7981ea802977e32cfd9ac546d5c1cdde201ef1 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Aug 2023 10:47:30 +0000 Subject: [PATCH 30/56] Ts28.541 rel18 cr0963 nrm enhancements for aanf function --- OpenAPI/TS28541_5GcNrm.yaml | 120 +++++++++++++++++++++++++++++++++++- 1 file changed, 119 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a7c55232d..053b53ba9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1558,6 +1558,7 @@ components: additionalProperties: $ref: '#/components/schemas/NssaafInfo' minProperties: 1 + GmlcInfo: description: Information of a GMLC NF Instance type: object @@ -1621,6 +1622,16 @@ components: type: array items: $ref: '#/components/schemas/InternalGroupIdRange' + + AanfInfo: + description: Represents the information relative to an AAnF NF Instance. + type: object + properties: + routingIndicators: + type: array + items: + type: string + pattern: '^[0-9]{1,4}$' #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -1735,6 +1746,8 @@ components: $ref: '#/components/schemas/GmlcFunction-Multiple' TSCTSFFunction: $ref: '#/components/schemas/TsctsfFunction-Multiple' + AANFFunction: + $ref: '#/components/schemas/AanfFunction-Multiple' AmfFunction-Single: allOf: @@ -2129,6 +2142,8 @@ components: $ref: '#/components/schemas/EP_N12-Multiple' EP_N13: $ref: '#/components/schemas/EP_N13-Multiple' + EP_N61: + $ref: '#/components/schemas/EP_N61-Multiple' UdmFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2479,6 +2494,11 @@ components: $ref: '#/components/schemas/EP_NL5-Multiple' EP_N85: $ref: '#/components/schemas/EP_N85-Multiple' + EP_N62: + $ref: '#/components/schemas/EP_N62-Multiple' + EP_N63: + $ref: '#/components/schemas/EP_N63-Multiple' + NsacfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3405,6 +3425,10 @@ components: $ref: '#/components/schemas/EP_N5-Multiple' EP_N86: $ref: '#/components/schemas/EP_N86-Multiple' + EP_N63: + $ref: '#/components/schemas/EP_N63-Multiple' + EP_N62: + $ref: '#/components/schemas/EP_N62-Multiple' NssaafFunction-Single: allOf: @@ -3591,6 +3615,79 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + AanfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + aanfInfo: + $ref: '#/components/schemas/AanfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N61: + $ref: '#/components/schemas/EP_N61-Multiple' + EP_N62: + $ref: '#/components/schemas/EP_N62-Multiple' + EP_N63: + $ref: '#/components/schemas/EP_N63-Multiple' + EP_N61-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_N62-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_N63-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' + + GmlcFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3659,6 +3756,7 @@ components: $ref: '#/components/schemas/EP_N89-Multiple' EP_N96: $ref: '#/components/schemas/EP_N96-Multiple' + EP_N84-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3672,7 +3770,7 @@ components: localAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' EP_N85-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4023,6 +4121,18 @@ components: type: array items: $ref: '#/components/schemas/EP_N60-Single' + EP_N61-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N61-Single' + EP_N62-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N62-Single' + EP_N63-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N63-Single' EP_Npc4-Multiple: type: array items: @@ -4115,6 +4225,10 @@ components: type: array items: $ref: '#/components/schemas/TsctsfFunction-Single' + AanfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AanfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -4189,6 +4303,9 @@ components: - $ref: '#/components/schemas/EP_N58-Single' - $ref: '#/components/schemas/EP_N59-Single' - $ref: '#/components/schemas/EP_N60-Single' + - $ref: '#/components/schemas/EP_N61-Single' + - $ref: '#/components/schemas/EP_N62-Single' + - $ref: '#/components/schemas/EP_N63-Single' - $ref: '#/components/schemas/EP_N84-Single' - $ref: '#/components/schemas/EP_N85-Single' - $ref: '#/components/schemas/EP_N86-Single' @@ -4226,3 +4343,4 @@ components: - $ref: '#/components/schemas/MfafFunction-Single' - $ref: '#/components/schemas/GmlcFunction-Single' - $ref: '#/components/schemas/TsctsfFunction-Single' + - $ref: '#/components/schemas/AanfFunction-Single' -- GitLab From 29ac53b874b54d21f43030d908ab82e0d5673667 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 10 Aug 2023 02:48:30 +0000 Subject: [PATCH 31/56] TS28.541_Rel18_CR0962 --- OpenAPI/TS28541_5GcNrm.yaml | 73 ++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 053b53ba9..83e68cd27 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1622,6 +1622,46 @@ components: type: array items: $ref: '#/components/schemas/InternalGroupIdRange' + BsfInfo: + description: Information of a BSF NF Instance + type: object + properties: + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 0 + ipDomainList: + type: array + items: + type: string + minItems: 0 + ipv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 0 + ipv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 0 + rxDiamHost: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + rxDiamRealm: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 0 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 0 AanfInfo: description: Represents the information relative to an AAnF NF Instance. @@ -1748,6 +1788,8 @@ components: $ref: '#/components/schemas/TsctsfFunction-Multiple' AANFFunction: $ref: '#/components/schemas/AanfFunction-Multiple' + BSFFunction: + $ref: '#/components/schemas/BsfFunction-Multiple' AmfFunction-Single: allOf: @@ -3739,7 +3781,7 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - TsctsfInfo: + tsctsfInfo: $ref: '#/components/schemas/TsctsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object @@ -3841,6 +3883,30 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + BsfFunction-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' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + bsfInfo: + $ref: '#/components/schemas/BsfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -4229,6 +4295,10 @@ components: type: array items: $ref: '#/components/schemas/AanfFunction-Single' + BsfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/BsfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -4344,3 +4414,4 @@ components: - $ref: '#/components/schemas/GmlcFunction-Single' - $ref: '#/components/schemas/TsctsfFunction-Single' - $ref: '#/components/schemas/AanfFunction-Single' + - $ref: '#/components/schemas/BsfFunction-Single' -- GitLab From 865eb95a80b3c4b75922a27857a23bc7b1a2144d Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Aug 2023 11:51:46 +0000 Subject: [PATCH 32/56] Ts28.541 rel18 cr0961 nrm enhancements for nrf function --- OpenAPI/TS28541_5GcNrm.yaml | 665 +++++++++++++++++++++++++++--------- 1 file changed, 511 insertions(+), 154 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 964235083..c5aca7e82 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -594,7 +594,7 @@ components: items: type: string - SNssaiSmfInfoItem: + SnssaiSmfInfoItem: type: object properties: sNSSAI: @@ -1494,6 +1494,264 @@ components: secondaryChfInstance: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + AmfInfo: + description: Information of an AMF NF Instance + type: object + # required: + # - amfSetId + # - amfRegionId + # - guamiList + properties: + # amfSetId: + # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId' + # amfRegionId: + # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId' + guamiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' + 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 + backupInfoAmfFailure: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' + minItems: 1 + backupInfoAmfRemoval: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' + minItems: 1 + # n2InterfaceAmfInfo: + # $ref: '#/components/schemas/N2InterfaceAmfInfo' + # amfOnboardingCapability: + # type: boolean + # default: false + # highLatencyCom: + # type: boolean + + SmfInfo: + description: Information of an SMF NF Instance + type: object + required: + - sNssaiSmfInfoList + properties: + sNssaiSmfInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiSmfInfoItem' + 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 + pgwFqdn: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' + pgwIpAddrList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' + minItems: 1 + accessType: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' + minItems: 1 + priority: + type: integer + minimum: 0 + maximum: 65535 + vsmfSupportInd: + type: boolean + pgwFqdnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' + minItems: 1 + # smfOnboardingCapability: + # type: boolean + # default: false + # deprecated: true + # ismfSupportInd: + # type: boolean + # smfUPRPCapability: + # type: boolean + # default: false + + UpfInfo: + description: Information of an UPF NF Instance + type: object + # required: + # - sNssaiUpfInfoList + properties: + # sNssaiUpfInfoList: + # type: array + # items: + # $ref: '#/components/schemas/SnssaiUpfInfoItem' + # minItems: 1 + smfServingArea: + type: array + items: + type: string + minItems: 1 + interfaceUpfInfoList: + type: array + items: + $ref: '#/components/schemas/InterfaceUpfInfoItem' + minItems: 1 + iwkEpsInd: + type: boolean + default: false + # sxaInd: + # type: boolean + pduSessionTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' + minItems: 1 + atsssCapability: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AtsssCapability' + ueIpAddrInd: + type: boolean + default: false + taiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + wAgfInfo: + # $ref: '#/components/schemas/WAgfInfo' + $ref: '#/components/schemas/IpInterface' + tngfInfo: + # $ref: '#/components/schemas/TngfInfo' + $ref: '#/components/schemas/IpInterface' + twifInfo: + # $ref: '#/components/schemas/TwifInfo' + $ref: '#/components/schemas/IpInterface' + priority: + type: integer + minimum: 0 + maximum: 65535 + redundantGtpu: + type: boolean + default: false + ipups: + type: boolean + default: false + dataForwarding: + type: boolean + default: false + supportedPfcpFeatures: + type: string + # upfEvents: + # type: array + # items: + # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType' + # minItems: 1 + + PcfInfo: + description: Information of a PCF NF Instance + type: object + properties: + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 1 + supiRanges: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + rxDiamHost: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + rxDiamRealm: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + v2xSupportInd: + type: boolean + default: false + proseSupportInd: + type: boolean + default: false + proseCapability: + $ref: '#/components/schemas/ProseCapability' + v2xCapability: + $ref: '#/components/schemas/V2xCapability' + + NefInfo: + description: Information of an NEF NF Instance + type: object + properties: + nefId: + # $ref: '#/components/schemas/NefId' + type: string + pfdData: + $ref: '#/components/schemas/PfdData' + afEeData: + $ref: '#/components/schemas/AfEventExposureData' + gpsiRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + servedFqdnList: + type: array + items: + type: string + minItems: 1 + taiList: + $ref: '#/components/schemas/TaiList' + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + dnaiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + minItems: 1 + unTrustAfInfoList: + type: array + items: + $ref: '#/components/schemas/UnTrustAfInfo' + minItems: 1 + uasNfFunctionalityInd: + type: boolean + default: false + NrfInfo: description: Information of an NRF NF Instance, used in hierarchical NRF deployments type: object @@ -1506,6 +1764,18 @@ components: - $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 @@ -1514,6 +1784,18 @@ components: - $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 @@ -1522,6 +1804,146 @@ components: - $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 + servedAmfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedAmfInfoList: + 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/AmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedSmfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/SmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedSmfInfoList: + 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/SmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedUpfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/UpfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedUpfInfoList: + 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/UpfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedPcfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/PcfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedPcfInfoList: + 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/PcfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + # servedBsfInfo: + # description: A map (list of key-value pairs) where nfInstanceId serves as key + # type: object + # additionalProperties: + # anyOf: + # - $ref: '#/components/schemas/BsfInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 + # servedBsfInfoList: + # 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/BsfInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 + # minProperties: 1 + servedChfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/ChfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedChfInfoList: + 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/ChfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedNefInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/NefInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 servedNwdafInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1530,6 +1952,36 @@ components: - $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 + # servedPcscfInfoList: + # 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/PcscfInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 + # minProperties: 1 + # servedGmlcInfo: + # description: A map (list of key-value pairs) where nfInstanceId serves as key + # type: object + # additionalProperties: + # anyOf: + # - $ref: '#/components/schemas/GmlcInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 servedLmfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1538,6 +1990,24 @@ components: - $ref: '#/components/schemas/LmfInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 + # servedNfInfo: + # description: A map (list of key-value pairs) where nfInstanceId serves as key + # type: object + # additionalProperties: + # $ref: '#/components/schemas/NfInfo' + # minProperties: 1 + # servedHssInfoList: + # 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/HssInfo' + # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + # minProperties: 1 + # minProperties: 1 servedUdsfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -1546,6 +2016,34 @@ components: - $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 servedTrustAfInfo: type: object description: A map (list of key-value pairs) where NF Instance Id serves as key @@ -1810,34 +2308,18 @@ components: type: string interPlmnFQDN: type: string - taiList: - $ref: '#/components/schemas/TaiList' - taiRangeList: - type: array - items: - $ref: '#/components/schemas/TaiRange' weightFactor: $ref: '#/components/schemas/WeightFactor' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - gUAMIdList: - type: array - items: - $ref: '#/components/schemas/GUAMInfo' - backupInfoAmfFailure: - type: array - items: - $ref: '#/components/schemas/GUAMInfo' - backupInfoAmfRemoval: - type: array - items: - $ref: '#/components/schemas/GUAMInfo' amfSetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + amfInfo: + $ref: '#/components/schemas/AmfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1931,43 +2413,18 @@ components: $ref: '#/components/schemas/TACList' sBIFqdn: type: string - sNssaiSmfInfoList: - type: array - items: - $ref: '#/components/schemas/SNssaiSmfInfoItem' - taiList: - $ref: '#/components/schemas/TaiList' - taiRangeList: - type: array - items: - $ref: '#/components/schemas/TaiRange' - pwgFqdn: - type: string - pgwAddrList: - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' - accessType: - $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType' - priority: - type: integer cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - vsmfSupportInd: - type: boolean - pwgFqdnList: - type: array - items: - type: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' + SmfInfo: + $ref: '#/components/schemas/SmfInfo' 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: @@ -2012,52 +2469,12 @@ components: $ref: '#/components/schemas/TACList' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - smfServingArea: - type: string - interfaceUpfInfoList: - type: array - items: - $ref: '#/components/schemas/InterfaceUpfInfoItem' - iwkEpsInd: - type: boolean - pduSessionTypes: - type: string - enum: - - IPV4 - - IPV6 - - IPV4V6 - - UNSTRUCTURED - - ETHERNET - atsssCapability: - $ref: '#/components/schemas/AtsssCapability' - ueIpAddrInd: - type: boolean - taiList: - $ref: '#/components/schemas/TaiList' - taiRangeList: - type: array - items: - $ref: '#/components/schemas/TaiRange' - wAgfInfo: - $ref: '#/components/schemas/IpInterface' - tngfInfo: - $ref: '#/components/schemas/IpInterface' - twifInfo: - $ref: '#/components/schemas/IpInterface' - priority: - type: integer - redundantGtpu: - type: boolean - ipups: - type: boolean - dataForwarding: - type: boolean - supportedPfcpFeatures: - type: string managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' supportedBMOList: $ref: '#/components/schemas/SupportedBMOList' + upfInfo: + $ref: '#/components/schemas/UpfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -2110,34 +2527,14 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - groupId: - type: string - dnnList: - type: array - items: - type: string - supiRanges: - $ref: '#/components/schemas/SupiRangeList' - gpsiRanges: - $ref: '#/components/schemas/IdentityRangeList' - rxDiamHost: - type: string - rxDiamRealm: - type: string - v2xSupportInd: - type: boolean - proseSupportInd: - type: boolean - proseCapability: - $ref: '#/components/schemas/ProseCapability' - v2xCapability: - $ref: '#/components/schemas/V2xCapability' + supportedBMOList: + $ref: '#/components/schemas/SupportedBMOList' + PcfInfo: + $ref: '#/components/schemas/PcfInfo' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - supportedBMOList: - $ref: '#/components/schemas/SupportedBMOList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -2486,48 +2883,8 @@ components: $ref: '#/components/schemas/CapabilityList' isCAPIFSup: type: boolean - taiList: - $ref: '#/components/schemas/TaiList' - taiRangeList: - type: array - items: - $ref: '#/components/schemas/TaiRange' - dnai: - type: string - nefId: - type: string - pfdData: - $ref: '#/components/schemas/PfdData' - afEeData: - $ref: '#/components/schemas/AfEventExposureData' - gpsiRanges: - type: array - items: - $ref: '#/components/schemas/IdentityRange' - minItems: 1 - externalGroupIdentifiersRanges: - type: array - items: - $ref: '#/components/schemas/IdentityRange' - minItems: 1 - servedFqdnList: - type: array - items: - type: string - minItems: 1 - dnaiList: - type: array - items: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' - minItems: 1 - unTrustAfInfoList: - type: array - items: - $ref: '#/components/schemas/UnTrustAfInfo' - minItems: 1 - uasNfFunctionalityInd: - type: boolean - default: false + nefInfo: + $ref: '#/components/schemas/NefInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From 382d66c62fa73353e9ec6800d716f1affc34be15 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 2 Aug 2023 15:59:33 +0000 Subject: [PATCH 33/56] Update type of coverageAreaTAList from NrTacList to TaiList --- OpenAPI/TS28541_SliceNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 9e670a2fd..387c24420 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -322,7 +322,7 @@ components: maxNumberOfPDUSessions: type: integer coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' dLMaxPktSize: @@ -353,7 +353,7 @@ components: type: object properties: coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' dLLatency: type: number uLLatency: @@ -446,7 +446,7 @@ components: activityFactor: type: integer coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' uEMobilityLevel: @@ -799,7 +799,7 @@ components: uLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 7ada2a13638301b1bcc2fd4ce4c4a8443b8ca010 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 9 Aug 2023 05:10:04 +0000 Subject: [PATCH 34/56] Restructuring Trace job attributes --- OpenAPI/TS28623_GenericNrm.yaml | 184 ++++++++++++++++++-------------- 1 file changed, 106 insertions(+), 78 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index f6522edc4..549812957 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1488,6 +1488,108 @@ components: minItems: 0 maxItems: 255 + traceConfig-Type: + description: Trace configuration parameters for NR. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + listOfInterfaces: + $ref: '#/components/schemas/listOfInterfaces-Type' + listOfNeTypes: + $ref: '#/components/schemas/listOfNeTypes-Type' + traceDepth: + $ref: '#/components/schemas/traceDepth-Type' + triggeringEvents: + $ref: '#/components/schemas/triggeringEvents-Type' + + immediateMDTConfig-Type: + description: Immediate MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + listOfMeasurements: + $ref: '#/components/schemas/listOfMeasurements-Type' + reportingTrigger: + $ref: '#/components/schemas/reportingTrigger-Type' + reportAmount: + $ref: '#/components/schemas/reportAmount-Type' + reportInterval: + $ref: '#/components/schemas/reportInterval-Type' + eventThreshold: + $ref: '#/components/schemas/eventThreshold-Type' + collectionPeriodRrmLte: + $ref: '#/components/schemas/collectionPeriodRrmLte-Type' + collectionPeriodM6Lte: + $ref: '#/components/schemas/collectionPeriodM6Lte-Type' + collectionPeriodM7Lte: + $ref: '#/components/schemas/collectionPeriodM7Lte-Type' + collectionPeriodRrmUmts: + $ref: '#/components/schemas/collectionPeriodRrmUmts-Type' + collectionPeriodRrmNr: + $ref: '#/components/schemas/collectionPeriodRrmNr-Type' + collectionPeriodM6Nr: + $ref: '#/components/schemas/collectionPeriodM6Nr-Type' + collectionPeriodM7Nr: + $ref: '#/components/schemas/collectionPeriodM7Nr-Type' + eventThresholdUphUmts: + $ref: '#/components/schemas/eventThresholdUphUmts-Type' + measurementPeriodUmts: + $ref: '#/components/schemas/measurementPeriodUmts-Type' + measurementPeriodLte: + $ref: '#/components/schemas/measurementPeriodLte-Type' + measurementQuantity: + $ref: '#/components/schemas/measurementQuantity-Type' + beamLevelMeasurement: + $ref: '#/components/schemas/beamLevelMeasurement-Type' + positioningMethod: + $ref: '#/components/schemas/positioningMethod-Type' + excessPacketDelayThresholds: + $ref: '#/components/schemas/excessPacketDelayThresholds-Type' + + loggedMDTConfig-Type: + description: Logged MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + traceCollectionEntityId: + $ref: '#/components/schemas/traceCollectionEntityId-Type' + loggingDuration: + $ref: '#/components/schemas/loggingDuration-Type' + loggingInterval: + $ref: '#/components/schemas/loggingInterval-Type' + eventThresholdL1: + $ref: '#/components/schemas/eventThresholdL1-Type' + hysteresisL1: + $ref: '#/components/schemas/hysteresisL1-Type' + timeToTriggerL1: + $ref: '#/components/schemas/timeToTriggerL1-Type' + mbsfnAreaList: + type: array + items: + $ref: '#/components/schemas/MbsfnArea' + reportType: + $ref: '#/components/schemas/reportType-Type' + plmnList: + $ref: '#/components/schemas/plmnList-Type' + eventListForEventTriggeredMeasurement: + $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' + areaConfigurationForNeighCell: + $ref: '#/components/schemas/AreaConfig' + + mdtConfig-Type: + description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + anonymizationOfMdtData: + $ref: '#/components/schemas/anonymizationOfMdtData-Type' + areaScope: + type: array + items: + $ref: '#/components/schemas/AreaScope' + sensorInformation: + $ref: '#/components/schemas/sensorInformation-Type' + immediateMDTConfig: + $ref: '#/components/schemas/immediateMDTConfig-Type' + loggedMDTConfig: + $ref: '#/components/schemas/loggedMDTConfig-Type' + #-------- end of Definition of types used in Trace control NRM fragment ---------- @@ -1671,18 +1773,12 @@ components: properties: jobType: $ref: '#/components/schemas/jobType-Type' - listOfInterfaces: - $ref: '#/components/schemas/listOfInterfaces-Type' - listOfNeTypes: - $ref: '#/components/schemas/listOfNeTypes-Type' plmnTarget: $ref: '#/components/schemas/plmnTarget-Type' traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: $ref: '#/components/schemas/IpAddr' - traceDepth: - $ref: '#/components/schemas/traceDepth-Type' traceReference: $ref: '#/components/schemas/traceReference-Type' jobId: @@ -1691,78 +1787,10 @@ components: $ref: '#/components/schemas/traceReportingFormat-Type' traceTarget: $ref: '#/components/schemas/traceTarget-Type' - triggeringEvents: - $ref: '#/components/schemas/triggeringEvents-Type' - anonymizationOfMdtData: - $ref: '#/components/schemas/anonymizationOfMdtData-Type' - areaConfigurationForNeighCell: - $ref: '#/components/schemas/AreaConfig' - areaScope: - type: array - items: - $ref: '#/components/schemas/AreaScope' - beamLevelMeasurement: - $ref: '#/components/schemas/beamLevelMeasurement-Type' - collectionPeriodRrmLte: - $ref: '#/components/schemas/collectionPeriodRrmLte-Type' - collectionPeriodM6Lte: - $ref: '#/components/schemas/collectionPeriodM6Lte-Type' - collectionPeriodM7Lte: - $ref: '#/components/schemas/collectionPeriodM7Lte-Type' - collectionPeriodRrmUmts: - $ref: '#/components/schemas/collectionPeriodRrmUmts-Type' - collectionPeriodRrmNr: - $ref: '#/components/schemas/collectionPeriodRrmNr-Type' - collectionPeriodM6Nr: - $ref: '#/components/schemas/collectionPeriodM6Nr-Type' - collectionPeriodM7Nr: - $ref: '#/components/schemas/collectionPeriodM7Nr-Type' - eventListForEventTriggeredMeasurement: - $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' - eventThreshold: - $ref: '#/components/schemas/eventThreshold-Type' - listOfMeasurements: - $ref: '#/components/schemas/listOfMeasurements-Type' - loggingDuration: - $ref: '#/components/schemas/loggingDuration-Type' - loggingInterval: - $ref: '#/components/schemas/loggingInterval-Type' - eventThresholdL1: - $ref: '#/components/schemas/eventThresholdL1-Type' - hysteresisL1: - $ref: '#/components/schemas/hysteresisL1-Type' - timeToTriggerL1: - $ref: '#/components/schemas/timeToTriggerL1-Type' - mbsfnAreaList: - type: array - items: - $ref: '#/components/schemas/MbsfnArea' - measurementPeriodLte: - $ref: '#/components/schemas/measurementPeriodLte-Type' - measurementPeriodUmts: - $ref: '#/components/schemas/measurementPeriodUmts-Type' - measurementQuantity: - $ref: '#/components/schemas/measurementQuantity-Type' - eventThresholdUphUmts: - $ref: '#/components/schemas/eventThresholdUphUmts-Type' - plmnList: - $ref: '#/components/schemas/plmnList-Type' - positioningMethod: - $ref: '#/components/schemas/positioningMethod-Type' - reportAmount: - $ref: '#/components/schemas/reportAmount-Type' - reportingTrigger: - $ref: '#/components/schemas/reportingTrigger-Type' - reportInterval: - $ref: '#/components/schemas/reportInterval-Type' - reportType: - $ref: '#/components/schemas/reportType-Type' - sensorInformation: - $ref: '#/components/schemas/sensorInformation-Type' - traceCollectionEntityId: - $ref: '#/components/schemas/traceCollectionEntityId-Type' - excessPacketDelayThresholds: - $ref: '#/components/schemas/excessPacketDelayThresholds-Type' + traceConfig: + $ref: '#/components/schemas/traceConfig-Type' + mdtConfig: + $ref: '#/components/schemas/mdtConfig-Type' ManagedFunction-ncO: type: object -- GitLab From 9a098e16107b06c2da52f5a7f2490c48bfba2212 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 28 Aug 2023 13:17:55 +0000 Subject: [PATCH 35/56] Rel18 TS28.105 CR0023_Modelling_ML_Entity Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 80 +++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 24 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 2ceebaf61..01e8014e7 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -15,27 +15,6 @@ components: #-------- Definition of types----------------------------------------------------- - MLEntityList: - type: array - items: - $ref: '#/components/schemas/MLEntity' - - MLEntity: - type: object - properties: - mLEntityId: - type: string - inferenceType: - type: string - mLEntityVersion: - type: string - expectedRunTimeContext: - $ref: '#/components/schemas/MLContext' - trainingContext: - $ref: '#/components/schemas/MLContext' - runTimeContext: - $ref: '#/components/schemas/MLContext' - MLContext: type: object properties: @@ -122,6 +101,8 @@ components: $ref: '#/components/schemas/ManagedElement-Multiple' MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' ManagedElement-Single: allOf: @@ -135,6 +116,8 @@ components: properties: MLTrainingFunction: $ref: '#/components/schemas/MLTrainingFunction-Multiple' + MLEntityRepository: + $ref: '#/components/schemas/MLEntityRepository-Multiple' MLTrainingFunction-Single: allOf: @@ -146,8 +129,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - mLEntityList: - $ref: '#/components/schemas/MLEntityList' + mLEntityRepositoryRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -169,6 +152,8 @@ components: properties: mLEntityId: type: string + inferenceType: + type: string candidateTrainingDataSource: type: array items: @@ -188,6 +173,8 @@ components: type: boolean suspendRequest: type: boolean + mLEntityToTrainRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingProcess-Single: allOf: @@ -249,6 +236,42 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' lastTrainingRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEnityGeneratedRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + MLEntity-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + mLEntityId: + type: string + inferenceType: + type: string + mLEntityVersion: + type: string + expectedRunTimeContext: + $ref: '#/components/schemas/MLContext' + trainingContext: + $ref: '#/components/schemas/MLContext' + runTimeContext: + $ref: '#/components/schemas/MLContext' + + MLEntityRepository-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + mLRepositoryId: + type: string + MLEntity: + $ref: '#/components/schemas/MLEntity-Multiple' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -276,7 +299,14 @@ components: type: array items: $ref: '#/components/schemas/MLTrainingReport-Single' - + MLEntity-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntity-Single' + MLEntityRepository-Multiple: + type: array + items: + $ref: '#/components/schemas/MLEntityRepository-Single' #-------- Definitions in TS 28.104 for TS 28.532 --------------------------------- @@ -289,3 +319,5 @@ components: - $ref: '#/components/schemas/MLTrainingRequest-Single' - $ref: '#/components/schemas/MLTrainingProcess-Single' - $ref: '#/components/schemas/MLTrainingReport-Single' + - $ref: '#/components/schemas/MLEntity-Single' + - $ref: '#/components/schemas/MLEntityRepository-Single' -- GitLab From 04c3035bd4ff3565a806d7864bd8e9f76d274657 Mon Sep 17 00:00:00 2001 From: niuyu Date: Tue, 29 Aug 2023 02:05:46 +0000 Subject: [PATCH 36/56] Update NRM enhancements for NWDAFFunction --- OpenAPI/TS28541_5GcNrm.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c5aca7e82..ff681232f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2841,11 +2841,17 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' nwdafInfo: $ref: '#/components/schemas/NwdafInfo' + nwdafLogicalFuncSupported: + type: string + enum: + - NWDAF_WITH_ANLF + - NWDAF_WITH_MTLF + - NWDAF_WITH_ANLF_MTLF - type: object properties: EP_NL3: $ref: '#/components/schemas/EP_NL3-Multiple' - + ScpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From ecb22ab24ea67e7174adc3e01270b87d269691a8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 14:05:30 +0000 Subject: [PATCH 37/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 110 ++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index a7c0ed1c7..8db5343f9 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -38,6 +38,10 @@ components: - $ref: "#/components/schemas/AveDLRANUEThptTarget" - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + - $ref: '#/components/schemas/HighULPrbLoadRatioTarget' + - $ref: '#/components/schemas/HighDLPrbLoadRatioTarget' + - $ref: '#/components/schemas/AveULPrbLoadTarget' + - $ref: '#/components/schemas/AveDLPrbLoadTarget' expectationContexts: type: array items: @@ -313,6 +317,112 @@ components: - IS_LESS_THAN contextValueRange: type: number + HighULPrbLoadRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for HighULPrbLoadRatioTarget + type: object + properties: + targetName: + type: string + enum: + - HighULPrbLoadRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: '#/components/schemas/HighULPrbLoadContext' + HighULPrbLoadContext: + description: >- + This data type is the "TargetContext" data type with specialisations for HighULPrbLoadContext + type: object + properties: + contextAttribute: + type: string + enum: + - HighULPrbLoadThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: integer + minimum: 0 + maximum: 100 + HighDLPrbLoadRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for HighDLPrbLoadRatioTarget + type: object + properties: + targetName: + type: string + enum: + - HighDLPrbLoadRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: '#/components/schemas/HighDLPrbLoadContext' + HighDLPrbLoadContext: + description: >- + This data type is the "TargetContext" data type with specialisations for HighDLPrbLoadContext + type: object + properties: + contextAttribute: + type: string + enum: + - HighDLPrbLoadThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: integer + minimum: 0 + maximum: 100 + AveULPrbLoadTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveULPrbLoadTarget + type: object + properties: + targetName: + type: string + enum: + - AveULPrbLoad + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + AveDLPrbLoadTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveDLPrbLoadTarget + type: object + properties: + targetName: + type: string + enum: + - AveDLPrbLoad + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 DLThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget -- GitLab From 1996123e2d158deee5ee58c8548425714c2bc84c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Sep 2023 03:50:00 +0000 Subject: [PATCH 38/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index afa987051..e10f7bd52 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -127,8 +127,8 @@ components: items: type: object oneOf: - - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' - - $ref: '#/components/schemas/EdgeIdenfiticationLocContext' + - $ref: '#/components/schemas/EdgeIdentificationIdContext' + - $ref: '#/components/schemas/EdgeIdentificationLocContext' - $ref: '#/components/schemas/CoverageAreaTAContext' - $ref: '#/components/schemas/ObjectContext' #-------Definition of the ExpectationObject dataType ----------# -- GitLab From 045ea70b7bacc8445ac92bd99b27e973339ca056 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Sep 2023 04:04:57 +0000 Subject: [PATCH 39/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 4e468d8e2..36d79764a 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -38,7 +38,7 @@ components: - $ref: "#/components/schemas/AveDLRANUEThptTarget" - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" - - $ref: "#/components/schemas/RANEnergyConsumptionReductionRatioTarget" + - $ref: "#/components/schemas/RANEnergyConsumptionTarget" - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" expectationContexts: type: array @@ -315,23 +315,21 @@ components: - IS_LESS_THAN contextValueRange: type: number - RANEnergyConsumptionReductionRatioTarget: + RANEnergyConsumptionTarget: description: >- - This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionReductionRatioTarget + This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionTarget type: object properties: targetName: type: string enum: - - RANEnergyConsumptionReductionRatio + - RANEnergyConsumption targetCondition: type: string enum: - - IS_GREATER_THAN + - IS_LESS_THAN targetValueRange: type: integer - minimum: 0 - maximum: 100 RANEnergyEfficiencyTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget -- GitLab From f033a465329688f72e2e2be2c5d9c47b51ae2b27 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 14:56:46 +0000 Subject: [PATCH 40/56] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 47 ++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index e66f20dd0..c918933b5 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -186,6 +186,17 @@ components: enum: - DELIVER - ENSURE + ValueRangeType: + oneOf: + - type: number + - type: string + - type: boolean + - type: integer + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate ' #-------Definition of the generic dataType --------------# #-------Definition of the generic IntentContext dataType --------------# @@ -199,9 +210,11 @@ components: contextCondition: $ref: '#/components/schemas/Condition' contextValueRange: - type: array - items: - type: number + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" #-------Definition of the generic IntentContext dataType --------------# #-------Definition of the generic ExpectationTarget dataType----------# @@ -215,7 +228,11 @@ components: targetCondition: $ref: '#/components/schemas/Condition' targetValueRange: - type: number + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" targetContexts: type: array items: @@ -230,7 +247,11 @@ components: contextCondition: $ref: '#/components/schemas/Condition' contextValueRange: - type: number + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" #-------Definition of the generic ExpectationTarget dataType----------# #-------Definition of the generic ObjectContext dataType----------------# @@ -244,9 +265,11 @@ components: contextCondition: $ref: '#/components/schemas/Condition' contextValueRange: - type: array - items: - type: number + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" #-------Definition of the generic ObjectContext dataType----------------# #-------Definition of the generic ExpectionContext dataType----------------# @@ -260,9 +283,11 @@ components: contextCondition: $ref: '#/components/schemas/Condition' contextValueRange: - type: array - items: - type: number + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" #-------Definition of the concrete ExpectionContext dataType----------------# #-------Definition of the generic IntentFulfilmentReport dataType----------------# IntentFulfilmentReport: -- GitLab From 5daf7d9523275278d91d37c7cab0e6f6561fbf18 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Sep 2023 07:02:43 +0000 Subject: [PATCH 41/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 2e8b8f02b..015864a6f 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -127,7 +127,7 @@ components: items: type: object oneOf: - - $ref: '#/components/schemas/EdgeIdentificationIdContext' + - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' - $ref: '#/components/schemas/EdgeIdentificationLocContext' - $ref: '#/components/schemas/CoverageAreaTAContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' -- GitLab From 515f1d1079a516a2c88b6c0b864cc7b231b51a14 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 4 Sep 2023 07:33:03 +0000 Subject: [PATCH 42/56] Rel18 cr0086 ts 28.312 support for intent priorities --- OpenAPI/TS28312_IntentNrm.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 10897e119..dadac31e2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -49,15 +49,17 @@ components: type: array items: $ref: '#/components/schemas/IntentContext' - observationPeriod: - type: integer - intentReportReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' intentAdminState: type: string enum: - ACTIVATED - DEACTIVATED + intentPriority: + type: integer + observationPeriod: + type: integer + intentReportReference: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentReport-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -92,7 +94,6 @@ components: IntentReport: $ref: '#/components/schemas/IntentReport-Multiple' - #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# -- GitLab From b3522de2fbd268c1e0e89cbef5f6b7e68a414bf9 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Mon, 4 Sep 2023 07:36:11 +0000 Subject: [PATCH 43/56] Update TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 137 +++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index ff0d91481..df08a531f 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -84,7 +84,36 @@ components: - $ref: '#/components/schemas/ResourceSharingLevelContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - - expectationId + - expectationId + 5GCNetworkExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for 5GC network delivering + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/5GCNetworkExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget" + - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + items: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + expectationfulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" + required: + - expectationId #-------Definition of the IntentExpectation dataType ----------# #-------Definition of the scenario specific ExpectationObject dataType ----------# @@ -130,7 +159,28 @@ components: - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' - $ref: '#/components/schemas/EdgeIdentificationLocContext' - $ref: '#/components/schemas/CoverageAreaTAContext' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + 5GCNetworkExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for 5GCNetworkExpectation + type: object + properties: + objectType: + type: string + enum: + - 5GC_SubNetwork #value for 5GC Network Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/NfTypeContext" + - $ref: "#/components/schemas/NfInstanceLocationContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/TaiContext" + - $ref: "#/components/schemas/ObjectContext" #-------Definition of the ExpectationObject dataType ----------# @@ -542,6 +592,37 @@ components: - IS_LESS_THAN targetValueRange: type: integer + MaxNumberofPDUsessionsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofPDUsessionsTarget + type: object + properties: + targetName: + type: string + enum: + - MaxNumberofPDUsessions + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + MaxNumberofRegisteredsubscribersTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget + type: object + properties: + targetName: + type: string + enum: + - MaxNumberofRegisteredsubscribers + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + #-------Definition of the concrete ExpectationTarget dataType----------# #-------Definition of the concrete ObjectTarget dataType----------------# @@ -726,6 +807,58 @@ components: $ref: '#/components/schemas/CoverageAreaTAList' CoverageAreaTAList: type: integer + NfTypeContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for NfTypeContext + type: object + properties: + contextAttribute: + type: string + enum: + - NfType + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType" + NfInstanceLocationContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext + type: object + properties: + contextAttribute: + type: string + enum: + - NfInstanceLocation + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + TaiContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for TaiContext + type: object + properties: + contextAttribute: + type: string + enum: + - Tai + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: " TS28623_GenericNrm.yaml #/components/schemas/Tai" + #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# -- GitLab From 7ee8082ca4b6bca25009bd32755837cab97d8eb4 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Mon, 4 Sep 2023 07:44:43 +0000 Subject: [PATCH 44/56] Update TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index df08a531f..5a1b07c22 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -857,7 +857,7 @@ components: contextValueRange: type: array items: - $ref: " TS28623_GenericNrm.yaml #/components/schemas/Tai" + $ref: "TS28623_GenericNrm.yaml #/components/schemas/Tai" #-------Definition of the scenario specific ObjectTarget dataType----------------# -- GitLab From 5a37b375c2470938418ab96bfcc5fe34347be216 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Sep 2023 07:53:28 +0000 Subject: [PATCH 45/56] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 5a1b07c22..af6b65bcd 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -857,7 +857,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_GenericNrm.yaml #/components/schemas/Tai" + $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" #-------Definition of the scenario specific ObjectTarget dataType----------------# -- GitLab From 0c36b571b2c3c2bcf70bc630a9565c5d7d393923 Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Tue, 5 Sep 2023 12:39:55 +0000 Subject: [PATCH 46/56] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3f72009bc..199345339 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1182,10 +1182,19 @@ components: properties: rRMPolicyMaxRatio: type: integer + default: 100 + minimum: 0 + maximum: 100 rRMPolicyMinRatio: type: integer + default: 0 + minimum: 0 + maximum: 100 rRMPolicyDedicatedRatio: type: integer + default: 0 + minimum: 0 + maximum: 100 NRCellRelation-Single: allOf: -- GitLab From 637bed5f2f4a7b4d54710c9517dd44c9f915310c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 15:32:47 +0000 Subject: [PATCH 47/56] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 199345339..a7cf8e658 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1017,7 +1017,11 @@ components: - type: object properties: bWPlist: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + maxItems: 12 + NrOperatorCellDu-Single: allOf: -- GitLab From d9d9fa8bf0da8f33535ca1a5348691ccef0f1258 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 15:38:24 +0000 Subject: [PATCH 48/56] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 387c24420..c59087933 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -818,6 +818,8 @@ components: $ref: '#/components/schemas/RecommendationRequest' requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' + requestedFeasibleTime: + $ref: '#/components/schemas/TimeWindow' processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' feasibilityResult: -- GitLab From 447c3f491fc506513b9a5c58fea78078814fca3a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 15:44:52 +0000 Subject: [PATCH 49/56] Update file TS28541_SliceNrm.yaml --- 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 c59087933..9cce80b97 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -819,7 +819,7 @@ components: requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' requestedFeasibleTime: - $ref: '#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' feasibilityResult: -- GitLab From 612b2c1fc49c2de977d909221cf7460bbc0581b0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 23 Aug 2023 14:33:56 +0000 Subject: [PATCH 50/56] Update file TS28541_SliceNrm.yaml --- 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 9cce80b97..05fbeb3a8 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -818,7 +818,7 @@ components: $ref: '#/components/schemas/RecommendationRequest' requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' - requestedFeasibleTime: + feasibilityTimeWindow: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' processMonitor: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' -- GitLab From 6c0a55076137739c140b1687fd58ee1f60325213 Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 24 Aug 2023 14:59:26 +0000 Subject: [PATCH 51/56] update for cr1008 --- OpenAPI/TS28541_NrNrm.yaml | 120 +++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index a7cf8e658..3b8fcc699 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -591,6 +591,75 @@ components: type: integer minValue: type: integer + NTNTAClist: + type: array + items: + $ref: '#/components/schemas/NrTac' + Ephemeris: + type: object + oneOf: + - $ref: '#/components/schemas/PositionVelocity' + - $ref: '#/components/schemas/Orbital' + properties: + satelliteId: + type: integer + + PositionVelocity: + type: object + properties: + positionX: + type: integer + minimum: 0 + maximum: 604800 + positionY: + type: integer + minimum: 0 + maximum: 604800 + positionZ: + type: integer + minimum: 0 + maximum: 604800 + velocityVX: + type: integer + minimum: -131072 + maximum: 131071 + velocityVY: + type: integer + minimum: -131072 + maximum: 131071 + velocityVZ: + type: integer + minimum: -131072 + maximum: 131071 + + Orbital: + type: object + properties: + semiMajorAxis: + type: integer + minimum: 0 + maximum: 8589934591 + eccentricity: + type: integer + minimum: -524288 + maximum: 524287 + periapsis: + type: integer + minimum: 0 + maximum: 16777215 + longitude: + type: integer + minimum: 0 + maximum: 2097151 + inclination: + type: integer + minimum: -524288 + maximum: 524287 + meanAnomaly: + type: integer + minimum: 0 + maximum: 16777215 + #-------- Definition of abstract IOCs -------------------------------------------- RrmPolicy_-Attr: @@ -1874,6 +1943,45 @@ components: allOf: - $ref: '#/components/schemas/CCOParameters-Attr' - type: object + + NTNFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + nTNpLMNInfoList: + $ref: '#/components/schemas/PlmnInfoList' + nTNTAClist: + $ref: '#/components/schemas/NrTacList' + EphemerisInfoSet: + $ref: '#/components/schemas/EphemerisInfoSet-Multiple' + + EphemerisInfoSet-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + EphemerisInfos: + $ref: '#/components/schemas/Ephemeris-Multiple' + + Ephemeris-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + oneOf: + - $ref: '#/components/schemas/PositionVelocity' + - $ref: '#/components/schemas/Orbital' + properties: + satelliteId: + type: integer + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2037,7 +2145,15 @@ components: type: array items: $ref: '#/components/schemas/EP_S1U-Single' + EphemerisInfoSet-Multiple: + type: array + items: + $ref: '#/components/schemas/EphemerisInfoSet-Single' + Ephemeris-Multiple: + type: array + items: + $ref: '#/components/schemas/Ephemeris-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- resources-nrNrm: @@ -2104,3 +2220,7 @@ components: - $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' - $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' + - $ref: '#/components/schemas/NTNFunction-Single' + - $ref: '#/components/schemas/EphemerisInfoSet-Single' + - $ref: '#/components/schemas/Ephemeris-Single' + -- GitLab From 5c560b46f82edd2e31286acdb730156ce0818f01 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 26 Jul 2023 10:36:58 +0000 Subject: [PATCH 52/56] Update TS28541_SliceNrm.yaml, correct style of prediction frequency --- OpenAPI/TS28541_SliceNrm.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 05fbeb3a8..8ab416830 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -42,7 +42,7 @@ components: - AECID - HYBRID POSITIONING - NET-RTK - Predictionfrequency: + PredictionFrequency: type: string enum: - PERSEC @@ -189,8 +189,8 @@ components: $ref: '#/components/schemas/ServAttrCom' availability: $ref: '#/components/schemas/PositioningAvailability' - predictionfrequency: - $ref: '#/components/schemas/Predictionfrequency' + predictionFrequency: + $ref: '#/components/schemas/PredictionFrequency' accuracy: $ref: '#/components/schemas/Float' PositioningRANSubnet: @@ -198,8 +198,8 @@ components: properties: availability: $ref: '#/components/schemas/PositioningAvailability' - predictionfrequency: - $ref: '#/components/schemas/Predictionfrequency' + predictionFrequency: + $ref: '#/components/schemas/PredictionFrequency' accuracy: $ref: '#/components/schemas/Float' UserMgmtOpen: -- GitLab From 7bc89cbbb719da184069749403a1bc2a29f54f2e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 7 Sep 2023 02:22:05 +0000 Subject: [PATCH 53/56] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index b7c60ef29..de44ab772 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -199,7 +199,7 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate ' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' #-------Definition of the generic dataType --------------# #-------Definition of the generic IntentContext dataType --------------# -- GitLab From 8539cd2162a2c8cd1750458bdf9a623ec74df7b5 Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 2 Aug 2023 08:36:25 +0000 Subject: [PATCH 54/56] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 20b2ebd37..1a231e6a1 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -103,6 +103,18 @@ components: $ref: '#/components/schemas/ServAttrCom' support: $ref: '#/components/schemas/Support' + NonIPSupport: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + support: + $ref: '#/components/schemas/Support' + supportNonIPType: + type: string + enum: + - ETHERNET + - UNSTRUCTURED DeterministicComm: type: object properties: @@ -344,7 +356,10 @@ components: nssaaSupport: $ref: '#/components/schemas/NSSAASupport' n6Protection: - $ref: '#/components/schemas/N6Protection' + $ref: '#/components/schemas/N6Protection' + nonIPSupport: + $ref: '#/components/schemas/NonIPSupport' + RANSliceSubnetProfile: type: object properties: @@ -400,6 +415,8 @@ components: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' + nonIPSupport: + $ref: '#/components/schemas/NonIPSupport' TopSliceSubnetProfile: type: object properties: @@ -461,6 +478,8 @@ components: $ref: '#/components/schemas/NSSAASupport' n6Protection: $ref: '#/components/schemas/N6Protection' + nonIPSupport: + $ref: '#/components/schemas/NonIPSupport' ServiceProfile: type: object @@ -545,6 +564,8 @@ components: $ref: '#/components/schemas/NSSAASupport' n6Protection: $ref: '#/components/schemas/N6Protection' + nonIPSupport: + $ref: '#/components/schemas/NonIPSupport' SliceProfile: type: object properties: -- GitLab From 78b07fc866977c0af609b00efea13fe3f491f283 Mon Sep 17 00:00:00 2001 From: gautamd Date: Thu, 24 Aug 2023 10:24:07 +0000 Subject: [PATCH 55/56] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 1a231e6a1..eeba51f4d 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -110,11 +110,6 @@ components: $ref: '#/components/schemas/ServAttrCom' support: $ref: '#/components/schemas/Support' - supportNonIPType: - type: string - enum: - - ETHERNET - - UNSTRUCTURED DeterministicComm: type: object properties: -- GitLab From 1c7d501a8af6f7b07496ebf43d2d3595548775fe Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 8 Sep 2023 07:50:07 +0000 Subject: [PATCH 56/56] update versions --- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 01e8014e7..943f6aebf 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.4.0 + version: 18.1.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 0b1018bf8..5423a87ad 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 18.0.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index de44ab772..900167412 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.0.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 240e8521f..4cf5ec976 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.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3b8fcc699..0a5099749 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.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the NR NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index eeba51f4d..88eeb7702 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.4.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 72638392c..e04340444 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.3.0 + version: 18.4.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab