Commit 90fbf13e authored by pingj's avatar pingj Committed by pingj
Browse files

28.623_Rel16_CR0129_Clean_up_regarding_common_data_types - update 5G NRM to... 

28.623_Rel16_CR0129_Clean_up_regarding_common_data_types - update 5G NRM to align with common definition change
parent 125ba733

OpenAPI/5gcNrm.yaml

+12 −12
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ components: 
      type: object

      properties:

        ipv4Address:

          $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'

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

        ipv6Address:

          $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'

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

        ipv6Prefix:

          $ref: 'genericNrm.yaml#/components/schemas/Ipv6Prefix'

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

        transport:

          $ref: 'genericNrm.yaml#/components/schemas/TransportProtocol'

        port:
@@ -71,9 +71,9 @@ components: 
        sNssais:

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

        fqdn:

          $ref: 'genericNrm.yaml#/components/schemas/Fqdn'

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

        interPlmnFqdn:

          $ref: 'genericNrm.yaml#/components/schemas/Fqdn'

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

        nfServices:

          type: array

          items:
@@ -91,9 +91,9 @@ components: 
        schema:

          type: string

        fqdn:

          $ref: 'genericNrm.yaml#/components/schemas/Fqdn'

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

        interPlmnFqdn:

          $ref: 'genericNrm.yaml#/components/schemas/Fqdn'

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

        ipEndPoints:

          type: array

          items:
@@ -183,7 +183,7 @@ components: 
        authzInfo:

          type: string

        hostAddr:

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

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

        locality:

          type: string

        nFInfo:
@@ -992,7 +992,7 @@ components: 
                    sEPPId:

                      type: integer

                    fqdn:

                      $ref: 'genericNrm.yaml#/components/schemas/Fqdn'

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

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

        - type: object

          properties:
@@ -1031,7 +1031,7 @@ components: 
                    supportedFuncList:

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

                    address:

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

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

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

    NefFunction-Single:

      allOf:
@@ -1110,7 +1110,7 @@ components: 
                    sEPPId:

                      type: integer

                    fqdn:

                      $ref: 'genericNrm.yaml#/components/schemas/Fqdn'

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





    EP_N2-Single:
@@ -1441,7 +1441,7 @@ components: 
                    remotePlmnId:

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

                    remoteSeppAddress:

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

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

                    remoteSeppId:

                      type: integer

                    n32cParas:

OpenAPI/nrNrm.yaml

+6 −6
Original line number Diff line number Diff line
@@ -272,9 +272,9 @@ components: 
      type: object

      properties:

        ipv4Address:

          $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'

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

        ipv6Address:

          $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'

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

        vlanId:

          type: integer

          minimum: 0
@@ -292,9 +292,9 @@ components: 
      type: object

      properties:

        ipv4Address:

          $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr'

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

        ipv6Address:

          $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr'

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



    CellIndividualOffset:

      type: object
@@ -556,8 +556,8 @@ components: 
      properties:

        TceIPAddress:

          oneOf:

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

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

            - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr'

            - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr'

        TceID:

          type: integer

        PlmnTarget:

OpenAPI/sliceNrm.yaml

+2 −2
Original line number Diff line number Diff line
@@ -290,8 +290,8 @@ components: 


    IpAddress:

      oneOf:

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

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

        - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr'

        - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr'

    ServiceProfileList:

       type: array

       items: