Commit ba392343 authored by ruiyue's avatar ruiyue
Browse files

Merge branch '28.312_Rel18_CR0070_Add_missing_stage_3_Yaml' into 'Integration_Rel18_SA5_150_YAML' 

Update TS28312_IntentNrm.yaml, update service support to edge service supprt

See merge request !655
parents 574329fe b99199b1

OpenAPI/TS28312_IntentExpectations.yaml

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ components: 
            $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext'

      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
@@ -142,13 +142,13 @@ components: 
              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext'                                

    ServiceSupportExpectationObject: 

      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 

            - EdgeService_Support #value for Edge Service Support Expectation--#

        objectInstance:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

        objectContexts:

OpenAPI/TS28312_IntentNrm.yaml

+4 −4
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ 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/EdgeServiceSupportExpectation"                

          intentContexts:

            type: array

            items:
@@ -130,7 +130,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--#

        objectInstance:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

        objectContexts: