Commit cd558f07 authored by moscatelli's avatar moscatelli
Browse files

SOL002 overall data types consolidation

parent 988ba144
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ paths:
            Configuration information about a VNF instance was read successfully.
            The response body shall contain a representation of the configuration resource.
          schema:
            $ref: 'definitions/VnfConfiguration_def.yaml#/definitions/VnfConfiguration'
            $ref: 'definitions/SOL002VNFConfiguration_def.yaml#/definitions/VnfConfiguration'
          headers:
            Content-Type:
              description: The MIME type of the body of the response.
+48 −54
Original line number Diff line number Diff line
definitions:

  VnfConfiguration:
    description: >
      This type represents configuration parameters of a VNF instance and its VNFC instances.
    type: object
    required:
      - vnfConfigurationData
    properties:
      vnfConfigurationData:
        description: >
          Configuration parameters of the VNF instance.
        $ref: '#/definitions/VnfConfigurationData'                  
      vnfcConfigurationData:
        description: >
          Configuration parameters of the VNFC instances.
        type: array
        items:
          $ref: '#/definitions/VnfcConfigurationData'                  

# Copyright (c) ETSI 2017.
# https://forge.etsi.org/etsi-forge-copyright-notice.txt

definitions:
  VnfConfigModifications:
    description: >
      This type represents request parameters for the "Set Configuration" operation.
@@ -67,6 +50,23 @@ definitions:
        items:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"

  VnfConfiguration:
    description: >
      This type represents configuration parameters of a VNF instance and its VNFC instances.
    type: object
    required:
      - vnfConfigurationData
    properties:
      vnfConfigurationData:
        description: >
          Configuration parameters of the VNF instance.
        $ref: '#/definitions/VnfConfigurationData'
      vnfcConfigurationData:
        description: >
          Configuration parameters of the VNFC instances.
        type: array
        items:
          $ref: '#/definitions/VnfcConfigurationData'

  VnfConfigurationData:
    description: >
@@ -88,7 +88,6 @@ definitions:
          VNFD as "VnfConfigurableProperties".
        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs'


  VnfcConfigurationData:
    description: >
      This type represents configuration parameters of a VNFC instance.
@@ -115,7 +114,6 @@ definitions:
          VNFD as "VnfcConfigurableProperties".
        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs'


  CpConfiguration:
    description: >
      This type represents configuration parameters of a CP instance.
@@ -169,7 +167,3 @@ definitions:
        description: >
          The port assigned to the CP instance (e.g. IP port number, Ethernet port number, etc.).
        type: integer
 No newline at end of file



+0 −21
Original line number Diff line number Diff line
responses:
  409:
    description: >
      Conflict

      Another request is in progress that prohibits the fulfilment of
      the current request, or the current resource state is inconsistent
      with the request.
    headers:
      Content-Type:
        description: The MIME type of the body of the response.
        type: string
        maximum: 1
        minimum: 1
      Version:
        description: The used API version.
        type: string
        maximum: 1
        minimum: 1
    schema:
      $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
+18 −18
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ paths:
              maximum: 1
              minimum: 0
          schema:
            $ref: "./definitions/VNFFaultManagement_def.yaml#/definitions/Alarm"
            $ref: "./definitions/SOL002VNFFaultManagement_def.yaml#/definitions/Alarm"
        400:
          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
        401:
@@ -258,7 +258,7 @@ paths:
              maximum: 1
              minimum: 0
          schema:
            $ref: "./definitions/VNFFaultManagement_def.yaml#/definitions/Alarm"
            $ref: "./definitions/SOL002VNFFaultManagement_def.yaml#/definitions/Alarm"
        400:
          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
        401:
@@ -413,7 +413,7 @@ paths:
          description: The proposed "escalated perceived severity" value
          in: body
          schema:
            $ref: "./definitions/VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityRequest"
            $ref: "./definitions/SOL002VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityRequest"
      responses:
        200:
          description: >
+25 −23
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ definitions:
    required:
      - id
      - managedObjectId
      - vnfcInstanceIds
      - rootCauseFaultyResource
      - alarmRaisedTime
      - ackState
@@ -27,6 +28,12 @@ definitions:
        description: >
          Identifier of the affected VNF instance.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
      vnfcInstanceIds:
        description: >
          Identifiers of the affected VNFC instances.
        type: array
        items:
          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
      rootCauseFaultyResource:
        description: >
          The virtualised resources that are causing the VNF fault.
@@ -57,19 +64,17 @@ definitions:
          - UNACKNOWLEDGED
          - ACKNOWLEDGED
      perceivedSeverity:
        #description: >
        #  Perceived severity of the managed object failure.
        # $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType"
        type: string
        description: >
          Perceived severity of the managed object failure.
        $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType"
      eventTime:
        description: >
          Time stamp indicating when the fault was observed.
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
      eventType:
        #description: >
        #  Type of event.
        # todo: Fix
        #$ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/EventType"
        description: >
          Type of event.
        $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/EventType"
        type: string
      faultType:
        description: >
@@ -84,7 +89,7 @@ definitions:
          Attribute indicating if this fault is the root for other correlated
          alarms. If TRUE, then the alarms listed in the attribute
          CorrelatedAlarmId are caused by this fault.
        type: boolean
        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean"
      correlatedAlarmIds:
        description: >
          List of identifiers of other alarms correlated to this fault.
@@ -105,15 +110,12 @@ definitions:
          - self
        properties:
          self:
            #description: >
            #  URI of this resource.
            description: >
              URI of this resource.
            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
          objectInstance:
            #description: >
            #  Link to the resource representing the VNF instance to which the
            #  notified alarm is correlated. Shall be present if the VNF
            #  instance information is accessible as a resource.
            description: >
              Link to the resource representing the VNF instance to which the
              notified alarm is correlated. Shall be present if the VNF
              instance information is accessible as a resource.
            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
 No newline at end of file

  PerceivedSeverityRequest:
    type: string
 No newline at end of file
Loading