Commit 34333aff authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

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

Ts28.541 rel 17 cr0723 address the unnecessary reference for the yaml file rebase for merge

See merge request sa5/MnS!315
parents 00fc085f c0948e7f

OpenAPI/5gcNrm.yaml

+26 −6
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ components: 
        allowedSNPNs:

          type: array

          items:

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

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

        allowedNfTypes:

          type: array

          items:
@@ -623,6 +623,26 @@ components: 
      type: array

      items:

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

    SnpnId:

      type: object

      properties:

        mcc:

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

        mnc:

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

        nid:

          type: string

    SnpnInfo:

      type: object

      properties:

        snpnId:

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

        snssai:

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

    TaiList:

      type: array

      items:

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



#-------- Definition of concrete IOCs --------------------------------------------
@@ -731,11 +751,11 @@ components: 
                    interPlmnFQDN:

                      type: string

                    taiList:

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

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

                    taiRangeList:

                      type: array

                      items:

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

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

                    weightFactor:

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

                    snssaiList:
@@ -856,7 +876,7 @@ components: 
                    taiRangeList:

                      type: array

                      items:

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

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

                    pwgFqdn:

                      type: string

                    pgwAddrList:
@@ -1309,7 +1329,7 @@ components: 
                      type: boolean

                    taiList:

                      items:

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

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

                    taiRangeList:

                      type: array

                      items:
@@ -1340,7 +1360,7 @@ components: 
                        $ref: '#/components/schemas/NsacfInfoSnssai'

                    taiList:

                      items:

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

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

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

        - type: object

          properties:

OpenAPI/nrNrm.yaml

+0 −35
Original line number Diff line number Diff line
@@ -69,22 +69,6 @@ components: 
      type: array

      items:

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

    SnpnId:

      type: object

      properties:

        mcc:

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

        mnc:

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

        nid:

          type: string

    SnpnInfo:

      type: object

      properties:

        snpnId:

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

        snssai:

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

    cagId:

      type: string

    nid:
@@ -136,25 +120,6 @@ components: 
      type: array

      items:

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

    NrtacRange: 

      type: object

      properties:

        nRTACstart:

          type: string

        nRTACend:

          type: string

        nRTACpattern:

          type: string

    TaiRange:

      type: object

      properties:

        plmnId:

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

        nRTACRangeList:

          type: array

          items: 

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



    BackhaulAddress:

      type: object

      properties: