Commit 233267dd authored by sunse's avatar sunse
Browse files

reference naming update

parent aeea11b7
Loading
Loading
Loading
Loading
+20 −20
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ components:
        filterValue:
          type: string
        threshold:
          $ref: 'genericNrm.yaml#/components/schemas/ThresholdInfo'
          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo'
        analyticsPeriod:
          type: array
          items:
            $ref: 'comDefs.yaml#/components/schemas/DateTime'
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        timeOut:
          $ref: 'comDefs.yaml#/components/schemas/DateTime'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

    ReportingMethod:
      type: string
@@ -59,14 +59,14 @@ components:
        - NOTIFICATION

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

    AnalyticsScope:
      oneOf:
        - type: object
          properties:
            managedEntitiesScope:
              $ref: 'comDefs.yaml#/components/schemas/DnList'
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - type: object
          properties:
            areaScope:
@@ -92,9 +92,9 @@ components:
      type: object
      properties:
        latitude:
          $ref: 'comDefs.yaml#/components/schemas/Latitude'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude'
        longitude:
          $ref: 'comDefs.yaml#/components/schemas/Longitude'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude'


#-------- Definition of abstract IOCs --------------------------------------------
@@ -105,12 +105,12 @@ components:

    SubNetwork-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO'
              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
        - type: object
          properties:
            SubNetwork:
@@ -125,12 +125,12 @@ components:

    ManagedElement-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-ncO'
              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
        - type: object
          properties:
            MDAFunction:
@@ -138,17 +138,17 @@ components:

    MDAFunction-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    supportedMDACapabilities:
                      $ref: '#/components/schemas/MDATypes'
        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            MDARequest:
@@ -156,7 +156,7 @@ components:

    MDARequest-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
@@ -172,12 +172,12 @@ components:
                    analyticsScope:
                      $ref: '#/components/schemas/AnalyticsScope'
                    startTime:
                      $ref: 'comDefs.yaml#/components/schemas/DateTime'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                    stopTime:
                      $ref: 'comDefs.yaml#/components/schemas/DateTime'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

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


#-------- Definition of JSON arrays for name-contained IOCs ----------------------
+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ components:
          items:
            $ref: '#/components/schemas/MDAOutputEntry'
        mDARequestRef:
          $ref: 'comDefs.yaml#/components/schemas/Dn'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    MDAOutputEntry:
      type: object
@@ -44,16 +44,16 @@ components:
      type: object
      properties:
        startTime:
          $ref: 'comDefs.yaml#/components/schemas/DateTime'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        endTime:
          $ref: 'comDefs.yaml#/components/schemas/DateTime'
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'


#-------- Definition of MDA Report --------------------------------------------

    MDAReport:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
+14 −14
Original line number Diff line number Diff line
@@ -100,12 +100,12 @@ components:

    SubNetwork-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-ncO'
              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'
        - type: object
          properties:
            SubNetwork:
@@ -117,12 +117,12 @@ components:

    ManagedElement-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-Attr'
        - $ref: 'genericNrm.yaml#/components/schemas/ManagedElement-ncO'
              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'
        - type: object
          properties:
            AIMLTrainingFunction:
@@ -130,17 +130,17 @@ components:

    AIMLTrainingFunction-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    aIMLEntityList:
                      $ref: '#/components/schemas/AIMLEntityList'
        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            AIMLTrainingRequest:
@@ -152,7 +152,7 @@ components:

    AIMLTrainingRequest-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
@@ -183,7 +183,7 @@ components:

    AIMLTrainingProcess-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
@@ -203,14 +203,14 @@ components:
                    suspendProcess:
                      type: boolean
                    trainingRequestRef:
                      $ref: 'comDefs.yaml#/components/schemas/DnList'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    trainingReportRef:
                      $ref: 'comDefs.yaml#/components/schemas/Dn'
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'


    AIMLTrainingReport-Single:
      allOf:
        - $ref: 'genericNrm.yaml#/components/schemas/Top'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes: