Commit 43b6c018 authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0041

parents e1afb8f2 178515f1

OpenAPI/TS28536_CoslaNrm.yaml

+56 −12
Original line number Diff line number Diff line
@@ -55,22 +55,57 @@ components: 
        - FULFILLED

        - NOT_FULFILLED



    AssuranceTargetName:

      type: string



    AssuranceTarget:

      type: object

      properties:

        assuranceTargetName:

          type: string

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

        assuranceTargetValue:

          type: string

         

    AssuranceTargetList:

      type: array

      items:

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



    AssuranceGoalStatus:

      type: object

      properties:

        assuranceGoalStatusId:

          type: string

        assuranceGoalId:

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

        assuranceGoalStatusObserved:

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

        assuranceGoalStatusPredicted:

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

        assuranceGoalRef:

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



    AssuranceGoalStatusList:

      type: array

      items:

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



    AssuranceTargetStatus:

      type: object

      properties:

        assuranceTargetStatusId:

          type: string

        assuranceTargetName:

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

        assuranceTargetStatusObserved:

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

        assuranceTargetStatusPredicted:

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

         

    AssuranceTargetList:

    AssuranceTargetStatusList:

      type: array

      items:

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

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

     

    AttributeNameList:

      type: array
@@ -149,6 +184,10 @@ components: 
                      $ref: '#/components/schemas/ACCLDisallowedAttributes'

            AssuranceGoal:

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

              networkSliceRef:

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

              networkSliceSubnetRef:

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



    AssuranceGoal-Single:

      allOf:
@@ -163,20 +202,24 @@ components: 
                      $ref: '#/components/schemas/ObservationTime'

                    assuranceTargetList:

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

                    assuranceGoalStatusObserved:

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

                    assuranceGoalStatusPredicted:

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

                    assuranceScope:

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

                    serviceProfileId:

                      type: string

                    sliceProfileId:

                      type: string

                    networkSliceRef:

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

                    networkSliceSubnetRef:

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

 

    AssuranceReport-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              allOf:

                - type: object

                  properties:

                    assuranceGoalStatusList:

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

                      

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

    SubNetwork-Multiple:
@@ -206,5 +249,6 @@ components: 
       - $ref: '#/components/schemas/MnS'

       - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single'

       - $ref: '#/components/schemas/AssuranceGoal-Single'    

       - $ref: '#/components/schemas/AssuranceReport-Single'

       - $ref: '#/components/schemas/SubNetwork-Single'

       - $ref: '#/components/schemas/ManagedElement-Single'