Fixes for SOL002 FM, PM and LCM

Change-Id: Icc0dc5f8cc541749560461e78ef01407f9b7d032
Signed-off-by: Michele Carignani <michele.carignani@etsi.org>

src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml

@@ -85,7 +85,7 @@ paths:
               maximum: 1
               minimum: 0
           schema:
-            $ref: "../definitions/SOL003_def.yaml#/definitions/Alarm"
+            $ref: "./definitions/VNFFaultManagement_def.yaml#/definitions/Alarm"
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-based-filtering-error"
         401:
@@ -165,7 +165,7 @@ paths:
               maximum: 1
               minimum: 0
           schema:
-            $ref: "../definitions/SOL003_def.yaml#/definitions/Alarm"
+            $ref: "./definitions/VNFFaultManagement_def.yaml#/definitions/Alarm"
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
         401:

src/SOL002/VNFFaultManagement/definitions/VNFFaultManagement_def.yaml

+# Copyright (c) ETSI 2017.
+# https://forge.etsi.org/etsi-forge-copyright-notice.txt
+
 definitions:
+  Alarm:
+    description: >
+      The alarm data type encapsulates information about an alarm.
+    type: object
+    required:
+      - id
+      - managedObjectId
+      - rootCauseFaultyResource
+      - alarmRaisedTime
+      - ackState
+      - perceivedSeverity
+      - eventTime
+      - eventType
+      - probableCause
+      - isRootCause
+      - _links
+    properties:
+      id: 
+        description: >
+          Identifier of this Alarm information element.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      managedObjectId:
+        description: >
+          Identifier of the affected VNF instance.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      rootCauseFaultyResource:
+        description: >
+          The virtualised resources that are causing the VNF fault.
+        $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FaultyResourceInfo"
+      alarmRaisedTime:
+        description: >
+          Time stamp indicating when the alarm is raised by the managed
+          object.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      alarmChangedTime:
+        description: >
+          Time stamp indicating when the alarm was last changed. It shall be
+          present if the alarm has been updated.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      alarmClearedTime:
+        description: >
+          Time stamp indicating when the alarm was cleared. It shall be
+          present if the alarm has been cleared.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      ackState:
+        description: >
+          Acknowledgement state of the alarm. 
+          Permitted values:
+          * UNACKNOWLEDGED
+          * ACKNOWLEDGED.
+        type: string
+        enum: 
+          - UNACKNOWLEDGED
+          - ACKNOWLEDGED
+      perceivedSeverity:
+        #description: >
+        #  Perceived severity of the managed object failure.
+        # $ref: "../../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/PerceivedSeverityType"
+        type: string
+      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"
+        type: string
+      faultType:
+        description: >
+          Additional information to clarify the type of the fault.
+        type: string
+      probableCause:
+        description: >
+          Information about the probable cause of the fault.
+        type: string
+      isRootCause:
+        description: >
+          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
+      correlatedAlarmIds:
+        description: >
+          List of identifiers of other alarms correlated to this fault.
+        type: array
+        items: 
+          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      faultDetails:
+        description: >
+          Provides additional information about the fault.
+        type: array
+        items:
+          type: string
+      _links:
+        description: >
+          Links for this resource.
+        type: object
+        required:
+          - self
+        properties:
+          self:
+            #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.
+            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
\ No newline at end of file

src/SOL002/VNFIndicator/VNFIndicator.yaml

+
 swagger: "2.0"
 
 info: 
@@ -20,9 +21,9 @@ info:
   license:
     name: "ETSI Forge copyright notice"
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  externalDocs:
-    description: ETSI GS NFV-SOL 002 V2.3.3
-    url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed241_Ve-Vnfm_RESTful_protocols_spec/NFV-SOL002ed241v233.zip
+externalDocs:
+  description: ETSI GS NFV-SOL 002 V2.3.3
+  url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL002ed241_Ve-Vnfm_RESTful_protocols_spec/NFV-SOL002ed241v233.zip
 
 basePath: /vnfind/v1
 

src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml

@@ -1513,7 +1513,7 @@ definitions:
               error or a wrongly configured subscription filter.
             type: array
             items:
-              $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/AffectedVnfc"
+              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/AffectedVnfc"
           affectedVirtualLinks:
             description: >
               Information about VL instances that were affected during the