Commit 37951726 authored by sunse's avatar sunse
Browse files

Merge branch 'TS28.541_Rel19_Alignment_of_IP_Address_modeling' into... 

Merge branch 'TS28.541_Rel19_Alignment_of_IP_Address_modeling' into 'Integration_Rel19_SA5_157_YAML'

TS28.541 Rel19 CR1371 TS28623 CR0450 Alignment of IP Address modeling

See merge request !1395
parents d6e7256a 6e935ef1

OpenAPI/TS28541_5GcNrm.yaml

+4 −5
Original line number Diff line number Diff line
@@ -692,8 +692,7 @@ components: 
      type: object

      properties:

        uPFIpAddress:

          type: string

          readOnly: true

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

        uPFRef:

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

    SnssaiList:
@@ -3956,11 +3955,11 @@ components: 
                    eDNServiceArea:

                      $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/ServingLocation'

                    eASIpAddress:

                      type: string

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

                    eESIpAddress:

                      type: string

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

                    eCSIpAddress:

                      type: string

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

                    ednIdentifier:

                      type: string

                    ecmConnectionType:

OpenAPI/TS28541_NrNrm.yaml

+7 −16
Original line number Diff line number Diff line
@@ -282,10 +282,8 @@ components: 
    AddressWithVlan:

      type: object

      properties:

        ipv4Address:

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

        ipv6Address:

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

        iPAddress:

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

        vlanId:

          type: integer

          minimum: 0
@@ -300,12 +298,7 @@ components: 
          minimum: 0

          maximum: 65535

    RemoteAddress:

      type: object

      properties:

        ipv4Address:

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

        ipv6Address:

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

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



    CellIndividualOffset:

      type: object
@@ -579,13 +572,11 @@ components: 
    TceMappingInfo:

      type: object

      properties:

        TceIPAddress:

          oneOf:

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

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

        TceID:

        tceIPAddress:

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

        tceID:

          type: integer

        PlmnTarget:

        pLMNTarget:

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

    TceMappingInfoList:

      type: array

OpenAPI/TS28623_ComDefs.yaml

+4 −0
Original line number Diff line number Diff line
@@ -281,6 +281,10 @@ components: 
      oneOf:

        - $ref: '#/components/schemas/IpAddr'

        - $ref: '#/components/schemas/Fqdn'

    HostRo:

      oneOf:

        - $ref: '#/components/schemas/IpAddrRo'

        - $ref: '#/components/schemas/FqdnRo'

    Uri:

      description: This datatype is used for writable attribute

      type: string