Commit 4546d07b authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch '28.541_Rel18_CR0867_remove_redundant_stage_3_definition_for_Mnc_and_PlmnId' into 'Integration_Rel18_SA5_147_YAML'

CR0867 fix redundant definition, and impact to IntentNrm and EdgeNrm

See merge request !546
parents a7f0e4b9 7b934d2e

OpenAPI/TS28312_IntentNrm.yaml

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ components: 
        contextValueRange:

          type: array

          items:

            $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnId"

            $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId"



    NRFqBandContext:

      type: object

OpenAPI/TS28538_EdgeNrm.yaml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ components: 
        trackingAreaIdList:

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

        servingPLMN:

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

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

    GeoLoc:

      type: object

      properties:

OpenAPI/TS28541_5GcNrm.yaml

+10 −10
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ components: 
        nFStatus:

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

        plmn:

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

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        sNssais:

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

        fqdn:
@@ -101,7 +101,7 @@ components: 
        apiPrfix:

          type: string

        allowedPlmns:

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

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        allowedNfTypes:

          type: array

          items:
@@ -212,7 +212,7 @@ components: 
        allowedPLMNs:

          type: array

          items:

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

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        allowedSNPNs:

          type: array

          items:
@@ -544,7 +544,7 @@ components: 
      type: object

      properties:

        plmnId:

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

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        nRTACRangelist:

          type: array

          items:
@@ -554,7 +554,7 @@ components: 
      type: object

      properties:

          pLMNId: 

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

            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

          aMFIdentifier:

            type: integer
@@ -1833,7 +1833,7 @@ components: 
                - type: object

                  properties:

                    plmnId:

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

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

                    sEPPType:

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

                    sEPPId:
@@ -1993,7 +1993,7 @@ components: 
                - type: object

                  properties:

                    plmnId:

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

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

                    sBIFqdn:

                      type: string

                    managedNFProfile:
@@ -2023,7 +2023,7 @@ components: 
                - type: object

                  properties:

                    plmnId:

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

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

                    sBIFqdn:

                      type: string

                    managedNFProfile:
@@ -2120,7 +2120,7 @@ components: 
                - type: object

                  properties:

                    plmnId:

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

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

                    sEPPId:

                      type: integer

                    fqdn:
@@ -2453,7 +2453,7 @@ components: 
                - type: object

                  properties:

                    remotePlmnId:

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

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

                    remoteSeppAddress:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'

                    remoteSeppId:

OpenAPI/TS28541_NrNrm.yaml

+8 −18
Original line number Diff line number Diff line
@@ -44,25 +44,15 @@ components: 
        sd:

          type: string



    Mnc:

      type: string

      pattern: '[0-9]{3}|[0-9]{2}'

    PlmnId:

      type: object

      properties:

        mcc:

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

        mnc:

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

    PlmnIdList:

      type: array

      items:

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

        $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

    PlmnInfo:

      type: object

      properties:

        plmnId:

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

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        snssai:

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

    PlmnInfoList:
@@ -77,7 +67,7 @@ components: 
      type: object

      properties:

        plmnId:

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

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        cagidList:

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

        nidList:
@@ -117,7 +107,7 @@ components: 
      type: object

      properties:

        plmnId:

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

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        nrTac:

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

    TaiList:
@@ -287,7 +277,7 @@ components: 
      type: object

      properties:

        plmnId:

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

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        snssai:

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

    RrmPolicyMemberList:
@@ -587,7 +577,7 @@ components: 
        TceID:

          type: integer

        PlmnTarget:

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

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

    TceMappingInfoList:

      type: array

      items:
@@ -824,7 +814,7 @@ components: 
                    gnbCuName:

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

                    plmnId:

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

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

                    x2BlockList:

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

                    xnBlockList:
@@ -1601,7 +1591,7 @@ components: 
                    gnbIdLength:

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

                    plmnId:

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

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

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

        - type: object

          properties: