Commit 22f013c7 authored by ruiyue's avatar ruiyue
Browse files

Code Moderator address the 2 implemenation conflicts with MR !979 

Merge branch 'Integration_Rel18_SA5_153_YAML' into 'Rel_18_240831_24105_stage3'

# Conflicts:
#   OpenAPI/TS28105_AiMlNrm.yaml
parents 2700b952 4d1f5f70

OpenAPI/TS28104_MdaNrm.yaml

+30 −59
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: MDA NRM

  version: 18.0.0

  version: 18.2.0

  description: >-

    OAS 3.0.1 specification of the MDA NRM

    © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).
@@ -25,6 +25,18 @@ components: 
      items:

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



    AnalyticsScopeType:

      oneOf:

        - type: object

          properties:

            managedEntitiesScope:

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

        - type: object

          properties:

            areaScope:

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

 



    MDAOutputPerMDAType:

      type: object

      properties:
@@ -59,17 +71,6 @@ components: 
    ReportingTarget:

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

      

    AnalyticsScopeType:

      oneOf:

        - type: object

          properties:

            managedEntitiesScope:

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

        - type: object

          properties:

            areaScope:

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



    AnalyticsSchedule:

      oneOf:

        - type: object
@@ -106,45 +107,25 @@ components: 
              format: float

              minimum: 0



#-------- Definition of abstract IOCs --------------------------------------------







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



    SubNetwork-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'

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

        - type: object

#-------- Definition of types for name-containments ------

    SubNetwork-ncO-MdaNrm:

      type: object

      properties:

            SubNetwork:

              $ref: '#/components/schemas/SubNetwork-Multiple'

            ManagedElement:

              $ref: '#/components/schemas/ManagedElement-Multiple'

        MDAFunction:

          $ref: '#/components/schemas/MDAFunction-Multiple'

        MDAReport:

          $ref: '#/components/schemas/MDAReport-Multiple'





    ManagedElement-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'

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

        - type: object

    ManagedElement-ncO-MdaNrm:

      type: object

      properties:

        MDAFunction:

          $ref: '#/components/schemas/MDAFunction-Multiple'

#-------- Definition of abstract IOCs --------------------------------------------







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

    MDAFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -184,21 +165,14 @@ components: 
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

                    stopTime:

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

                    recommendationFilter:

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



    MDAReport-Single:

      $ref: 'TS28104_MdaReport.yaml#/components/schemas/MDAReport'





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



    SubNetwork-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/SubNetwork-Single'

    ManagedElement-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/ManagedElement-Single'

    MDAFunction-Multiple:

      type: array

      items:
@@ -217,9 +191,6 @@ components: 


    resources-mdaNrm:

      oneOf:

        - $ref: '#/components/schemas/SubNetwork-Single'

        - $ref: '#/components/schemas/ManagedElement-Single'



        - $ref: '#/components/schemas/MDAFunction-Single'

        - $ref: '#/components/schemas/MDARequest-Single'

        - $ref: '#/components/schemas/MDAReport-Single'

OpenAPI/TS28104_MdaReport.yaml

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ components: 
          type: array

          items:

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

        mDARequestRef:

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

        analyticsWindow:

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

        confidenceDegree:
@@ -64,3 +62,5 @@ components: 
                      type: string

                    mDAOutputs:

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

                    mDARequestRef:

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

OpenAPI/TS28105_AiMlNrm.yaml

+29 −61
Original line number Diff line number Diff line
@@ -148,26 +148,10 @@ components: 
          description: A map (list of key-value pairs) for Inference result name and it's value

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

          

#-------- Definition of abstract IOCs --------------------------------------------







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



    SubNetwork-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'

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

        - type: object

#-------- Definition of types for name-containments ------

    SubNetwork-ncO-AiMlNrm:

      type: object

      properties:

            SubNetwork:

              $ref: '#/components/schemas/SubNetwork-Multiple'

            ManagedElement:

              $ref: '#/components/schemas/ManagedElement-Multiple'

        MLTrainingFunction:

          $ref: '#/components/schemas/MLTrainingFunction-Multiple'

        MLTestingFunction:
@@ -179,15 +163,8 @@ components: 
        AIMLInferenceFunction:

          $ref: '#/components/schemas/AIMLInferenceFunction-Multiple'     



    ManagedElement-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'

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

        - type: object

    ManagedElement-ncO-AiMlNrm:

      type: object

      properties:

        MLTrainingFunction:

          $ref: '#/components/schemas/MLTrainingFunction-Multiple'
@@ -200,6 +177,8 @@ components: 
        AIMLInferenceFunction:

          $ref: '#/components/schemas/AIMLInferenceFunction-Multiple'

          

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



    MLTrainingFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -660,14 +639,6 @@ components: 


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



    SubNetwork-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/SubNetwork-Single'

    ManagedElement-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/ManagedElement-Single'

    MLTrainingFunction-Multiple:

      type: array

      items:
@@ -752,9 +723,6 @@ components: 


    resources-AiMlNrm:

      oneOf:

        - $ref: '#/components/schemas/SubNetwork-Single'

        - $ref: '#/components/schemas/ManagedElement-Single'



        - $ref: '#/components/schemas/MLTrainingFunction-Single'

        - $ref: '#/components/schemas/MLTrainingRequest-Single'

        - $ref: '#/components/schemas/MLTrainingProcess-Single'

OpenAPI/TS28111_FaultNotifications.yaml

0 → 100644
+57 −0
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: Fault Management Notifications

  version: 18.1.0

  description: >-

    OAS 3.0.1 definition of the Fault Supervision MnS

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

    All rights reserved.

externalDocs:

  description: 3GPP TS 28.111; Fault Management

  url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.111/

servers:

  - url: '{notificationRecipientAddress}'

    variables:

      notificationRecipientAddress:

        description: Address on the MnS consumer side defined by NtfSubscriptionControl.notificationRecipientAddress. See 3GPP TS 28.622 clause 4.3.22

        default: http://exampleConsumer.com/notificationReceiver

      MnSversion:

        description: Version number of the OpenAPI definition

        default: XXX

paths:

  /:

    post:

      summary: Receive one of a set of alarm related notifications

      description: >-

        The MnS producer sends an alarm to the consumer. 

        This interface shall be implemented by the notification-receiver and 

        used by the notification-sender.

      requestBody:

        required: true

        content:

          application/json:

            schema:

              oneOf:

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyNewAlarm'

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyNewSecAlarm'

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyClearedAlarm'

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyChangedAlarm'

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyChangedAlarmGeneral'

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyChangedSecAlarmGeneral'

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyCorrelatedNotificationChanged'                      

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyAckStateChanged'

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyComments'

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyPotentialFaultyAlarmList'

                - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/NotifyAlarmListRebuilt'

      responses:

        '204':

          description: >-

            Success case ("204 No Content").

            The notification is successfully delivered. The response message

            body is absent.

        default:

          description: Error case.

          content:

            application/json:

              schema:

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

OpenAPI/TS28111_FaultNrm.yaml

0 → 100644
+551 −0

File added.

Preview size limit exceeded, changes collapsed.