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

Merge branch 'Integration_Rel17_SA5_147_YAML' into 'Rel-17'

SA5#147 OpenAPI SS changes for Rel-17

See merge request !578
parents 27dc43e5 5e93b00f
Loading
Loading
Loading
Loading
Loading
+13 −6
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: AI/ML NRM
  version: 17.2.0
  version: 17.3.0
  description: >-
    OAS 3.0.1 specification of the AI/ML NRM
    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -169,19 +169,19 @@ components:
                  properties:
                    mLEntityId:
                      type: string
                    candidateTraingDataSource:
                    candidateTrainingDataSource:
                      type: array
                      items:
                        type: string
                    traingDataQualityScore:
                    trainingDataQualityScore:
                      type: number
                      format: float
                    trainingRequestSource:
                      type: string
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    requestStatus:
                      $ref: '#/components/schemas/RequestStatus'
                    expectedRuntimeContext:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                      $ref: '#/components/schemas/MLContext'
                    performanceRequirements:
                      $ref: '#/components/schemas/PerformanceRequirements'
                    cancelRequest:
@@ -241,7 +241,14 @@ components:
                        $ref: '#/components/schemas/ModelPerformance'
                    areNewTrainingDataUsed:
                      type: boolean

                    trainingRequestRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    trainingProcessRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    trainingReportRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    lastTrainingRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

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

+9 −5
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Intent NRM
  version: 17.1.0
  version: 17.3.0
  description: >-
    OAS 3.0.1 definition of the Intent NRM
    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -219,6 +219,10 @@ components:
        - IS_GREATER_THAN
        - IS_WITHIN_RANGE
        - IS_OUTSIDE_RANGE
        - IS_ONE_OF
        - IS_NOT_ONE_OF
        - IS_EQUAL_TO_OR_LESS_THAN
        - IS_EQUAL_TO_OR_GREATER_THAN
    FulfilStatus:
      type: string
      enum:
@@ -539,7 +543,7 @@ components:
        This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget     
      type: object
      properties:
        targetAttribute:
        targetName:
          type: string
          enum:
            - maxNumberofUEs
@@ -554,7 +558,7 @@ components:
        This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget       
      type: object
      properties:
        targetAttribute:
        targetName:
          type: string
          enum:
            - activityFactor
@@ -569,7 +573,7 @@ components:
        This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget      
      type: object
      properties:
        targetAttribute:
        targetName:
          type: string
          enum:
            - uESpeed
@@ -647,7 +651,7 @@ components:
        contextValueRange:
          type: array
          items:
            $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnId"
            $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId"
    NRFqBandContext:
      description: >-
        This data type is the "ObjectContext" data type with specialisations for NRFqBandContext       
+2 −2
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: 3GPP Edge NRM
  version: 17.1.0
  version: 17.2.0
  description: >-
    OAS 3.0.1 specification of the Edge NRM
    © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -31,7 +31,7 @@ components:
        trackingAreaIdList:
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList'
        servingPLMN:
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
    GeoLoc:
      type: object
      properties:
+28 −22
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: 3GPP 5GC NRM
  version: 17.7.0
  version: 17.10.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:
@@ -209,7 +209,7 @@ components:
        allowedPLMNs:
          type: array
          items:
            $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        allowedSNPNs:
          type: array
          items:
@@ -248,6 +248,22 @@ components:
          type: array
          items:
            type: string
        recoveryTime:
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        nfServicePersistence:
           type: boolean
        nfProfileChangesSupportInd:
           type: boolean
        defaultNotificationSubscriptions:
          type: array
          items:
            $ref: '#/components/schemas/DefaultNotificationSubscription'
          minItems: 1
        serviceSetRecoveryTimeList:
          type: array
          items:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
          minItems: 1
        vendorId:
          type: string
    SEPPType:
@@ -539,7 +555,7 @@ components:
      type: object
      properties:
        plmnId:
          $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        nRTACRangelist:
          type: array
          items:
@@ -549,7 +565,7 @@ components:
      type: object
      properties:
          pLMNId: 
            $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
          aMFIdentifier:
            type: integer   
       
@@ -583,16 +599,6 @@ components:
          items:
            $ref: '#/components/schemas/DnnSmfInfoItem'

    IpAddr:
      type: object
      properties:
        ipv4Addr:
          type: string
        ipv6Addr:
          type: string
        ipv6Prefix:
          type: string

    5GCNfConnEcmInfoList:
      type: array
      items:
@@ -890,7 +896,7 @@ components:
                    pgwAddrList:
                      type: array
                      items:
                        $ref: '#/components/schemas/IpAddr'
                        $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr'
                    accessType:
                      $ref: 'TS29571_CommonData.yaml#/components/schemas/AccessType'
                    priority:
@@ -1265,7 +1271,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:
@@ -1384,7 +1390,7 @@ components:
                - type: object
                  properties:
                    plmnId:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                    sBIFqdn:
                      type: string
                    managedNFProfile:
@@ -1414,7 +1420,7 @@ components:
                - type: object
                  properties:
                    plmnId:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                    sBIFqdn:
                      type: string
                    managedNFProfile:
@@ -1511,7 +1517,7 @@ components:
                - type: object
                  properties:
                    plmnId:
                      $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnId'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                    sEPPId:
                      type: integer
                    fqdn:
@@ -1844,7 +1850,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:
+9 −19
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: NR NRM
  version: 17.8.0
  version: 17.10.0
  description: >-
    OAS 3.0.1 specification of the NR NRM
    © 2022, 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:
@@ -77,7 +67,7 @@ components:
      type: object
      properties:
        plmnId:
          $ref: '#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        cagidList:
          $ref: '#/components/schemas/cagId'
        nidList:
@@ -117,7 +107,7 @@ components:
      type: object
      properties:
        plmnId:
          $ref: '#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        nrTac:
          $ref: '#/components/schemas/NrTac'
    TaiList:
@@ -287,7 +277,7 @@ components:
      type: object
      properties:
        plmnId:
          $ref: '#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
        snssai:
          $ref: '#/components/schemas/Snssai'
    RrmPolicyMemberList:
@@ -587,7 +577,7 @@ components:
        TceID:
          type: integer
        PlmnTarget:
          $ref: '#/components/schemas/PlmnId'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
    TceMappingInfoList:
      type: array
      items:
@@ -822,7 +812,7 @@ components:
                    gnbCuName:
                      $ref: '#/components/schemas/GnbName'
                    plmnId:
                      $ref: '#/components/schemas/PlmnId'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'
                    x2BlockList:
                      $ref: '#/components/schemas/GGnbIdList'
                    xnBlockList:
@@ -1588,7 +1578,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:
Loading