From b3522de2fbd268c1e0e89cbef5f6b7e68a414bf9 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Mon, 4 Sep 2023 07:36:11 +0000 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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