Commit 1b1db222 authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'Manual_Rebase_for_MR1012_TS28.541_CR1148' into 'Integration_Rel18_SA5_153_YAML' 

manual_Rebase for MR 1012 TS 28.541 CR1148

See merge request !1052
parents f53746d0 a7ed2deb

OpenAPI/TS28541_5GcNrm.yaml

+57 −1
Original line number Diff line number Diff line
@@ -2225,6 +2225,60 @@ components: 
          additionalProperties:

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

          minProperties: 1

    SatelliteBackhaulInfo:

      description: defines the list of satellite backhaul information

      type: object

      properties:

        globalRanNodeID:

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

        SatelliteBackhaulCategory:

          anyOf:

          - type: string

            enum:

              - GEO

              - MEO

              - LEO

              - OTHER_SAT

              - DYNAMIC_GEO

              - DYNAMIC_MEO

              - DYNAMIC_LEO

              - DYNAMIC_OTHER_SAT

              - NON_SATELLITE

          - type: string

        geoSatelliteId:

          type: string

          pattern: '^[0-9]{5}$'

    GlobalRanNodeID:

      description:  globally identification of an NG-RAN node

      type: object

      oneOf:

        - required: [ pLmnId, n3IwfId]

        - required: [ plmnId, gNbId]

        - required: [ pLmnId, ngeNbId]

        - required: [ plmnId, wagfId]

        - required: [ pLmnId, tngfId]

        - required: [ plmnId, twifId]

      properties:

        pLmnId:

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

        n3IwfId:

          type: string

          pattern: '^[A-Fa-f0-9]+$'

        gNbId:

          type: integer

          minimum: 0

          maximum: 4294967295

        ngeNbId:

          type: string

          pattern: '^(MacroNGeNB-[A-Fa-f0-9]{5}|LMacroNGeNB-[A-Fa-f0-9]{6}|SMacroNGeNB-[A-Fa-f0-9]{5})$'

        wagfId:

          type: string

          pattern: '^[A-Fa-f0-9]+$'

        tngfId:

          type: string

          pattern: '^[A-Fa-f0-9]+$'

        twifId:

          type: string          

    NTNPLMNRestrictionsInfo:

      description: restrictions per PLMN that relates to non-terrestrial network access

      type: object
@@ -2980,6 +3034,8 @@ components: 
                      $ref: '#/components/schemas/AmfInfo'

                    sliceExpiryInfo:

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

                    SatelliteBackhaulInfoList:

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

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

        - type: object

          properties: