src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml

@@ -159,60 +159,6 @@ definitions:
               instance information is accessible as a resource.
             $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
 
-  AlarmNotification:
-    description: >
-      This type represents an alarm notification about VNF faults.
-      This notification shall be triggered by the VNFM when:
-      * An alarm has been created.
-      * An alarm has been updated, e.g. if the severity of the alarm has
-        changed.
-    type: object
-    required:
-      - id
-      - notificationType
-      - subscriptionId
-      - timeStamp
-      - alarm
-      - _links
-    properties:
-      id:
-        description: >
-          Identifier of this notification. If a notification is sent multiple
-          times due to multiple subscriptions, the "id" attribute of all these
-          notifications shall have the same value.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      notificationType:
-        description: >
-          Discriminator for the different notification types. Shall be set to
-          "AlarmNotification" for this notification type.
-        type: string
-        enum:
-          - AlarmNotification
-      subscriptionId:
-        description: >
-          Identifier of the subscription that this notification relates to.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      timeStamp:
-        description: >
-          Date-time of the generation of the notification.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
-      alarm:
-        description: >
-          Information about an alarm including AlarmId, affected VNF
-          identifier, and FaultDetails.
-        $ref: "#/definitions/Alarm"
-      _links:
-        description: >
-          Links to resources related to this notification.
-        type: object
-        required:
-          - subscription
-        properties:
-          subscription:
-            description: >
-              Link to the related subscription.
-            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink"
-
   PerceivedSeverityRequest:
     description: >
       This type represents the escalated value of the perceived severity for an alarm.

src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml

@@ -191,7 +191,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmNotification
+            $ref: definitions/SOL002VNFFaultManagementNotification_def.yaml#/definitions/AlarmNotification
       required: true
 
     AlarmClearedNotification:

src/SOL002/VNFFaultManagementNotification/definitions/SOL002VNFFaultManagementNotification_def.yaml

+# Copyright (c) ETSI 2017.
+# https://forge.etsi.org/etsi-forge-copyright-notice.txt
+
+definitions:
+  AlarmNotification:
+    description: >
+      This type represents an alarm notification about VNF faults.
+      This notification shall be triggered by the VNFM when:
+      * An alarm has been created.
+      * An alarm has been updated, e.g. if the severity of the alarm has
+        changed.
+    type: object
+    required:
+      - id
+      - notificationType
+      - subscriptionId
+      - timeStamp
+      - alarm
+      - _links
+    properties:
+      id:
+        description: >
+          Identifier of this notification. If a notification is sent multiple
+          times due to multiple subscriptions, the "id" attribute of all these
+          notifications shall have the same value.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      notificationType:
+        description: >
+          Discriminator for the different notification types. Shall be set to
+          "AlarmNotification" for this notification type.
+        type: string
+        enum:
+          - AlarmNotification
+      subscriptionId:
+        description: >
+          Identifier of the subscription that this notification relates to.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+      timeStamp:
+        description: >
+          Date-time of the generation of the notification.
+        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
+      alarm:
+        description: >
+          Information about an alarm including AlarmId, affected VNF
+          identifier, and FaultDetails.
+        $ref: "../../VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml#/definitions/Alarm"
+      _links:
+        description: >
+          Links to resources related to this notification.
+        type: object
+        required:
+          - subscription
+        properties:
+          subscription:
+            description: >
+              Link to the related subscription.
+            $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink"
\ No newline at end of file