Commit b64efee8 authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel16_SA5_140_YAML' into 'Rel-16' 

merge 139e and 140e Rel16 contents from integration branch to Rel16 release branch for yaml

See merge request sa5/MnS!242
parents 162076fe 18c95176

OpenAPI/5gcNrm.yaml

+7 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ components: 
                      $ref: '#/components/schemas/WeightFactor'

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

                    amfSet:

                    amfSetRef:

                      $ref: 'comDefs.yaml#/components/schemas/Dn'

                    managedNFProfile:

                      $ref: '#/components/schemas/ManagedNFProfile'
@@ -592,6 +592,10 @@ components: 
                      $ref: '#/components/schemas/AmfSetId'

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

                    aMFRegionRef:

                      $ref: 'comDefs.yaml#/components/schemas/Dn'

                    aMFSetMemberList:

                      $ref: 'comDefs.yaml#/components/schemas/DnList'

    AmfRegion-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -610,6 +614,8 @@ components: 
                      $ref: '#/components/schemas/AmfRegionId'

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

                    aMFSetListRef:

                      $ref: 'comDefs.yaml#/components/schemas/DnList'

    SmfFunction-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'

OpenAPI/faultMnS.yaml

+3 −3
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: Fault Supervision MnS

  version: 16.6.0

  version: 16.10.0

  description: >-

    OAS 3.0.1 definition of the Fault Supervision MnS

    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    All rights reserved.

externalDocs:

  description: 3GPP TS 28.532; Generic management services
@@ -660,7 +660,7 @@ components: 
        - notifyCorrelatedNotificationChanged

        - notifyComments

        - notifyClearedAlarm

        - notifyAlarmListRebuiltAlarm

        - notifyAlarmListRebuilt

        - notifyPotentialFaultyAlarmList

    AlarmListAlignmentRequirement:

      type: string

OpenAPI/fileDataReportingMnS.yaml

+2 −2
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: File Data Reporting MnS

  version: 16.8.0

  version: 16.10.0

  description: >-

    OAS 3.0.1 definition of the File Data Reporting MnS

    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -13,7 +13,7 @@ servers: 
  - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}'

    variables:

      MnSRoot:

        description: See clause 4.4.2 of TS 32.158

        description: See clause 4.4.3 of TS 32.158

        default: http://example.com/3GPPManagement

      MnSVersion:

        description: Version number of the OpenAPI definition

OpenAPI/genericNrm.yaml

+7 −1
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: Generic NRM

  version: 16.9.0

  version: 16.10.0

  description: >-

    OAS 3.0.1 definition of the Generic NRM

    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -409,6 +409,9 @@ components: 
              - S6d

              - S6a

              - Sh

              - N70

              - N71

              - NU1

        EIRInterfaces:

          type: array

          items:
@@ -551,6 +554,7 @@ components: 
              - N10

              - N13

              - N21

              - NU1

        UPFInterfaces:

          type: array

          items:
@@ -615,6 +619,8 @@ components: 
          - UPF

          - AUSF

          - SMSF

          - HSS

          - UDM



    tjPLMNTarget-Type:

      type: object

OpenAPI/nrNrm.yaml

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ components: 
    PlmnInfo:

      type: object

      properties:

        plmnId":

        plmnId:

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

        snssai:

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