Commit e6c84629 authored by sunse's avatar sunse
Browse files

manual fix rebase confliction

parents 89c6aa29 facfec8b

OpenAPI/TS28541_5GcNrm.yaml

+63 −28
Original line number Diff line number Diff line
@@ -1312,6 +1312,65 @@ components: 
          items:

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

          minItems: 1

    UdrInfo:

      description: Information of an UDR NF Instance

      type: object

      properties:

        groupId:

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

        supiRanges:

          type: array

          items:

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

          minItems: 1

        gpsiRanges:

          type: array

          items:

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

          minItems: 1

        externalGroupIdentifiersRanges:

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

        supportedDataSets:

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

        sharedDataIdRanges:

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

    UdmInfo:

      description: Information of an UDM NF Instance

      type: object

      properties:

        groupId:

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

        supiRanges:

          type: array

          items:

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

          minItems: 1

        gpsiRanges:

          type: array

          items:

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

          minItems: 1

        externalGroupIdentifiersRanges:

          type: array

          items:

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

          minItems: 1

        routingIndicators:

          type: array

          items:

            type: string

            pattern: '^[0-9]{1,4}$'

          minItems: 1

        internalGroupIdentifiersRanges:

          type: array

          items:

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

          minItems: 1

        suciInfos:

          type: array

          items:

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

          minItems: 1



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

    ProvMnS:
@@ -1816,22 +1875,8 @@ components: 
                      $ref: '#/components/schemas/CommModelList'

                    eCSAddrConfigInfo:

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

                    groupId:

                      type: string

                    supiRanges:

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

                    gpsiRanges:

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

                    externalGroupIdentifiersRanges:

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

                    routingIndicators:

                      type: array

                      items:

                        type: string

                    internalGroupIdentifiersRanges:

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

                    suciInfos:

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

                    udmInfo:

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

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

        - type: object

          properties:
@@ -1859,18 +1904,8 @@ components: 
                      type: string

                    managedNFProfile:

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

                    groupId:

                      type: string

                    supiRanges:

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

                    gpsiRanges:

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

                    externalGroupIdentifiersRanges:

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

                    supportedDataSets:

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

                    sharedDataIdRanges:

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

                    udrInfo:

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



    UdsfFunction-Single:

      allOf:

OpenAPI/TS29571_CommonData.yaml

+18 −1
Original line number Diff line number Diff line 
##### Special note: CT R16 local copy for SA5 OAM Forge branch only, it shall not be used otherwise. S5-222029 on 4.4.2022

##### Special note: CT R16 local copy for SA5 OAM Forge branch only, it shall not be used otherwise. S5-222029 on 4.4.2022. Updated to sync with 1.5.0 for SA5#147 (17.02.2023)

openapi: 3.0.0



info:
@@ -217,6 +217,23 @@ components: 
    TimeOfDay:

      type: string

      description: String with format partial-time or full-time as defined in clause 5.6 of IETF RFC 3339. Examples, 20:15:00, 20:15:00-08:00 (for 8 hours behind UTC).

    EmptyObject:

      description: Empty JSON object { }, it is defined with the keyword additionalProperties false

      type: object

      additionalProperties: false



    Fqdn:

      description: Fully Qualified Domain Name

      type: string

      pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$'

      minLength: 4

      maxLength: 253



    FqdnRm:

      description: Fully Qualified Domain Name, but it also allows the null value

      anyOf:

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

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

#

#   COMMON ENUMERATED DATA TYPES

#