Commit 2b004085 authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'Rel19_CR0369_TS_28.312_Correct_the_issue_for_stage3_YAML_definition' into 'Integration_Rel19_SA5_164_YAML'

Rel19_CR0369_TS_28.312_Correct_the_issue_for_stage3_YAML_definition

See merge request !1969
parents a986d54f b35978ec

OpenAPI/TS28312_IntentNrm.yaml

+56 −42
Original line number Diff line number Diff line
@@ -38,20 +38,20 @@ components: 
            items:

              type: object

              oneOf:

                - $ref: "#/components/schemas/IntentExpectation"

                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation"

                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation"

                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation"

                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation"

                - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation"

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

                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation'

                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation'

                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation'

                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation'

                - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation'

          intentMgmtPurpose:

            $ref: "#/components/schemas/IntentMgmtPurpose"

            $ref: '#/components/schemas/IntentMgmtPurpose'

          contextSelectivity:

            $ref: "#/components/schemas/Selectivity"

            $ref: '#/components/schemas/Selectivity'

          consumerSatisfactionIndexThreshold:

            type: integer

          expectationSelectivity:

            $ref: "#/components/schemas/Selectivity"

            $ref: '#/components/schemas/Selectivity'

          intentContexts:

            type: array

            uniqueItems: true
@@ -65,6 +65,7 @@ components: 
            enum:

              - ACTIVATED

              - DEACTIVATED

            default: ACTIVATED

            description: >-

              It describes the intent administrative state. 

              This attribute is used when MnS consumer-suspension mechanism is supported
@@ -76,6 +77,9 @@ components: 
          intentPreemptionCapability:

            type: boolean

          intentReportControl:

            type: array

            uniqueItems: true

            items:

              $ref: '#/components/schemas/IntentReportControl'

          implicitIntentIndex:

            type: boolean
@@ -101,7 +105,10 @@ components: 
            $ref: '#/components/schemas/IntentFeasibilityCheckReport'

          intentExplorationReport:

            $ref: '#/components/schemas/IntentExplorationReport'

          intentUtilityReport:

          intentUtilityReports:

            type: array

            uniqueItems: true

            items:

              $ref: '#/components/schemas/IntentUtilityReport'

          intentFulfilmentNegotiationReport:

            $ref: '#/components/schemas/IntentFulfilmentNegotiationReport'
@@ -132,6 +139,8 @@ components: 
            $ref: '#/components/schemas/Intent-Multiple'

          IntentReport:

            $ref: '#/components/schemas/IntentReport-Multiple'

          IntentUtilityFormula:

             $ref: '#/components/schemas/IntentUtilityFormula-Multiple'

    IntentUtilityFormula-Single:

      description: >- 

       It represents an intent utility function instance.
@@ -146,14 +155,11 @@ components: 
            items:

              $ref: '#/components/schemas/UtilityParameter'

            uniqueItems: true

            minItems: 1

          utilityScale:

            type: number

            minItems: 1

            default: 0

            default: 1

          utilityOffset:

            type: number

            minItems: 1

            default: 0

   #-------Definition of generic IOCs ----------#
@@ -421,18 +427,15 @@ components: 
        expectedReportTypes:

          description: >-

            It indicates the type of IntentReports.

          type: string

          enum:

            - INTENT_FULFILMENT_REPORT

            - INTENT_CONFLICT_REPORT

            - INTENT_FEASIBILITY_CHECK_REPORT

            - INTENT_EXPLORATION_REPORT

            - INTENT_FULFILMENT_NEGOTIATION_REPORT

            - INTENT_UTILITY_REPORT

          type: array

          uniqueItems: true

          items:

            $ref: '#/components/schemas/ExpectedReportType'

        reportingConditions:

          description: >-

             It indicates the specified conditions for intent reporting.

          type: array

          uniqueItems: true

          items:

            $ref: '#/components/schemas/ReportingCondition'

        reportingTargets:
@@ -444,6 +447,15 @@ components: 
      required:

        - reportRecipientAddress

        - observationPeriod

    ExpectedReportType:

      type: string

      enum:

        - INTENT_FULFILMENT_REPORT

        - INTENT_CONFLICT_REPORT

        - INTENT_FEASIBILITY_CHECK_REPORT

        - INTENT_EXPLORATION_REPORT

        - INTENT_FULFILMENT_NEGOTIATION_REPORT

        - INTENT_UTILITY_REPORT

    ReportingCondition:

      description: >-

        It describes  the specified conditions for intent reporting.
@@ -466,8 +478,8 @@ components: 
            - type: array

              uniqueItems: true

              items:

                $ref: "#/components/schemas/ValueRangeType"

            - $ref: "#/components/schemas/ValueRangeType"

                $ref: '#/components/schemas/ValueRangeType'

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

   #-------Definition of the concrete IntentReportControl dataType----------------#
@@ -609,6 +621,7 @@ components: 
        infeasibilityReasons:

          description: An attribute which is used when feasibilityCheckResult is INFEASIBLE

          type: array

          uniqueItems: true

          items:

            type: string

            readOnly: true
@@ -633,6 +646,7 @@ components: 
          readOnly: true

        inFeasibleTargets:

          type: array

          uniqueItems: true

          items:

            type: string

            readOnly: true