From 2887cf852e35aa66b3356847558ba07de5d1e8c8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 11 May 2023 13:07:59 +0000 Subject: [PATCH 1/6] Upload New File --- OpenAPI/TS28312_IntentExpectations.yaml | 645 ++++++++++++++++++++++++ 1 file changed, 645 insertions(+) create mode 100644 OpenAPI/TS28312_IntentExpectations.yaml diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml new file mode 100644 index 000000000..1dc1f5e58 --- /dev/null +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -0,0 +1,645 @@ +openapi: 3.0.1 +info: + title: Scenario specific Intent Expectations + version: 17.3.0 + description: >- + OAS 3.0.1 definition of scenario specific Intent Expectations + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.312; Intent driven management services for mobile networks + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.312/ +paths: {} +components: + schemas: + + #-------Definition of the Scenario specific IntentExpectation dataType ----------# + RadioNetworkExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio network delivering and performance assurance + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/RadioNetworkExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/WeakRSRPRatioTarget" + - $ref: "#/components/schemas/LowSINRRatioTarget" + - $ref: "#/components/schemas/AveULRANUEThptTarget" + - $ref: "#/components/schemas/AveDLRANUEThptTarget" + - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" + - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + - $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" + ServiceSupportExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/ServiceSupportExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/DLThptPerUETarget" + - $ref: "#/components/schemas/ULThptPerUETarget" + - $ref: "#/components/schemas/DLLatencyTarget" + - $ref: "#/components/schemas/ULLatencyTarget" + - $ref: "#/components/schemas/MaxNumberofUEsTarget" + - $ref: "#/components/schemas/ActivityFactorTarget" + - $ref: "#/components/schemas/UESpeedTarget" + - $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationTarget" + expectationContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/ServiceStartTimeContext" + - $ref: "#/components/schemas/ServiceEndTimeContext" + - $ref: "#/components/schemas/UEMobilityLevelContext" + - $ref: "#/components/schemas/ResourceSharingLevelContext" + - $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationContext" + expectationfulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + #-------Definition of the IntentExpectation dataType ----------# + + #-------Definition of the scenario specific ExpectationObject dataType ----------# + RadioNetworkExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation + type: object + properties: + objectType: + type: string + enum: + - RAN_SubNetwork #value for Radio Network Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/CoverageAreaPolygonContext" + - $ref: "#/components/schemas/CoverageTACContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/NRFqBandContext" + - $ref: "#/components/schemas/RATContext" + - $ref: "#/components/schemas/ObjectContext" + ServiceSupportExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation + type: object + properties: + objectType: + type: string + enum: + - Service_Support #value for Service Support Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" + - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" + - $ref: "#/components/schemas/CoverageAreaTAContext" + - $ref: "#/components/schemas/ObjectContext" + #-------Definition of the ExpectationObject dataType ----------# + + + #-------Definition of the Scenario specific ExpectationTarget dataType----------# + WeakRSRPRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget + type: object + properties: + targetName: + type: string + enum: + - WeakRSRPRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/WeakRSRPContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + WeakRSRPContext: + description: >- + This data type is the "TargetContext" data type with specialisations for WeakRSRPContext + type: object + properties: + contextAttribute: + type: string + enum: + - WeakRSRPThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: number + LowSINRRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget + type: object + properties: + targetName: + type: string + enum: + - LowSINRRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowSINRContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + LowSINRContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowSINRContext + type: object + properties: + contextAttribute: + type: string + enum: + - LowSINRThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: integer + AveULRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget + type: object + properties: + targetName: + type: string + enum: + - AveULRANUEThpt + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + type: integer + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + AveDLRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget + type: object + properties: + targetName: + type: string + enum: + - AveDLRANUEThpt + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + type: integer + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + LowULRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget + type: object + properties: + targetName: + type: string + enum: + - LowULRANUEThptRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowULRANUEThptContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + LowULRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext + type: object + properties: + contextAttribute: + type: string + enum: + - LowULRANUEThptThreshold + contextCondition: + type: string + enum: + - Is_less_than + contextValueRange: + type: number + LowDLRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget + type: object + properties: + targetName: + type: string + enum: + - LowDLRANUEThptRatio + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 + targetContexts: + $ref: "#/components/schemas/LowDLRANUEThptContext" + targetFulfilmentInfo: + $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + LowDLRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext + type: object + properties: + contextAttribute: + type: string + enum: + - LowDLRANUEThptThreshold + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: number + DLThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget + type: object + properties: + targetName: + type: string + enum: + - DlThptPerUE + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + ULThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget + type: object + properties: + targetName: + type: string + enum: + - UlThptPerUE + targetCondition: + type: string + enum: + - IS_GREATER_THAN + targetValueRange: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + DLLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget + type: object + properties: + targetName: + type: string + enum: + - DlLatency + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + ULLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget + type: object + properties: + targetName: + type: string + enum: + - UlLatency + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + MaxNumberofUEsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget + type: object + properties: + targetName: + type: string + enum: + - maxNumberofUEs + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + ActivityFactorTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget + type: object + properties: + targetName: + type: string + enum: + - activityFactor + targetCondition: + type: string + enum: + - IS_EQUAL_TO + targetValueRange: + type: integer + UESpeedTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget + type: object + properties: + targetName: + type: string + enum: + - uESpeed + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + #-------Definition of the concrete ExpectationTarget dataType----------# + + #-------Definition of the concrete ObjectTarget dataType----------------# + ObjectContext: + description: >- + This data type is the "ObjectContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "TS28312_IntentNrm.yaml/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number + CoverageAreaPolygonContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext + type: object + properties: + contextAttribute: + type: string + enum: + - CoverageAreaPolygon + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "#/components/schemas/CoverageArea" + CoverageArea: + type: string + CoverageTACContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageTACContext + type: object + properties: + contextAttribute: + type: string + enum: + - CoverageAreaTac + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" + PLMNContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for PLMNContext + type: object + properties: + contextAttribute: + type: string + enum: + - PLMN + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" + NRFqBandContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for NRFqBandContext + type: object + properties: + contextAttribute: + type: string + enum: + - NRFqBand + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + type: string + RATContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for RATContext + type: object + properties: + contextAttribute: + type: string + enum: + - RAT + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + type: string + enum: + - UTRAN + - EUTRAN + - NR + EdgeIdenfiticationIdContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext + type: object + properties: + contextAttribute: + type: string + enum: + - edgeIdentificationId + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: array + items: + type: string + EdgeIdenfiticationLocContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext + type: object + properties: + contextAttribute: + type: string + enum: + - edgeIdentificationTarget + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: array + items: + type: string + CoverageAreaTAContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext + type: object + properties: + contextAttribute: + type: string + enum: + - coverageAreaTA + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "#/components/schemas/CoverageAreaTAList" + CoverageAreaTAList: + type: integer + #-------Definition of the scenario specific ObjectTarget dataType----------------# + + #-------Definition of the concrete ExpectionContext dataType----------------# + ServiceStartTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServiceStartTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: string + ServiceEndTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServiceEndTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: string + UEMobilityLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext + type: object + properties: + contextAttribute: + type: string + enum: + - UEMobilityLevel + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" + ResourceSharingLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext + type: object + properties: + contextAttribute: + type: string + enum: + - ResourceSharingLevel + contextCondition: + type: string + enum: + - IS_WITHIN_RANGE + contextValueRange: + type: array + items: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From f60fb916b761dc0d7de62d7979ea5911d0015966 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 11 May 2023 13:23:41 +0000 Subject: [PATCH 2/6] Update OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 27 ++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 1dc1f5e58..295006a21 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -22,7 +22,7 @@ components: expectationId: type: string expectationVerb: - $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationVerb" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" expectationObjects: type: array items: @@ -38,13 +38,12 @@ components: - $ref: "#/components/schemas/AveDLRANUEThptTarget" - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" - - $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationTarget" expectationContexts: type: array items: - $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationContext" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" ServiceSupportExpectation: description: >- This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment @@ -53,7 +52,7 @@ components: expectationId: type: string expectationVerb: - $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationVerb" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" expectationObjects: type: array items: @@ -70,7 +69,7 @@ components: - $ref: "#/components/schemas/MaxNumberofUEsTarget" - $ref: "#/components/schemas/ActivityFactorTarget" - $ref: "#/components/schemas/UESpeedTarget" - - $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationTarget" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array items: @@ -80,7 +79,7 @@ components: - $ref: "#/components/schemas/ServiceEndTimeContext" - $ref: "#/components/schemas/UEMobilityLevelContext" - $ref: "#/components/schemas/ResourceSharingLevelContext" - - $ref: "TS28312_IntentNrm.yaml/components/schemas/ExpectationContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" expectationfulfilmentInfo: $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" #-------Definition of the IntentExpectation dataType ----------# @@ -152,7 +151,7 @@ components: targetContexts: $ref: "#/components/schemas/WeakRSRPContext" targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" WeakRSRPContext: description: >- This data type is the "TargetContext" data type with specialisations for WeakRSRPContext @@ -188,7 +187,7 @@ components: targetContexts: $ref: "#/components/schemas/LowSINRContext" targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowSINRContext: description: >- This data type is the "TargetContext" data type with specialisations for LowSINRContext @@ -220,7 +219,7 @@ components: targetValueRange: type: integer targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" AveDLRANUEThptTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget @@ -237,7 +236,7 @@ components: targetValueRange: type: integer targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowULRANUEThptRatioTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget @@ -258,7 +257,7 @@ components: targetContexts: $ref: "#/components/schemas/LowULRANUEThptContext" targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowULRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext @@ -294,7 +293,7 @@ components: targetContexts: $ref: "#/components/schemas/LowDLRANUEThptContext" targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowDLRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext @@ -426,7 +425,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "TS28312_IntentNrm.yaml/components/schemas/Condition" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/Condition" contextValueRange: type: array items: -- GitLab From ecb25797b06bc739736261084f1c89256aeea207 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 11 May 2023 13:33:16 +0000 Subject: [PATCH 3/6] Update OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 295006a21..d7336467d 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -81,7 +81,7 @@ components: - $ref: "#/components/schemas/ResourceSharingLevelContext" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml/components/schemas/FulfilmentInfo" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" #-------Definition of the IntentExpectation dataType ----------# #-------Definition of the scenario specific ExpectationObject dataType ----------# -- GitLab From 8f8beb4341e264affd2efd4691bb282443e4f5b3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 11 May 2023 13:48:26 +0000 Subject: [PATCH 4/6] Update OpenAPI/TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 626 +-------------------------------- 1 file changed, 5 insertions(+), 621 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index a9fb33655..952dc65e2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -43,8 +43,8 @@ components: type: object oneOf: - $ref: "#/components/schemas/IntentExpectation" - - $ref: "#/components/schemas/RadioNetworkExpectation" - - $ref: "#/components/schemas/ServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation" intentContexts: type: array items: @@ -76,76 +76,7 @@ components: items: $ref: "#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - RadioNetworkExpectation: - description: >- - This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio network delivering and performance assurance - type: object - properties: - expectationId: - type: string - expectationVerb: - $ref: "#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/RadioNetworkExpectationObject" - expectationTargets: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/WeakRSRPRatioTarget" - - $ref: "#/components/schemas/LowSINRRatioTarget" - - $ref: "#/components/schemas/AveULRANUEThptTarget" - - $ref: "#/components/schemas/AveDLRANUEThptTarget" - - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" - - $ref: "#/components/schemas/ExpectationTarget" - expectationContexts: - type: array - items: - $ref: "#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - ServiceSupportExpectation: - description: >- - This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment - type: object - properties: - expectationId: - type: string - expectationVerb: - $ref: "#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" - expectationTargets: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/DLThptPerUETarget" - - $ref: "#/components/schemas/ULThptPerUETarget" - - $ref: "#/components/schemas/DLLatencyTarget" - - $ref: "#/components/schemas/ULLatencyTarget" - - $ref: "#/components/schemas/MaxNumberofUEsTarget" - - $ref: "#/components/schemas/ActivityFactorTarget" - - $ref: "#/components/schemas/UESpeedTarget" - - $ref: "#/components/schemas/ExpectationTarget" - expectationContexts: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/ServiceStartTimeContext" - - $ref: "#/components/schemas/ServiceEndTimeContext" - - $ref: "#/components/schemas/UEMobilityLevelContext" - - $ref: "#/components/schemas/ResourceSharingLevelContext" - - $ref: "#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: "#/components/schemas/FulfilmentInfo" #-------Definition of the IntentExpectation dataType ----------# #-------Definition of the ExpectationObject dataType ----------# @@ -166,48 +97,7 @@ components: type: array items: $ref: "#/components/schemas/ObjectContext" - RadioNetworkExpectationObject: - description: >- - This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation - type: object - properties: - objectType: - type: string - enum: - - RAN_SubNetwork #value for Radio Network Expectation--# - objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" - objectContexts: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/CoverageAreaPolygonContext" - - $ref: "#/components/schemas/CoverageTACContext" - - $ref: "#/components/schemas/PLMNContext" - - $ref: "#/components/schemas/NRFqBandContext" - - $ref: "#/components/schemas/RATContext" - - $ref: "#/components/schemas/ObjectContext" - ServiceSupportExpectationObject: - description: >- - This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation - type: object - properties: - objectType: - type: string - enum: - - Service_Support #value for Radio Network Expectation--# - objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" - objectContexts: - type: array - items: - type: object - oneOf: - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - - $ref: "#/components/schemas/CoverageAreaTAContext" - - $ref: "#/components/schemas/ObjectContext" + #-------Definition of the ExpectationObject dataType ----------# #-------Definition of the generic dataType --------------# @@ -300,289 +190,6 @@ components: $ref: "#/components/schemas/Condition" contextValueRange: type: number - WeakRSRPRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget - type: object - properties: - targetName: - type: string - enum: - - WeakRSRPRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/WeakRSRPContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - WeakRSRPContext: - description: >- - This data type is the "TargetContext" data type with specialisations for WeakRSRPContext - type: object - properties: - contextAttribute: - type: string - enum: - - WeakRSRPThreshold - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: number - LowSINRRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget - type: object - properties: - targetName: - type: string - enum: - - LowSINRRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/LowSINRContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowSINRContext: - description: >- - This data type is the "TargetContext" data type with specialisations for LowSINRContext - type: object - properties: - contextAttribute: - type: string - enum: - - LowSINRThreshold - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: integer - AveULRANUEThptTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget - type: object - properties: - targetName: - type: string - enum: - - AveULRANUEThpt - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - type: integer - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - AveDLRANUEThptTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget - type: object - properties: - targetName: - type: string - enum: - - AveDLRANUEThpt - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - type: integer - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget - type: object - properties: - targetName: - type: string - enum: - - LowULRANUEThptRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/LowULRANUEThptContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptContext: - description: >- - This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext - type: object - properties: - contextAttribute: - type: string - enum: - - LowULRANUEThptThreshold - contextCondition: - type: string - enum: - - Is_less_than - contextValueRange: - type: number - LowDLRANUEThptRatioTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget - type: object - properties: - targetName: - type: string - enum: - - LowDLRANUEThptRatio - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - minimum: 0 - maximum: 100 - targetContexts: - $ref: "#/components/schemas/LowDLRANUEThptContext" - targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - LowDLRANUEThptContext: - description: >- - This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext - type: object - properties: - contextAttribute: - type: string - enum: - - LowDLRANUEThptThreshold - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: number - DLThptPerUETarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget - type: object - properties: - targetName: - type: string - enum: - - DlThptPerUE - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" - ULThptPerUETarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget - type: object - properties: - targetName: - type: string - enum: - - UlThptPerUE - targetCondition: - type: string - enum: - - IS_GREATER_THAN - targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" - DLLatencyTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget - type: object - properties: - targetName: - type: string - enum: - - DlLatency - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - ULLatencyTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget - type: object - properties: - targetName: - type: string - enum: - - UlLatency - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - MaxNumberofUEsTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget - type: object - properties: - targetName: - type: string - enum: - - maxNumberofUEs - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - ActivityFactorTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget - type: object - properties: - targetName: - type: string - enum: - - activityFactor - targetCondition: - type: string - enum: - - IS_EQUAL_TO - targetValueRange: - type: integer - UESpeedTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget - type: object - properties: - targetName: - type: string - enum: - - uESpeed - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer #-------Definition of the concrete ExpectationTarget dataType----------# #-------Definition of the concrete ObjectTarget dataType----------------# @@ -599,230 +206,7 @@ components: type: array items: type: number - CoverageAreaPolygonContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext - type: object - properties: - contextAttribute: - type: string - enum: - - CoverageAreaPolygon - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "#/components/schemas/CoverageArea" - CoverageArea: - type: string - CoverageTACContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageTACContext - type: object - properties: - contextAttribute: - type: string - enum: - - CoverageAreaTac - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" - PLMNContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for PLMNContext - type: object - properties: - contextAttribute: - type: string - enum: - - PLMN - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" - NRFqBandContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for NRFqBandContext - type: object - properties: - contextAttribute: - type: string - enum: - - NRFqBand - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - type: string - RATContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for RATContext - type: object - properties: - contextAttribute: - type: string - enum: - - RAT - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - type: string - enum: - - UTRAN - - EUTRAN - - NR - EdgeIdenfiticationIdContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext - type: object - properties: - contextAttribute: - type: string - enum: - - edgeIdentificationId - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: array - items: - type: string - EdgeIdenfiticationLocContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext - type: object - properties: - contextAttribute: - type: string - enum: - - edgeIdentificationTarget - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: array - items: - type: string - CoverageAreaTAContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext - type: object - properties: - contextAttribute: - type: string - enum: - - coverageAreaTA - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "#/components/schemas/CoverageAreaTAList" - CoverageAreaTAList: - type: integer - #-------Definition of the concrete ObjectTarget dataType----------------# - - #-------Definition of the concrete ExpectionContext dataType----------------# - ExpectationContext: - description: >- - This data type is the "ExpectationContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: "#/components/schemas/Condition" - contextValueRange: - type: array - items: - type: number - ServiceStartTimeContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext - type: object - properties: - contextAttribute: - type: string - enum: - - ServiceStartTime - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: string - ServiceEndTimeContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext - type: object - properties: - contextAttribute: - type: string - enum: - - ServiceEndTime - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: string - UEMobilityLevelContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext - type: object - properties: - contextAttribute: - type: string - enum: - - UEMobilityLevel - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" - ResourceSharingLevelContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext - type: object - properties: - contextAttribute: - type: string - enum: - - ResourceSharingLevel - contextCondition: - type: string - enum: - - IS_WITHIN_RANGE - contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From bdcffac55e9607daaadd49cd3f6056bca9e93ad8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 11 May 2023 13:56:16 +0000 Subject: [PATCH 5/6] Update OpenAPI/TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 952dc65e2..128c51002 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -192,7 +192,7 @@ components: type: number #-------Definition of the concrete ExpectationTarget dataType----------# - #-------Definition of the concrete ObjectTarget dataType----------------# + #-------Definition of the concrete ObjectContext dataType----------------# ObjectContext: description: >- This data type is the "ObjectContext" data type without specialisations @@ -206,9 +206,23 @@ components: type: array items: type: number - - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the concrete ObjectContext dataType----------------# + #-------Definition of the concrete ExpectionContext dataType----------------# + ExpectationContext: + description: >- + This data type is the "ExpectationContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number + #-------Definition of the concrete ExpectionContext dataType----------------# #------Definition of JSON arrays for name-contained IOCs ---------------# -- GitLab From 0b6b31dcecef395dbf1a48bb40a9922a56609436 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 25 May 2023 14:27:03 +0000 Subject: [PATCH 6/6] Update OpenAPI/TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 128c51002..ad7e7ad19 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -13,7 +13,7 @@ paths: {} components: schemas: - #-------Definition of concrete IOCs ----------# + #-------Definition of generic IOCs ----------# SubNetwork-Single: allOf: @@ -51,9 +51,9 @@ components: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - #-------Definition of concrete IOCs ----------# + #-------Definition of generic IOCs ----------# - #-------Definition of the IntentExpectation dataType ----------# + #-------Definition of the generic IntentExpectation dataType ----------# IntentExpectation: description: >- This data type is the "IntentExpectation" data type without specialisations @@ -77,9 +77,9 @@ components: $ref: "#/components/schemas/ExpectationContext" expectationfulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - #-------Definition of the IntentExpectation dataType ----------# + #-------Definition of the generic IntentExpectation dataType ----------# - #-------Definition of the ExpectationObject dataType ----------# + #-------Definition of the generic ExpectationObject dataType ----------# ExpectationObject: description: >- This data type is the "ExpectationObject" data type without specialisations @@ -98,7 +98,7 @@ components: items: $ref: "#/components/schemas/ObjectContext" - #-------Definition of the ExpectationObject dataType ----------# + #-------Definition of the generic ExpectationObject dataType ----------# #-------Definition of the generic dataType --------------# Condition: @@ -147,7 +147,7 @@ components: - ENSURE #-------Definition of the generic dataType --------------# - #-------Definition of the IntentContext dataType --------------# + #-------Definition of the generic IntentContext dataType --------------# IntentContext: description: >- This data type is the "IntentContext" data type without specialisations @@ -161,9 +161,9 @@ components: type: array items: type: number - #-------Definition of the IntentContext dataType --------------# + #-------Definition of the generic IntentContext dataType --------------# - #-------Definition of the ExpectationTarget dataType----------# + #-------Definition of the generic ExpectationTarget dataType----------# ExpectationTarget: description: >- This data type is the "ExpectationTarget" data type without specialisations @@ -190,9 +190,9 @@ components: $ref: "#/components/schemas/Condition" contextValueRange: type: number - #-------Definition of the concrete ExpectationTarget dataType----------# + #-------Definition of the generic ExpectationTarget dataType----------# - #-------Definition of the concrete ObjectContext dataType----------------# + #-------Definition of the generic ObjectContext dataType----------------# ObjectContext: description: >- This data type is the "ObjectContext" data type without specialisations @@ -206,9 +206,9 @@ components: type: array items: type: number - #-------Definition of the concrete ObjectContext dataType----------------# + #-------Definition of the generic ObjectContext dataType----------------# - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the generic ExpectionContext dataType----------------# ExpectationContext: description: >- This data type is the "ExpectationContext" data type without specialisations -- GitLab