Commit 133be92e authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel18_CR0897_NRM_enhancements_for_DCCFunction' into... 

Merge branch 'TS28.541_Rel18_CR0897_NRM_enhancements_for_DCCFunction' into 'Integration_Rel18_SA5_149_YAML'

TS28.541_Rel18_CR0897 DCCFFunction Update TS28541_5GcNrm.yaml

See merge request !615
parents c439e30b 4ebd96cd

OpenAPI/TS28541_5GcNrm.yaml

+66 −1
Original line number Diff line number Diff line
@@ -1399,6 +1399,43 @@ components: 
            $ref: '#/components/schemas/PlmnRange'

          minItems: 1



    LogicalInterfaceInfo:

      type: object

      properties:

         logicalInterfaceType:

           type: string

           enum: 

            - VLAN

            - MPLS

            - Segment

         logicalInterfaceId:

           type: string



    DccfInfo:

      description: Specific Data for DCCF

      type: object

      properties:

        servingNfTypeList:

          type: array

          items:

            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'

          minItems: 1

        servingNfSetIdList:

          type: array

          items:

            $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId'

          minItems: 1

        taiList:

          type: array

          items:

            $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai'

          minItems: 1

        taiRangeList:

          type: array

          items:

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

          minItems: 1



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

    ProvMnS:

      oneOf:
@@ -1502,6 +1539,8 @@ components: 
              $ref: '#/components/schemas/NssaafFunction-Multiple'

            AFFunction:

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

            DCCFFunction:

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



    AmfFunction-Single:

      allOf:
@@ -3140,6 +3179,28 @@ components: 
                    remoteAddress:

                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress'



    DccfFunction-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              allOf:

                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'

                - type: object

                  properties:

                    pLMNInfoList:

                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList'

                    sBIFqdn:

                      type: string

                    managedNFProfile:

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

                    commModelList:

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

                    dccfInfo:

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

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'



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



    SubNetwork-Multiple:
@@ -3434,6 +3495,10 @@ components: 
      type: array

      items:

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

    DccfFunction-Multiple:

      type: array

      items:

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



#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
@@ -3524,4 +3589,4 @@ components: 
       - $ref: '#/components/schemas/EcmConnectionInfo-Single'

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

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

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