implemented updates to address SOL WG comments

src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml

@@ -48,25 +48,25 @@ paths:
         "204": 
           $ref: "#/components/responses/Notification.Post.204"
         "400":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/400
+          $ref: ../responses/SOL009_resp.yaml#/responses/400
         "401":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/401
+          $ref: ../responses/SOL009_resp.yaml#/responses/401
         "403":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/403
+          $ref: ../responses/SOL009_resp.yaml#/responses/403
         "404":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/404
+          $ref: ../responses/SOL009_resp.yaml#/responses/404
         "405":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/405
+          $ref: ../responses/SOL009_resp.yaml#/responses/405
         "406":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/406
+          $ref: ../responses/SOL009_resp.yaml#/responses/406
         "422":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/422
+          $ref: ../responses/SOL009_resp.yaml#/responses/422
         "500":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/500
+          $ref: ../responses/SOL009_resp.yaml#/responses/500
         "503":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/503
+          $ref: ../responses/SOL009_resp.yaml#/responses/503
         "504":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/504
+          $ref: ../responses/SOL009_resp.yaml#/responses/504
 
     get:
       description: >
@@ -80,25 +80,25 @@ paths:
         "204": 
           $ref: "#/components/responses/Notification.Get.204"
         "400":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/400
+          $ref: ../responses/SOL009_resp.yaml#/responses/400
         "401":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/401
+          $ref: ../responses/SOL009_resp.yaml#/responses/401
         "403":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/403
+          $ref: ../responses/SOL009_resp.yaml#/responses/403
         "404":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/404
+          $ref: ../responses/SOL009_resp.yaml#/responses/404
         "405":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/405
+          $ref: ../responses/SOL009_resp.yaml#/responses/405
         "406":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/406
+          $ref: ../responses/SOL009_resp.yaml#/responses/406
         "422":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/422
+          $ref: ../responses/SOL009_resp.yaml#/responses/422
         "500":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/500
+          $ref: ../responses/SOL009_resp.yaml#/responses/500
         "503":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/503
+          $ref: ../responses/SOL009_resp.yaml#/responses/503
         "504":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/504
+          $ref: ../responses/SOL009_resp.yaml#/responses/504
 
 components:
   responses:
@@ -153,6 +153,6 @@ components:
         application/json:
           schema: 
             oneOf:
-              - $ref: "./components/NFVManoConfigurationAndInformationManagementNotification_def.yaml#/components/schemas/InformationChangedNotification"
-              - $ref: "./components/NFVManoConfigurationAndInformationManagementNotification_def.yaml#/components/schemas/ChangeStateNotification"
+              - $ref: "./definitions/NFVManoConfigurationAndInformationManagementNotification_def.yaml#/definitions/schemas/InformationChangedNotification"
+              - $ref: "./definitions/NFVManoConfigurationAndInformationManagementNotification_def.yaml#/definitions/schemas/ChangeStateNotification"
       required: true
\ No newline at end of file

src/SOL009/NFVManoConfigurationAndInformationManagementNotification/components/NFVManoConfigurationAndInformationManagementNotification_def.yaml → src/SOL009/NFVManoConfigurationAndInformationManagementNotification/definitions/NFVManoConfigurationAndInformationManagementNotification_def.yaml

-components:
+definitions:
   schemas:
     InformationChangedNotification:
       description: >
@@ -21,7 +21,7 @@ components:
             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: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"
         notificationType:
           description: >
             Discriminator for the different notification types. Shall be set to
@@ -30,24 +30,24 @@ components:
         subscriptionId:
           description: >
             Identifier of the subscription that this notification relates to.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"
         timeStamp:
           description: >
             Date and time of the generation of the notification.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/DateTime"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/DateTime"
         informationChangedTime:
           description: >
             Timestamp indicating when the information was changed.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/DateTime"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/DateTime"
         manoEntityId:
           description: >
             Identifier of the MANO entity of which the information was changed.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"
         changedInfo:
           description: >
             Data about the changed configuration and information of the NFV-MANO
             functional entity.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/KeyValuePairs"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/KeyValuePairs"
         _links:
           description: >
             Links to resources related to this notification.
@@ -56,11 +56,11 @@ components:
             self:
               description: >
                 Link to the related subscription.
-              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"
+              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"
             subscription:
               description: >
                 Link to the related subscription.
-              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"
+              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"
           required:
             - self
 
@@ -84,7 +84,7 @@ components:
             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: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"
         notificationType:
           description: >
             Discriminator for the different notification types. Shall be set to
@@ -93,39 +93,39 @@ components:
         subscriptionId:
           description: >
             Identifier of the subscription that this notification relates to.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"
         timestamp:
           description: >
             Date-time of the generation of the notification.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/DateTime"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/DateTime"
         changeStateOpOccId:
           description: >
             Identifier of the change state operation occurrence associated to the
             notification.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"
         stateChangedTime:
           description: >
             Timestamp indicating when the state on the managed object was changed.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/DateTime"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/DateTime"
         changeStateOperationState:
           description: >
             The state of the "change state operation occurrence".
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/ChangeStateOpOccStateEnumType"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/ChangeStateOpOccStateEnumType"
         managedObjectRef:
           description: >
             Reference of the managed object to which the state change notification relates.
             The value of the "type" attribute shall be "MANO_ENTITY" or "MANO_SERVICE_IF".
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/ManoManagedObjectReference"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/ManoManagedObjectReference"
         operationalState:
           description: >
             New operational state of the managed object. Shall only be present when
             there is a change in the operational state.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/OperationalStateEnumType"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/OperationalStateEnumType"
         administrativeState:
           description: >
             New administrative state of the managed object. Shall only be present
             when there is a change in the administrative state.
-          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/AdministrativeStateEnumType"
+          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/AdministrativeStateEnumType"
         _links:
           description: >
             Links to resources related to this notification.
@@ -134,18 +134,18 @@ components:
             subscription:
               description: >
                 Link to the related subscription.
-              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"
+              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"
             objectInstance:
               description: >
                 Link to the resource representing the object to which the change
                 state applies. Shall be present if the object instance is accessible
                 as a resource.
-              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"
+              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"
             changeStateOpOcc:
               description: >
                 Link to the change state operation occurrence that this notification
                 is related to.
-              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"
+              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"
           required:
             - subscription
             - objectInstance

src/SOL009/NFVManoFaultManagement/NFVManoFaultManagement.yaml

@@ -44,25 +44,25 @@ paths:
         "200":
           $ref: '#/components/responses/Alarms.Get.200'
         "400":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/400
+          $ref: ../responses/SOL009_resp.yaml#/responses/400
         "401":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/401
+          $ref: ../responses/SOL009_resp.yaml#/responses/401
         "403":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/403
+          $ref: ../responses/SOL009_resp.yaml#/responses/403
         "404":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/404
+          $ref: ../responses/SOL009_resp.yaml#/responses/404
         "405":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/405
+          $ref: ../responses/SOL009_resp.yaml#/responses/405
         "406":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/406
+          $ref: ../responses/SOL009_resp.yaml#/responses/406
         "422":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/422
+          $ref: ../responses/SOL009_resp.yaml#/responses/422
         "500":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/500
+          $ref: ../responses/SOL009_resp.yaml#/responses/500
         "503":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/503
+          $ref: ../responses/SOL009_resp.yaml#/responses/503
         "504":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/504
+          $ref: ../responses/SOL009_resp.yaml#/responses/504
   "/alarms/{alarmId}":
     parameters:
       - $ref: "#/components/parameters/alarmId"
@@ -77,25 +77,25 @@ paths:
         "200":
           $ref: '#/components/responses/Alarm.Get.200'
         "400":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/400
+          $ref: ../responses/SOL009_resp.yaml#/responses/400
         "401":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/401
+          $ref: ../responses/SOL009_resp.yaml#/responses/401
         "403":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/403
+          $ref: ../responses/SOL009_resp.yaml#/responses/403
         "404":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/404
+          $ref: ../responses/SOL009_resp.yaml#/responses/404
         "405":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/405
+          $ref: ../responses/SOL009_resp.yaml#/responses/405
         "406":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/406
+          $ref: ../responses/SOL009_resp.yaml#/responses/406
         "422":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/422
+          $ref: ../responses/SOL009_resp.yaml#/responses/422
         "500":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/500
+          $ref: ../responses/SOL009_resp.yaml#/responses/500
         "503":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/503
+          $ref: ../responses/SOL009_resp.yaml#/responses/503
         "504":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/504
+          $ref: ../responses/SOL009_resp.yaml#/responses/504
     patch:
       description: >
         This method modifies an "Individual alarm" resource. See clause 7.5.4.3.4.
@@ -110,29 +110,29 @@ paths:
         "200":
           $ref: '#/components/responses/Alarm.Patch.200'
         "400":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/400
+          $ref: ../responses/SOL009_resp.yaml#/responses/400
         "401":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/401
+          $ref: ../responses/SOL009_resp.yaml#/responses/401
         "403":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/403
+          $ref: ../responses/SOL009_resp.yaml#/responses/403
         "404":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/404
+          $ref: ../responses/SOL009_resp.yaml#/responses/404
         "405":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/405
+          $ref: ../responses/SOL009_resp.yaml#/responses/405
         "406":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/406
+          $ref: ../responses/SOL009_resp.yaml#/responses/406
         "409":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/409
+          $ref: ../responses/SOL009_resp.yaml#/responses/409
         "412":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/412
+          $ref: ../responses/SOL009_resp.yaml#/responses/412
         "422":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/422
+          $ref: ../responses/SOL009_resp.yaml#/responses/422
         "500":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/500
+          $ref: ../responses/SOL009_resp.yaml#/responses/500
         "503":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/503
+          $ref: ../responses/SOL009_resp.yaml#/responses/503
         "504":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/504
+          $ref: ../responses/SOL009_resp.yaml#/responses/504
   /subscriptions:
     post:
       description: >
@@ -148,27 +148,27 @@ paths:
         "201":
           $ref: '#/components/responses/Subscriptions.Post.201'
         "303":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/303
+          $ref: ../responses/SOL009_resp.yaml#/responses/303
         "400":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/400
+          $ref: ../responses/SOL009_resp.yaml#/responses/400
         "401":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/401
+          $ref: ../responses/SOL009_resp.yaml#/responses/401
         "403":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/403
+          $ref: ../responses/SOL009_resp.yaml#/responses/403
         "404":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/404
+          $ref: ../responses/SOL009_resp.yaml#/responses/404
         "405":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/405
+          $ref: ../responses/SOL009_resp.yaml#/responses/405
         "406":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/406
+          $ref: ../responses/SOL009_resp.yaml#/responses/406
         "422":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/422
+          $ref: ../responses/SOL009_resp.yaml#/responses/422
         "500":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/500
+          $ref: ../responses/SOL009_resp.yaml#/responses/500
         "503":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/503
+          $ref: ../responses/SOL009_resp.yaml#/responses/503
         "504":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/504
+          $ref: ../responses/SOL009_resp.yaml#/responses/504
     get:
       description: >
         The client can use this method to retrieve the list of active subscriptions for NFV-MANO functional entity
@@ -184,25 +184,25 @@ paths:
         "200":
           $ref: '#/components/responses/Subscriptions.Get.200'
         "400":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/400
+          $ref: ../responses/SOL009_resp.yaml#/responses/400
         "401":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/401
+          $ref: ../responses/SOL009_resp.yaml#/responses/401
         "403":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/403
+          $ref: ../responses/SOL009_resp.yaml#/responses/403
         "404":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/404
+          $ref: ../responses/SOL009_resp.yaml#/responses/404
         "405":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/405
+          $ref: ../responses/SOL009_resp.yaml#/responses/405
         "406":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/406
+          $ref: ../responses/SOL009_resp.yaml#/responses/406
         "422":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/422
+          $ref: ../responses/SOL009_resp.yaml#/responses/422
         "500":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/500
+          $ref: ../responses/SOL009_resp.yaml#/responses/500
         "503":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/503
+          $ref: ../responses/SOL009_resp.yaml#/responses/503
         "504":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/504
+          $ref: ../responses/SOL009_resp.yaml#/responses/504
   "/subscriptions/{subscriptionId}":
     parameters:
       - $ref: "#/components/parameters/subscriptionId"
@@ -218,25 +218,25 @@ paths:
         "200":
           $ref: '#/components/responses/Subscription.Get.200'
         "400":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/400
+          $ref: ../responses/SOL009_resp.yaml#/responses/400
         "401":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/401
+          $ref: ../responses/SOL009_resp.yaml#/responses/401
         "403":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/403
+          $ref: ../responses/SOL009_resp.yaml#/responses/403
         "404":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/404
+          $ref: ../responses/SOL009_resp.yaml#/responses/404
         "405":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/405
+          $ref: ../responses/SOL009_resp.yaml#/responses/405
         "406":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/406
+          $ref: ../responses/SOL009_resp.yaml#/responses/406
         "422":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/422
+          $ref: ../responses/SOL009_resp.yaml#/responses/422
         "500":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/500
+          $ref: ../responses/SOL009_resp.yaml#/responses/500
         "503":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/503
+          $ref: ../responses/SOL009_resp.yaml#/responses/503
         "504":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/504
+          $ref: ../responses/SOL009_resp.yaml#/responses/504
     delete:
       description: >
         This method terminates an individual subscription. See clause 7.5.6.3.5.
@@ -247,25 +247,25 @@ paths:
         "204":
           $ref: '#/components/responses/Subscription.Delete.204'
         "400":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/400
+          $ref: ../responses/SOL009_resp.yaml#/responses/400
         "401":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/401
+          $ref: ../responses/SOL009_resp.yaml#/responses/401
         "403":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/403
+          $ref: ../responses/SOL009_resp.yaml#/responses/403
         "404":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/404
+          $ref: ../responses/SOL009_resp.yaml#/responses/404
         "405":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/405
+          $ref: ../responses/SOL009_resp.yaml#/responses/405
         "406":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/406
+          $ref: ../responses/SOL009_resp.yaml#/responses/406
         "422":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/422
+          $ref: ../responses/SOL009_resp.yaml#/responses/422
         "500":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/500
+          $ref: ../responses/SOL009_resp.yaml#/responses/500
         "503":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/503
+          $ref: ../responses/SOL009_resp.yaml#/responses/503
         "504":
-          $ref: ../components/SOL009_resp.yaml#/components/responses/504
+          $ref: ../responses/SOL009_resp.yaml#/responses/504
 
 components:
   parameters:
@@ -332,7 +332,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "./components/NFVManoFaultManagement_def.yaml#/components/schemas/AlarmModifications"
+            $ref: "./definitions/NFVManoFaultManagement_def.yaml#/definitions/schemas/AlarmModifications"
       required: true
 
     FmSubscriptionRequest:
@@ -342,7 +342,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "./components/NFVManoFaultManagement_def.yaml#/components/schemas/FmSubscriptionRequest"
+            $ref: "./definitions/NFVManoFaultManagement_def.yaml#/definitions/schemas/FmSubscriptionRequest"
       required: true
 
   responses:
@@ -386,7 +386,7 @@ components:
           schema:
             type: array
             items:
-              $ref: "../components/SOL009_schemas.yaml#/components/schemas/Alarm"
+              $ref: "../definitions/SOL009_def.yaml#/definitions/schemas/Alarm"
 
     Alarm.Get.200:
       description: >
@@ -406,7 +406,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "../components/SOL009_schemas.yaml#/components/schemas/Alarm"
+            $ref: "../definitions/SOL009_def.yaml#/definitions/schemas/Alarm"
 
     Alarm.Patch.200:
       description: >
@@ -435,7 +435,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "./components/NFVManoFaultManagement_def.yaml#/components/schemas/AlarmModifications"
+            $ref: "./definitions/NFVManoFaultManagement_def.yaml#/definitions/schemas/AlarmModifications"
 
     Subscriptions.Post.201:
       description: >
@@ -473,7 +473,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "./components/NFVManoFaultManagement_def.yaml#/components/schemas/FmSubscription"
+            $ref: "./definitions/NFVManoFaultManagement_def.yaml#/definitions/schemas/FmSubscription"
     Subscriptions.Post.303:
       description: >
         303 SEE OTHER
@@ -543,7 +543,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "../components/SOL009_schemas.yaml#/components/schemas/ProblemDetails"
+            $ref: "../definitions/SOL009_def.yaml#/definitions/schemas/ProblemDetails"
 
     Subscriptions.Get.200:
       description: >
@@ -595,7 +595,7 @@ components:
           schema:
             type: array
             items:
-              $ref: "./components/NFVManoFaultManagement_def.yaml#/components/schemas/FmSubscription"
+              $ref: "./definitions/NFVManoFaultManagement_def.yaml#/definitions/schemas/FmSubscription"
 
     Subscription.Get.200:
       description: >
@@ -631,7 +631,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "./components/NFVManoFaultManagement_def.yaml#/components/schemas/FmSubscription"
+            $ref: "./definitions/NFVManoFaultManagement_def.yaml#/definitions/schemas/FmSubscription"
 
     Subscription.Delete.204:
       description: >

src/SOL009/NFVManoFaultManagement/components/NFVManoFaultManagement_def.yaml → src/SOL009/NFVManoFaultManagement/definitions/NFVManoFaultManagement_def.yaml

-components:
+definitions:
   schemas:
     FmSubscriptionRequest:
       description: >
@@ -14,17 +14,17 @@ components:
             notifications this subscription relates to. A particular
             notification is sent to the subscriber if the filter matches, or if
             there is no filter.
-          $ref: "#/components/schemas/FmNotificationsFilter"
+