Commit 27252847 authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'Integration_Rel20_SA5_165_YAML' into... 

Merge branch 'Integration_Rel20_SA5_165_YAML' into 'Rel-20_CR1665_TS_28.541_Add_openAPI_definition_for_SectorEquipmentFunction_and_AntennaFunction'

# Conflicts:
#   OpenAPI/TS28623_GenericNrm.yaml
parents 4d02cb77 0f2f21d9

OpenAPI/TS28623_ExternalDataMgmtNrm.yaml

+9 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ components: 
          uniqueItems: true

          items:

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



#-------- Definition of concrete IOCs --------------------------------------------



    ExternalDataType-Single:
@@ -53,6 +52,15 @@ components: 
            properties:

              externalDataType:

                type: string

                example:

                  - ELECTRONIC_MAP

                  - CAMARA_DATA

                  - UE_PATH

                  - CAMERA_PHOTO

                  - EVENT_SCHEDULE

                  - WEATHER_FORECASTS

                description: >-

                  Type of external management data as defined by the implementation.

              mediaLocation: 

                type: array

                uniqueItems: true

OpenAPI/TS28623_GenericNrm.yaml

+3 −1
Original line number Diff line number Diff line
@@ -643,6 +643,9 @@ components: 
        - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm'

        - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm'

        - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyInformationNrm'    

        - $ref: 'TS28623_ExternalDataMgmtNrm.yaml#/components/schemas/SubNetwork-ncO-ExternalDataMgmtNrm'

        - $ref: 'TS28561_NdtNrm.yaml#/components/schemas/SubNetwork-ncO-NDTNrm'

        - $ref: 'TS28567_CclNrm.yaml#/components/schemas/SubNetwork-ncO-CCLNrm'



    ManagedElement-Single:

      allOf:
@@ -661,7 +664,6 @@ components: 
        - $ref: 'TS28541_NrNrm.yaml#/components/schemas/ManagedElement-ncO-NrNrm'

        - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/ManagedElement-ncO-5GcNrm'

        - $ref: 'TS28541_GenericRanNrm.yaml#/components/schemas/ManagedElement-ncO-GenericRanNrm'



    NrmRoot:

      oneOf:

        - type: object

OpenAPI/TS28623_ManagementDataCollectionNrm.yaml

+11 −7
Original line number Diff line number Diff line
@@ -34,13 +34,17 @@ components: 
          $ref: '#/components/schemas/mgtDataName'

        uniqueItems: true  

    mgtDataCategory:

      type: string

      oneOf:

        - type: string

          enum:

            - COVERAGE

            - CAPACITY

            - SERVICE_EXPERIENCE

            - TRACE

            - ENERGY_EFFICIENCY

            - MOBILITY

            - ACCESSIBILITY

        - type: string 

    mgtDataName:

      type: string

    NodeFilter:

OpenAPI/TS28623_MnSRegistryNrm.yaml

+27 −13
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ components: 
      type: object

      properties:

        MnsRegistry:

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

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

    

   #-------Definition of generic IOCs ----------#
@@ -120,15 +120,24 @@ components: 
      description: ->

        It defines the information about the management scope of the Management Service.

      oneOf:

        - type: array

        - type: object

          properties:

            objectInstanceList:

              type: array

              uniqueItems: true

              items:

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

        - type: array

        - type: object

          properties:

            geoAreasList:

              type: array

              uniqueItems: true

              items:

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

        - type: array

        - type: object

          properties:

            taiList:

              type: array

              uniqueItems: true

              items:

                $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai'
@@ -200,6 +209,11 @@ components: 


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



    MnsRegistry-Multiple:

      type: array

      items:

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



    MnsInfo-Multiple:

      type: array

      items: