Commit f117197e authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0791

parents bf7ea1fb edefe357

OpenAPI/TS28541_5GcNrm.yaml

+136 −0
Original line number Diff line number Diff line
@@ -775,6 +775,70 @@ components: 
        fqdn:

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



    Ipv4AddressRange:

      description: Range of IPv4 addresses

      type: object

      properties:

        start:

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

        end:

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

    Ipv6PrefixRange:

      description: Range of IPv6 prefixes

      type: object

      properties:

        start:

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

        end:

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

    Nid:

      type: string

      pattern: '^[A-Fa-f0-9]{11}$'

    PlmnIdNid:

      type: object

      properties:

        mcc:

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

        mnc:

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

        nid:

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

    ScpCapability:

      type: string

      enum: 

        - INDIRECT_COM_WITH_DELEG_DISC

    IpReachability:

      description: Indicates the type(s) of IP addresses reachable via an SCP

      anyOf:

        - type: string

          enum:

            - IPV4

            - IPV6

            - IPV4V6

        - type: string



    ScpDomainInfo:

      description: SCP Domain specific information

      type: object

      properties:

        scpFqdn:

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

        scpIpEndPoints:

          type: array

          items:

            $ref: 'TS28541_5GcNrm.yaml#/components/schemas/IpEndPoint'

          minItems: 1

        scpPrefix:

          type: string

        scpPorts:

          description: >

            Port numbers for HTTP and HTTPS. The key of the map shall be "http" or "https".

          type: object

          additionalProperties:

            type: integer

            minimum: 0

            maximum: 65535

          minProperties: 1



    SeppInfo:

      description: Information of a SEPP Instance
@@ -903,6 +967,76 @@ components: 
            $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'

          minItems: 1



    ScpInfo:

      description: Information of an SCP Instance

      type: object

      properties:

        scpDomainInfoList:

          description: >

            A map (list of key-value pairs) where the key of the map shall be the string

            identifying an SCP domain

          type: object

          additionalProperties:

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

          minProperties: 1

        scpPrefix:

          type: string

        scpPorts:

          description: >

            Port numbers for HTTP and HTTPS. The key of the map shall be "http" or "https".

          type: object

          additionalProperties:

            type: integer

            minimum: 0

            maximum: 65535

          minProperties: 1

        addressDomains:

          type: array

          items:

            type: string

          minItems: 1

        ipv4Addresses:

          type: array

          items:

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

          minItems: 1

        ipv6Prefixes:

          type: array

          items:

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

          minItems: 1

        ipv4AddrRanges:

          type: array

          items:

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

          minItems: 1

        ipv6PrefixRanges:

          type: array

          items:

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

          minItems: 1

        servedNfSetIdList:

          type: array

          items:

            $ref: 'TS29571_CommonData.yaml#/components/schemas/NfSetId'

          minItems: 1

        remotePlmnList:

          type: array

          items:

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

          minItems: 1

        remoteSnpnList:

          type: array

          items:

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

          minItems: 1

        ipReachability:

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

        scpCapabilities:

          type: array

          items:

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



#-------- Definition of concrete IOCs --------------------------------------------

    ProvMnS:

      oneOf:
@@ -1664,6 +1798,8 @@ components: 
                      $ref: '#/components/schemas/SupportedFuncList'

                    address:

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

                    scpInfo:

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

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

    NefFunction-Single:

      allOf: