Commit 2a253a69 authored by sunse's avatar sunse
Browse files

resolve merge confliction with local branch for CR0626

parents 2b43909f 2aad923c

OpenAPI/5gcNrm.yaml

+2 −0
Original line number Diff line number Diff line
@@ -382,6 +382,8 @@ components: 
          $ref: '#/components/schemas/SteeringMode'

        mulAccCtrl:

          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/MulticastAccessControl'

        snssaiList:

          $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'



    TrafficControlDataList:

      type: array

OpenAPI/sliceNrm.yaml

+26 −1
Original line number Diff line number Diff line
@@ -264,6 +264,27 @@ components: 
          $ref: '#/components/schemas/ServAttrCom'

        support:

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

    SecFunc:

      type: object

      properties:

        secFunId:

          type: string

        secFunType:

          type: string

        secRules:

          type: array

          items:

            type: string

    N6Protection:

      type: object

      properties:

        servAttrCom:

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

        secFuncList:

          type: array

          items:

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



    CNSliceSubnetProfile:

      type: object

      properties:
@@ -307,6 +328,8 @@ components: 
          type: string

        nssaaSupport:

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

        n6Protection:

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

    RANSliceSubnetProfile:

      type: object

      properties:
@@ -487,6 +510,8 @@ components: 
            $ref: '#/components/schemas/EnergyEfficiency'

          nssaaSupport:

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

          n6Protection:

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

    SliceProfile:

      type: object

      properties: