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

Merge branch 'Integration-rel16-SA5-136-for-merge' into 'Rel-16' 

Merge OpenAPI code agreed in SA#91 to Rel16 branch

See merge request sa5/MnS!94
parents 39da8da8 15250f9d

OpenAPI/.project

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>OpenAPI</name>

	<comment></comment>

	<projects>

	</projects>

	<buildSpec>

	</buildSpec>

	<natures>

	</natures>

</projectDescription>

OpenAPI/5gcNrm.yaml

+7 −7
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ components: 
        commModelType:

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

        targetNFServiceList:

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

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

        commModelConfiguration:

          type: string

    CommModelList:
@@ -542,7 +542,7 @@ components: 
                    snssaiList:

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

                    amfSet:

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

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

                    managedNFProfile:

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

                    commModelList:
@@ -633,9 +633,9 @@ components: 
                    commModelList:

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

                    configurable5QISetRef:

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

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

                    dynamic5QISetRef:

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

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



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

        - type: object
@@ -736,9 +736,9 @@ components: 
                    commModelList:

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

                    configurable5QISetRef:

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

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

                    dynamic5QISetRef:

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

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



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

        - type: object
@@ -1142,7 +1142,7 @@ components: 
                    remoteAddress:

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

                    epTransportRefs:

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

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

    EP_N4-Single:

      allOf:

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

OpenAPI/README.md

+0 −8
Original line number Diff line number Diff line
@@ -45,14 +45,6 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f 
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/PerfMnS.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/PerfMnS.yaml))



* Performance Measurement Job Control MnS (28.550)

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/PerMeasJobCtlMnS.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/PerMeasJobCtlMnS.yaml))



* Performance Threshold Monitoring MnS (TS 28.532)

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/PerThresMonMnS.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/PerThresMonMnS.yaml))



* Heartbeat Notifications(TS 28.532)

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/heartbeatNtf.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/heartbeatNtf.yaml))

OpenAPI/coslaNrm.yaml

+103 −82
Original line number Diff line number Diff line 
openapi: 3.0.3

openapi: 3.0.2



info:

  title: coslaNrm
@@ -9,7 +9,7 @@ info: 
    All rights reserved.



externalDocs:

  description: 3GPP TS 28.536 V16.4.0; 5G NRM, Slice NRM

  description: 3GPP TS 28.536 V16.4.0; Cosla NRM

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



paths: {}
@@ -21,111 +21,132 @@ components: 
#------------ Type definitions ---------------------------------------------------



    ControlLoopLifeCyclePhase:

      anyOf: 

        - type: string

      type: string

      enum:

        - PREPARATION

        - COMMISSIONING

        - OPERATION

        - DECOMMISSIONING

        - type: string



    TimeUnit:

      anyOf:

        - type: string

          enum:

            - SECOND

            - MINUTE

            - HOUR

            - DAY

        - type: string



    OperationalState:

      anyOf:

        - type: string

          enum: 

            - ENABLED

            - DISABLED

        - type: string



    AdministrativeState:

      anyOf:

        - type: string

          enum: 

            - LOCKED

            - SHUTTING_DOWN

            - UNLOCKED

        - type: string



    ObservationTime:

      type: integer



    ObservationTimePeriod:

      type: object

    AssuranceGoalStatusObserved:

      type: string

      enum:

        - FULFILLED

        - NOT_FULFILLED



    AssuranceControlLoopGoal:

      type: object

    AssuranceGoalStatusPredicted:

      type: string

      enum:

        - FULFILLED

        - NOT_FULFILLED



    AssuranceGoalStatus:

    AssuranceTarget:

      type: object

      properties:

        assuranceTargetName:

          type: string

        assuranceTargetValue:

          type: string

         

    AssuranceGoalStatusObserved:

      type: object

    AssuranceTargetList:

      type: array

      items:

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



    AssuranceGoalStatusPredicted:

      type: object



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



    AssuranceControlLoop-Single:

    SubNetwork-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              allOf:

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

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

        - type: object

          properties:

            AssuranceClosedControlLoop:

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

 

    ManagedElement-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              allOf:

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

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

        - type: object

          properties:

            AssuranceClosedControlLoop:

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



    AssuranceClosedControlLoop-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              type: object

              properties:

                    operationalState:

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

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

                    administrativeState:

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

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

                    controlLoopLifeCyclePhase:

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

            observationTimePeriod:

            AssuranceGoal:

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



    AssuranceGoal-Single:

      allOf:

                - $ref: '#/components/schemas/ObservationTimePeriod'

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

        - type: object

          properties:

                    observationTime:

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

                    timeUnit:

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

            AssuranceGoalStatus:

            attributes:

              allOf:

                - $ref: '#/components/schemas/AssuranceGoalStatus'

                - type: object

                  properties:

                    observationTime:

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

                    assuranceTargetList:

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

                    assuranceGoalStatusObserved:

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

                    assuranceGoalStatusPredicted:

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

            managedEntity-Multiple:

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

            assuranceControlLoopGoal:

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



    ManagedEntity-Single:

      oneOf:

        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSlice'

        - $ref: 'sliceNrm.yaml#/components/schemas/NetworkSliceSubnet'

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

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

                    serviceProfileId:

                      type: string

                    sliceProfileId:

                      type: string

                    networkSliceRef:

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

                    networkSliceSubnetRef:

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

                      

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

                                

    AssuranceControlLoop-Multiple:

    AssuranceClosedControlLoop-Multiple:

      type: array

      items:

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

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

               

    ManagedEntity-Multiple:

    AssuranceGoal-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/ManagedEntity-Single'      
        $ref: '#/components/schemas/AssuranceGoal-Single'   



#------------ Definitions in TS 28.536 for TS 28.623 ----------------------------- 



    resources-coslaNrm:

      oneOf:

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

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

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

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

OpenAPI/faultMnS.yaml

+2 −2
Original line number Diff line number Diff line
@@ -566,8 +566,8 @@ components: 
          items:

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

      required:

        - source

        - notificationId

        - sourceObjectInstance

        - notificationIds

    CorrelatedNotifications:

      type: array

      items: