Commit c6034f9c authored by sunse's avatar sunse
Browse files

manual fix of code confliction

parents f3364c0a 53455f6c

OpenAPI/TS28541_5GcNrm.yaml

+64 −0
Original line number Diff line number Diff line
@@ -1206,6 +1206,33 @@ components: 
          items:

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

          minItems: 1

    TrustAfInfo:

      description: Information of a trusted AF Instance

      type: object

      properties:

        sNssaiInfoList:

          type: array

          items:

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

          minItems: 1

        afEvents:

          type: array

          items:

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

          minItems: 1

        appIds:

          type: array

          items:

            type: string

          minItems: 1

        internalGroupId:

          type: array

          items:

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

          minItems: 1

        mappingInd:

          type: boolean

          default: False



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

    ProvMnS:
@@ -1308,6 +1335,8 @@ components: 
              $ref: '#/components/schemas/EASDFFunction-Multiple'

            NSSAAFFunction:

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

            AFFunction:

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



    AmfFunction-Single:

      allOf:
@@ -2889,6 +2918,30 @@ components: 
                      items:

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

                          

    AfFunction-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:

                    plmnIdList:

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

                    managedNFProfile:

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

                    commModelList:

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

                    trustAfInfo:

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

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

        - type: object

          properties:

            EP_N5:

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



    NssaafFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -3220,6 +3273,7 @@ components: 
      type: array

      items:

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

<<<<<<< HEAD

    NssaafFunction-Multiple:

      type: array

      items:
@@ -3232,6 +3286,12 @@ components: 
      type: array

      items:

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

=======

    AfFunction-Multiple:

      type: array

      items:

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

>>>>>>> 28.541_Rel18_CR0862_NRM_enhancements_for_AFFunction



#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------
@@ -3320,5 +3380,9 @@ components: 
       - $ref: '#/components/schemas/Dynamic5QISet-Single'

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

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

<<<<<<< HEAD

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

=======

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

>>>>>>> 28.541_Rel18_CR0862_NRM_enhancements_for_AFFunction