Commit c20d1e0c authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'Rebase_branch_TS28.312_Rel-17_CR0044_CR0045' into 'Integration_Rel17_SA5_149_YAML' 

Rebase branch ts28.312 rel 17 cr0044 cr0045

See merge request !628
parents 9a705ed6 9ef0b90c

OpenAPI/TS28312_IntentExpectations.yaml

+12 −8
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ components: 
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"

        expectationfulfilmentInfo:

            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 

      required:

        - expectationId

    ServiceSupportExpectation:

      description: >-

        This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment
@@ -82,6 +84,8 @@ components: 
              - $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 ----------#
@@ -442,7 +446,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - IS_WITHIN_RANGE

            - IS_ALL_OF

        contextValueRange:

          type: array

          items:
@@ -461,7 +465,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - IS_WITHIN_RANGE

             - IS_ALL_OF

        contextValueRange:

          type: array

          items:
@@ -478,7 +482,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - IS_WITHIN_RANGE

            - IS_ALL_OF

        contextValueRange:

          type: array

          items:
@@ -495,7 +499,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - IS_WITHIN_RANGE

            - IS_ALL_OF

        contextValueRange:

          type: array

          items:
@@ -512,7 +516,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - IS_WITHIN_RANGE

            - IS_ALL_OF

        contextValueRange:

          type: array

          items:
@@ -567,7 +571,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - IS_WITHIN_RANGE

            - IS_ALL_OF

        contextValueRange:

          type: array

          items:

OpenAPI/TS28312_IntentNrm.yaml

+7 −1
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ components: 
            $ref: "#/components/schemas/ExpectationContext"

        expectationfulfilmentInfo:

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

      required:

        - expectationId

   #-------Definition of the generic IntentExpectation dataType ----------#    



   #-------Definition of the generic ExpectationObject dataType ----------#
@@ -113,13 +115,16 @@ components: 
        - IS_NOT_ONE_OF

        - IS_EQUAL_TO_OR_LESS_THAN

        - IS_EQUAL_TO_OR_GREATER_THAN

        - IS_ALL_OF        

    FulfilStatus:

      type: string

      readOnly: true      

      enum:

          - FULFILLED

          - NOT_FULFILLED

    NotFulfilledState:

      type: string

      readOnly: true      

      enum:

          - ACKNOWLEDGED

          - COMPLIANT
@@ -140,6 +145,7 @@ components: 
          description: ->

            An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo

          type: string

          readOnly: true          

    ExpectationVerb:

      type: string

      enum: