Commit d068f567 authored by mouqueta's avatar mouqueta
Browse files

Merge branch 'Integration_Rel19_SA5_156_YAML' into 'Rel-19'

Integration rel19 sa5 156 yaml

See merge request !1348
parents 5ad45bb4 b273caeb
Loading
Loading
Loading
Loading
Loading
+8 −5
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: MDA NRM
  version: 18.4.0
  version: 18.5.0
  description: >-
    OAS 3.0.1 specification of the MDA NRM
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -107,6 +107,7 @@ components:
              format: float
              minimum: 0


#-------- Definition of types for name-containments ------
    SubNetwork-ncO-MdaNrm:
      type: object
@@ -138,15 +139,17 @@ components:
                  properties:
                    supportedMDACapabilities:
                      $ref: '#/components/schemas/MDATypes'
                    mlModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    aIMLInferenceFunctionRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'  
                    mLModelRefList:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    aIMLInferenceFunctionRefList:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'  
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            MDARequest:
              $ref: '#/components/schemas/MDARequest-Multiple'
            MDAReport:
              $ref: '#/components/schemas/MDAReport-Multiple'

    MDARequest-Single:
      allOf:
+18 −13
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: AI/ML NRM
  version: 18.4.0
  version: 18.5.0
  description: >-
    OAS 3.0.1 specification of the AI/ML NRM
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -348,9 +348,6 @@ components:
            attributes:
              allOf:
                - type: object
                  oneOf:
                    - required: [ requestStatus, mLModelToTestRef ]
                    - required: [ requestStatus, mLModelCoordinationGroupToTestRef ]
                  properties:
                    requestStatus:
                      $ref: '#/components/schemas/RequestStatus'
@@ -358,9 +355,9 @@ components:
                      type: boolean
                    suspendRequest:
                      type: boolean                  
                    mLModelToTestRef:
                    mLModelRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    mLModelCoordinationGroupToTestRef:
                    mLModelCoordinationGroupRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    MLTestingReport-Single:
@@ -467,6 +464,10 @@ components:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                sourceTrainedMLModelRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                aIMLInferenceReportRefList:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                usedByFunctionRefList:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    MLModelRepository-Single:
      allOf:
@@ -542,7 +543,7 @@ components:
                  type: boolean 
                mLUpdateProcessRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                mLModelRef:
                mLModelRefList:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    MLUpdateProcess-Single:
@@ -555,9 +556,13 @@ components:
              properties:
                progressStatus:
                  $ref: '#/components/schemas/ProcessMonitor'
                mLModelRef:
                cancelProcess:
                  type: boolean
                suspendProcess:
                  type: boolean
                mLModelRefList:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                mLUpdateRequestRef:
                mLUpdateRequestRefList:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                mLUpdateReportRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -572,7 +577,7 @@ components:
              properties:
                updatedMLCapability:
                  $ref: '#/components/schemas/AvailMLCapabilityReport'
                mLModelRef:
                mLModelRefList:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                mLUpdateProcessRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -596,7 +601,7 @@ components:
                      $ref: '#/components/schemas/AIMLManagementPolicy'
                    usedByFunctionRefList:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    mLModelRef:
                    mLModelRefList:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
@@ -626,7 +631,7 @@ components:
                      items:
                        $ref: '#/components/schemas/InferenceOutput'
                      minItems: 1
                    mLModelRef:
                    mLModelRefList:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    AIMLInferenceEmulationFunction-Single:
@@ -639,7 +644,7 @@ components:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    AIMLInferenceEmulationReport:
                    AIMLInferenceReport:
                      $ref: '#/components/schemas/AIMLInferenceReport-Multiple'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

+2 −5
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: Intent NRM
  version: 18.4.0
  version: 18.5.0
  description: >-
    OAS 3.0.1 definition of the Intent NRM
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -64,10 +64,7 @@ components:
            maximum: 100
            description: It expresses the priority of the stated intent within a MnS consumer.   
          intentPreemptionCapability:
            type: string
            enum:
              - TRUE
              - FALSE
            type: boolean
          observationPeriod:
            type: integer
            description: >- 
+7 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ openapi: 3.0.1

info:
  title: coslaNrm
  version: 18.1.0
  version: 18.2.0
  description: >-
    OAS 3.0.1 specification of the Cosla NRM
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -156,12 +156,14 @@ components:
                      $ref: '#/components/schemas/ControlLoopLifeCyclePhase'
                    aCCLDisallowedList:
                      $ref: '#/components/schemas/ACCLDisallowedAttributes'
            AssuranceGoal:
              $ref: '#/components/schemas/AssuranceGoal-Multiple'
                    networkSliceRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    networkSliceSubnetRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
            AssuranceReport:
              $ref: '#/components/schemas/AssuranceReport-Single'
            AssuranceGoal:
              $ref: '#/components/schemas/AssuranceGoal-Multiple'

    AssuranceGoal-Single:
      allOf:
+49 −8
Original line number Diff line number Diff line
openapi: 3.0.1
info:
  title: 3GPP Edge NRM
  version: 18.7.0
  version: 19.0.0
  description: >-
    OAS 3.0.1 specification of the Edge NRM
    © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -88,6 +88,17 @@ components:
          type: string
        swImageRef:
          type: string
    RegistrationInfo:
      type: object
      properties:
        registrationExpiry:
          type: string
          readOnly: true
        registrationID:
          type: string
          readOnly: true
        secCredential:
          type: string
    Duration:
      type: object
      properties:
@@ -158,8 +169,6 @@ components:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
        servedEESList:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'


#-------- Definition of types for name-containments ------
    SubNetwork-ncO-EdgeNrm:
      type: object
@@ -168,6 +177,8 @@ components:
          $ref: '#/components/schemas/ECSFunction-Multiple'
        EdgeDataNetwork:
          $ref: '#/components/schemas/EdgeDataNetwork-Multiple'
        EASBundle:
          $ref: '#/components/schemas/EASBundle-Multiple'

#-------- Definition of concrete IOCs --------------------------------------------

@@ -205,6 +216,8 @@ components:
                      type: array
                      items:
                        type: string
                    registrationInfo:
                      $ref: '#/components/schemas/RegistrationInfo'  
                    eASRequirementsRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                    eASAddress:
@@ -271,6 +284,8 @@ components:
                      type: boolean
                    eASFunctionRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' 
                    registrationInfo:
                      $ref: '#/components/schemas/RegistrationInfo'  
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

    ECSFunction-Single:
@@ -382,7 +397,30 @@ components:
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
            edgeDataNetworkRef:
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    EASBundle-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            bundleIdentifier:
              type: string
            bundledEASIdentifier:
              type: string
            bundleType:
              type: string
            mainEASIdentifier:
              type: string
            coordinatedEASDiscovery:
              type: boolean
            coordinatedACR:
              type: boolean
            eDNAffinity:
              type: string
              description: any of enumrated value
              enum:
                - STRONG
                - WEAK
                - PREFERRED

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

@@ -418,8 +456,10 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single'

        
    EASBundle-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EASBundle-Single'
#--------------------------------- Definition ------------------------------------                          

    resources-edgeNrm:
@@ -434,3 +474,4 @@ components:
        - $ref: '#/components/schemas/OperatorEdgeFederation-Single'
        - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single'
        - $ref: '#/components/schemas/EASResourceReservationJob-Single'
        - $ref: '#/components/schemas/EASBundle-Single'
Loading