Commit 82ad6ca8 authored by Mirko Cano Soveri's avatar Mirko Cano Soveri
Browse files

Merge branch 'Integration_Rel16_SA5_147_YAML' into 'Rel-16'

SA5#147 OpenAPI SS changes for Rel-16

See merge request !577
parents 4589eaa6 d6c67f22
Loading
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: 3GPP 5GC NRM
  version: 16.11.0
  version: 16.15.0
  description: >-
    OAS 3.0.1 specification of the 5GC NRM
    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -67,7 +67,7 @@ components:
        nFStatus:
          $ref: '#/components/schemas/NFStatus'
        plmn:
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        sNssais:
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai'
        fqdn:
@@ -101,7 +101,7 @@ components:
        apiPrfix:
          type: string
        allowedPlmns:
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        allowedNfTypes:
          type: array
          items:
@@ -1006,7 +1006,7 @@ components:
                - type: object
                  properties:
                    plmnId:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                    sEPPType:
                      $ref: '#/components/schemas/SEPPType'
                    sEPPId:
@@ -1124,7 +1124,7 @@ components:
                - type: object
                  properties:
                    plmnId:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                    sEPPId:
                      type: integer
                    fqdn:
@@ -1457,7 +1457,7 @@ components:
                - type: object
                  properties:
                    remotePlmnId:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                    remoteSeppAddress:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'
                    remoteSeppId:
+8 −18
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: NR NRM
  version: 16.11.0
  version: 16.15.0
  description: >-
    OAS 3.0.1 specification of the NR NRM
    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -44,25 +44,15 @@ components:
        sd:
          type: string

    Mnc:
      type: string
      pattern: '[0-9]{3}|[0-9]{2}'
    PlmnId:
      type: object
      properties:
        mcc:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc'
        mnc:
          $ref: '#/components/schemas/Mnc'
    PlmnIdList:
      type: array
      items:
        $ref: '#/components/schemas/PlmnId'
        $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
    PlmnInfo:
      type: object
      properties:
        plmnId:
          $ref: '#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        snssai:
          $ref: '#/components/schemas/Snssai'
    PlmnInfoList:
@@ -96,7 +86,7 @@ components:
      type: object
      properties:
        plmnId:
          $ref: '#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        nrTac:
          $ref: '#/components/schemas/NrTac'

@@ -253,7 +243,7 @@ components:
      type: object
      properties:
        plmnId:
          $ref: '#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        snssai:
          $ref: '#/components/schemas/Snssai'
    RrmPolicyMemberList:
@@ -553,7 +543,7 @@ components:
        TceID:
          type: integer
        PlmnTarget:
          $ref: '#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
    TceMappingInfoList:
      type: array
      items:
@@ -751,7 +741,7 @@ components:
                    gnbCuName:
                      $ref: '#/components/schemas/GnbName'
                    plmnId:
                      $ref: '#/components/schemas/PlmnId'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                    x2BlackList:
                      $ref: '#/components/schemas/GGnbIdList'
                    xnBlackList:
@@ -1471,7 +1461,7 @@ components:
                    gnbIdLength:
                      $ref: '#/components/schemas/GnbIdLength'
                    plmnId:
                      $ref: '#/components/schemas/PlmnId'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ components:
      oneOf:
        - $ref: '#/components/schemas/Ipv4Addr'
        - $ref: '#/components/schemas/Ipv6Addr'
        - $ref: '#/components/schemas/Ipv6Prefix'        
    HostAddr:
      #  This definition will be deprecated, when all occurances of HostAddr
      #  are replaced by Host.
+2 −4
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Generic NRM
  version: 16.11.0
  version: 16.14.0
  description: >-
    OAS 3.0.1 definition of the Generic NRM
    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -148,7 +148,7 @@ components:
             - FILE_BASED_LOC_SET_BY_PRODUCER
             - FILE_BASED_LOC_SET_BY_CONSUMER
             - STREAM_BASED 
        monitorGranularityPeriods:
        reportingPeriods:
          type: array
          items:
            type: integer
@@ -1478,8 +1478,6 @@ components:
          $ref: '#/components/schemas/traceDepth-Type'
        traceReference:
          $ref: '#/components/schemas/traceReference-Type'
        traceRecordingSessionReference:
          type: string
        traceReportingFormat:
          $ref: '#/components/schemas/traceReportingFormat-Type'
        traceTarget: