Commit f03bcb8c authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'Integration_Rel17_SA5_150_YAML' into... 

Merge branch 'Integration_Rel17_SA5_150_YAML' into '28.541_Rel17_CR0943_Correct_attribute_name_for_frequency_prediction_Yaml'

# Conflicts:
#   OpenAPI/TS28541_SliceNrm.yaml

Address conflict issue
parents 45d6e0c5 726ba5e3

OpenAPI/TS28312_IntentExpectations.yaml

+25 −32
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ components: 
          type: string

        expectationVerb:

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

        expectationObjects:

          type: array

          items:

        expectationObject:

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

        expectationTargets:

          type: array
@@ -38,6 +36,7 @@ components: 
              - $ref: "#/components/schemas/AveDLRANUEThptTarget"

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

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

              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"

        expectationContexts:

          type: array

          items:
@@ -46,7 +45,7 @@ components: 
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 

      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
@@ -55,10 +54,8 @@ components: 
          type: string

        expectationVerb:

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

        expectationObjects:

          type: array

          items:

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

        expectationObject:

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

        expectationTargets:

          type: array

          items:
@@ -97,7 +94,7 @@ components: 
        objectType:

          type: string

          enum:

            - RAN_SubNetwork #value for Radio Network Expectation--#

            - RAN_SubNetwork 

        objectInstance:

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

        objectContexts:
@@ -110,16 +107,16 @@ components: 
              - $ref: "#/components/schemas/PLMNContext"

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

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

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

    ServiceSupportExpectationObject: 

              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"               

    EdgeServiceSupportExpectationObject: 

      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 #value for Service Support Expectation--#

            - Service_Support 

        objectInstance:

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

        objectContexts:
@@ -127,10 +124,10 @@ components: 
          items:

            type: object

            oneOf:

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

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

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

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

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

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

              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"   

   #-------Definition of the ExpectationObject dataType ----------#
@@ -525,9 +522,9 @@ components: 
              - UTRAN

              - EUTRAN

              - NR

    EdgeIdenfiticationIdContext:

    EdgeIdentificationIdContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext      

        This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext      

      type: object

      properties:

        contextAttribute:
@@ -542,9 +539,9 @@ components: 
          type: array

          items:

            type: string

    EdgeIdenfiticationLocContext:

    EdgeIdentificationLocContext:

      description: >-

        This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext    

        This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationLocContext    

      type: object

      properties:

        contextAttribute:
@@ -580,7 +577,7 @@ components: 
          type: integer

   #-------Definition of the scenario specific  ObjectTarget dataType----------------#

   

   #-------Definition of the concrete ExpectionContext dataType----------------#

   #-------Definition of the concrete ExpectationContext dataType----------------#

    ServiceStartTimeContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext
@@ -595,7 +592,7 @@ components: 
          enum:

            - IS_EQUAL_TO

        contextValueRange:

          type: string

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

    ServiceEndTimeContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext
@@ -610,7 +607,7 @@ components: 
          enum:

            - IS_EQUAL_TO

        contextValueRange:

          type: string

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

    UEMobilityLevelContext:

      description: >-

        This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext
@@ -623,10 +620,8 @@ components: 
        contextCondition:

          type: string

          enum:

            - IS_WITHIN_RANGE

            - IS_EQUAL_TO

        contextValueRange:

          type: array

          items:

          $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel"

    ResourceSharingLevelContext:

      description: >-
@@ -640,9 +635,7 @@ components: 
        contextCondition:

          type: string

          enum:

            - IS_WITHIN_RANGE

            - IS_EQUAL_TO

        contextValueRange:

          type: array

          items:

          $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel"

   #-------Definition of the concrete ExpectionContext dataType----------------#

OpenAPI/TS28312_IntentNrm.yaml

+5 −8
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ components: 
              oneOf:

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

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

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

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

          intentContexts:

            type: array

            items:
@@ -63,9 +63,7 @@ components: 
          type: string

        expectationVerb:

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

        expectationObjects:

          type: array

          items:

        expectationObject:

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

        expectationTargets:

          type: array
@@ -91,8 +89,7 @@ components: 
          type: string

          enum:

            - RAN_SubNetwork  #value for Radio Network Expectation--#

            - Service_Support  #value for Service Support Expectation--#

            - TBD    #-This will be added based on defined scenario specfic intent expectation-#

            - EdgeService_Support  #value for Service Support Expectation--#

        objectInstance:

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

        objectContexts:
@@ -228,7 +225,7 @@ components: 
          type: array

          items:

            type: number 

   #-------Definition of the concrete ExpectionContext dataType----------------#

   #-------Definition of the concrete ExpectationContext dataType----------------#

   

   #------Definition of JSON arrays for name-contained IOCs ---------------#

OpenAPI/TS28532_FaultMnS.yaml

+4 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ paths: 
    patch:

      summary: 'Clear, acknowledge or unacknowledge a single alarm'

      description: >-

        Clears, acknowledges or uncknowldeges a single alarm by patching the alarm

        Clears, acknowledges or unacknowldeges a single alarm by patching the alarm

        information. A conditional acknowledge request based on the perceived

        severity is not supported.

      parameters:
@@ -792,6 +792,7 @@ components: 
          required:

            - alarmId

            - alarmType

            - probableCause

          properties:

            alarmId:

              $ref: '#/components/schemas/AlarmId'
@@ -834,6 +835,7 @@ components: 
          required:

            - alarmId

            - alarmType

            - probableCause

            - serviceUser

            - serviceProvider

            - securityAlarmDetector
@@ -961,7 +963,7 @@ components: 
    MergePatchAcknowledgeAlarm:

      description: >-

        Patch document acknowledging or unacknowledging a single alarm. For

        acknowleding an alarm the value of ackState is ACKNOWLEDGED, for unacknowleding

        acknowledging an alarm the value of ackState is ACKNOWLEDGED, for unacknowledging

        an alarm the value of ackState is UNACKNOWLEDGED.

      type: object

      required:

OpenAPI/TS28532_FileDataReportingMnS.yaml

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ components: 
      enum:

        - Performance

        - Trace

        - Anatytics

        - Analytics

        - Proprietary

    FileNotificationTypes:

      type: string

OpenAPI/TS28532_ProvMnS.yaml

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ paths: 
            This status code shall be returned when the resource is replaced, and

            when the replaced resource representation is not identical to the resource

            representation in the request.

            This status code may be retourned when the resource is updated and when the

            This status code may be returned when the resource is updated and when the

            updated resource representation is identical to the resource representation

            in the request.

            The representation of the updated resource is returned in the response
@@ -205,7 +205,7 @@ paths: 
          description: >-

            This parameter specifies the attributes of the scoped resources that

            are returned.

          required: true

          required: false

          schema:

            type: array

            items: