Commit 80d76c8b authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'Rel_19_CR0341_TS28.312_Address_stage2_and_stage3_misaglignment_issue_for_several_attribute_definition' into 'Integration_Rel19_SA5_161_YAML'

Rel_19_CR0341_TS28.312_Address_stage2_and_stage3_misaglignment_issue_for_several_attribute_definition

See merge request !1720
parents 1c3bea21 35cb7832

OpenAPI/TS28312_IntentExpectations.yaml

+23 −6
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ components: 
        objectType:

          type: string

          enum:

            - RAN_SubNetwork

            - RAN_SUBNETWORK

        objectInstance:

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

        objectContexts:
@@ -251,7 +251,7 @@ components: 
        objectType:

          type: string

          enum:

            - Radio_Service

            - RADIO_SERVICE

        objectInstance:

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

        objectContexts:
@@ -266,6 +266,7 @@ components: 
              - $ref: '#/components/schemas/CellContext'                          

              - $ref: '#/components/schemas/ServiceTypeContext'

              - $ref: '#/components/schemas/UEGroupContext'

              - $ref: '#/components/schemas/GeoCoordinateContext'

              - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context'

    EdgeServiceSupportExpectationObject: 

      description: >-
@@ -275,7 +276,7 @@ components: 
        objectType:

          type: string

          enum:

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

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

        objectInstance:

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

        objectContexts:
@@ -296,7 +297,7 @@ components: 
        objectType:

          type: string

          enum:

            - 5GC_SubNetwork #value for 5GC Network Expectation--#

            - 5GC_SUBNETWORK #value for 5GC Network Expectation--#

        objectInstance:

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

        objectContexts:
@@ -787,7 +788,7 @@ components: 
          enum:

            - IS_GREATER_THAN

        targetValueRange:

          $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt'

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

    ULThptPerUETarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the edge
@@ -803,7 +804,7 @@ components: 
          enum:

            - IS_GREATER_THAN

        targetValueRange:

          $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' 

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

    DLLatencyTarget:

      description: >-

        This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the edge service supporting or radio service
@@ -1089,6 +1090,22 @@ components: 
          uniqueItems: true

          items:

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

    GeoCoordinateContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for GeoCoordinateContext.

        It describes the location (i.e. geocoordinate) that radio service intent is applied. 

      type: object

      properties:

        contextAttribute:

          type: string

          enum:

            - GeoCoordinate

        contextCondition:

          type: string

          enum:

             - IS_EQUAL_TO

        contextValueRange:

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

    DlFrequencyContext:

      description: >-

        This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference

OpenAPI/TS28312_IntentNrm.yaml

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ components: 
            - RAN_SUBNETWORK  #value for Radio Network Expectation--#

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

            - 5GC_SUBNETWORK  #value for 5GC Network Expectation--#

            - Radio_Service  #value for Radio Service Expectation--#

            - RADIO_SERVICE  #value for Radio Service Expectation--#

            - SUBNETWORK  #value for Network Maintenance Expectation--#

        objectInstance:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -621,7 +621,7 @@ components: 
            - RAN_SUBNETWORK

            - EDGE_SERVICE_SUPPORT

            - 5GC_SUBNETWORK 

            - Radio_Service

            - RADIO_SERVICE

          readOnly: true  

          description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer.            

        supportedExpectationTargetInfoList: