Commit 82f67203 authored by ruiyue's avatar ruiyue
Browse files

Update 2 files 

- /OpenAPI/TS28623_GenericNrm.yaml
- /OpenAPI/TS28541_5GcNrm.yaml
parent b3914c2e

OpenAPI/TS28541_5GcNrm.yaml

+52 −1
Original line number Diff line number Diff line
@@ -2926,6 +2926,23 @@ components: 
      properties:

        nfType:

          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType'

    SAP:

      type: object

      properties:

        host:

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

        port:

          type: integer

    NFServiceType:

      type: string

      enum:

        - NAMF_COMMUNICATION

        - NAMF_EVENTEXPOSURE

        - NAMF_MT

        - NAMF_LOCATION

        - NSMF_PDUSESSION

        - NSMF_EVENTEXPOSURE

        - OTHERS



#-------- Definition of types for name-containments ------

    SubNetwork-ncO-5GcNrm:
@@ -5364,6 +5381,37 @@ components: 
          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedNFService-Multiple'

#-------- Definition of abstract IOCs --------------------------------------------





#-------- Definition of 5GC common IOCs --------------------------------------------

    ManagedNFService-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              type: object

              properties:

                userLabel:

                  type: string

                nFServiceType:

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

                sAP:

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

                operations:

                  type: array

                  items:

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

                administrativeState:

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

                operationalState:

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

                usageState:

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

                registrationState:

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



#-------- Definition of 5GC common IOCs --------------------------------------------



#-------- Definition of JSON arrays for name-contained IOCs ----------------------

    AmfFunction-Multiple:

      type: array
@@ -5802,7 +5850,10 @@ components: 
      type: array

      items:

        $ref: '#/components/schemas/MnpfFunction-Single'



    ManagedNFService-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/ManagedNFService-Single'

#------------ Definitions in TS 28.541 for TS 28.532 -----------------------------



    resources-5gcNrm:

OpenAPI/TS28623_GenericNrm.yaml

+2 −47
Original line number Diff line number Diff line
@@ -131,23 +131,7 @@ components: 
      enum:

        - REQUEST_RESPONSE

        - SUBSCRIBE_NOTIFY

    SAP:

      type: object

      properties:

        host:

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

        port:

          type: integer

    NFServiceType:

      type: string

      enum:

        - NAMF_COMMUNICATION

        - NAMF_EVENTEXPOSURE

        - NAMF_MT

        - NAMF_LOCATION

        - NSMF_PDUSESSION

        - NSMF_EVENTEXPOSURE

        - OTHERS



    TransportProtocol:

      anyOf:

        - type: string
@@ -563,32 +547,7 @@ components: 
              nullable: true

        VsDataContainer:

          $ref: '#/components/schemas/VsDataContainer-Multiple'

    ManagedNFService-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              type: object

              properties:

                userLabel:

                  type: string

                nFServiceType:

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

                sAP:

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

                operations:

                  type: array

                  items:

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

                administrativeState:

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

                operationalState:

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

                usageState:

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

                registrationState:

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



    ManagementNode-Single:

      allOf:

        - $ref: '#/components/schemas/Top'
@@ -716,10 +675,6 @@ components: 
      type: array

      items:

        $ref: '#/components/schemas/VsDataContainer-Single'

    ManagedNFService-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/ManagedNFService-Single'

    ManagementNode-Multiple:

      type: array

      items: