Commit 71bb086d authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'TS28.541_Rel-17_CR0721_Correcton_on_the_attribute_definition_in_the_wrong_yaml_file' into 'Integration_Rel17_SA5_143_YAML'

Ts28.541 rel 17 cr0721 correcton on the attribute definition in the wrong yaml file (S5-223305)

See merge request sa5/MnS!311
parents bce04a20 8fdae06d

OpenAPI/5gcNrm.yaml

+19 −15
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ components: 
        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'

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



    TrafficControlDataList:

      type: array
@@ -619,6 +619,10 @@ components: 
          type: string

        uPFRef:

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

    SnssaiList:

      type: array

      items:

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



#-------- Definition of concrete IOCs --------------------------------------------
@@ -735,7 +739,7 @@ components: 
                    weightFactor:

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

                    snssaiList:

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

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

                    cNSIIdList:

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

                    gUAMIdList:
@@ -800,7 +804,7 @@ components: 
                    amfSetId:

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

                    snssaiList:

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

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

                    aMFRegionRef:

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

                    aMFSetMemberList:
@@ -822,7 +826,7 @@ components: 
                    amfRegionId:

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

                    snssaiList:

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

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

                    aMFSetListRef:

                      $ref: 'comDefs.yaml#/components/schemas/DnList'

    SmfFunction-Single:
@@ -919,7 +923,7 @@ components: 
                    nRTACList:

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

                    snssaiList:

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

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

                    managedNFProfile:

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

                    supportedBMOList:
@@ -973,7 +977,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

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

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

                    managedNFProfile:

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

                    commModelList:
@@ -1016,7 +1020,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

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

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

                    managedNFProfile:

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

                    commModelList:
@@ -1043,7 +1047,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

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

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

                    managedNFProfile:

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

                    commModelList:
@@ -1074,7 +1078,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

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

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

                    managedNFProfile:

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

    UdsfFunction-Single:
@@ -1092,7 +1096,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

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

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

                    managedNFProfile:

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

    NrfFunction-Single:
@@ -1114,7 +1118,7 @@ components: 
                    nFProfileList:

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

                    snssaiList:

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

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

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

        - type: object

          properties:
@@ -1139,7 +1143,7 @@ components: 
                    nFProfileList:

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

                    snssaiList:

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

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

                    commModelList:

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

        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
@@ -1212,7 +1216,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

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

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

                    managedNFProfile:

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

                    commModelList:
@@ -1260,7 +1264,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

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

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

                    managedNFProfile:

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

                    commModelList:
@@ -1296,7 +1300,7 @@ components: 
                    sBIFqdn:

                      type: string

                    snssaiList:

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

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

                    managedNFProfile:

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

                    capabilityList:

OpenAPI/nrNrm.yaml

+0 −4
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ components: 
          $ref: '#/components/schemas/Sst'

        sd:

          type: string

    SnssaiList:

      type: array

      items:

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



    Mnc:

      type: string