Merge branch '4.3.1-dev' into 'Release-4'

Merge 4.3.1-dev into Release-4

See merge request !19

Readme.md

 # NFV SOL002 and SOL003 APIs
 
 This repository hosts the [OpenAPI](https://www.openapis.org/) specificatons and other documentation
-for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v3.6.1.
+for the APIs defined in ETSI NFV GSs SOL002 and SOL003 v4.3.1.
 
 The APIs described in this repository are defined for the following reference points:
 
@@ -35,7 +35,7 @@ and the results will be stored in a `build/` directory in the project folder.
 
 ## How to raise issues
 
-Change requests can be filed at [ETSI Forge Bugzilla](forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=62&product=NFV). Please report errors, bugs or other issues [here](https://forge.etsi.org/bugzilla/enter_bug.cgi?product=NFV).
+Please report errors, bugs or other issues [here](https://forge.etsi.org/rep/nfv/SOL002-SOL003/-/issues).
 
 ## How to contribute
 

src/SOL002/APIVersion/APIVersion.yaml

@@ -19,8 +19,8 @@ info:
   version: 1.3.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V3.6.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf
+  description: ETSI GS NFV-SOL 002 V4.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.pdf
 
 paths:
   /vnfconfig/api_versions:

src/SOL002/VNFConfiguration/VNFConfiguration.yaml

@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.2.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V3.6.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf
+  description: ETSI GS NFV-SOL 002 V4.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfconfig/v1
@@ -67,6 +67,9 @@ paths:
     patch:
       description: |
         This method sets or modifies a configuration resource. See clause 9.4.2.3.4.
+      parameters:
+        - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Unmodified-Since
+        - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Match
       requestBody:
         $ref: '#/components/requestBodies/ConfigurationRequest'
       responses:
@@ -132,11 +135,27 @@ components:
           schema:
             type: string
         Content-Type:
-          description: The MIME type of the body of the response.
+          description: >
+            The MIME type of the body of the response.
           style: simple
           explode: false
           schema:
             type: string
+        ETag:
+          description: >
+            Used to provide the current entity-tag for the selected resource representation. It can be sent in
+            "200 OK", "201 Created" and "204 No Content" responses.
+          style: simple
+          schema:
+            type: string
+        Last-Modified:
+          description: >
+            Used to provide a timestamp indicating the date and time at which the server believes the selected resource
+            representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses.
+          style: simple
+          schema:
+            type: string
+            format: date-time
       content:
         application/json:
           schema:
@@ -160,6 +179,21 @@ components:
           explode: false
           schema:
             type: string
+        ETag:
+          description: >
+            Used to provide the current entity-tag for the selected resource representation. It can be sent in
+            "200 OK", "201 Created" and "204 No Content" responses.
+          style: simple
+          schema:
+            type: string
+        Last-Modified:
+          description: >
+            Used to provide a timestamp indicating the date and time at which the server believes the selected resource
+            representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses.
+          style: simple
+          schema:
+            type: string
+            format: date-time
       content:
         application/json:
           schema:

src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml

@@ -30,20 +30,20 @@ definitions:
             Modifying an attribute that is an array of objects of type "VnfcConfigurationData".
               Assumptions:
                 1) "oldList" is the "VnfcConfigurationData" array to be modified and "newList"
-                   is the "VnfcConfigurationData" array that contains the changes.
+                    is the "VnfcConfigurationData" array that contains the changes.
                 2) "oldEntry" is an entry in "oldList" and "newEntry" is an entry in "newList".
-                3) A "newEntry" has a "corresponding entry" if there exists an "oldEntry" that
-                   has the same content of the "vnfcInstanceId" attribute as the "newEntry";
-                   a "newEntry" has no corresponding entry if no such "oldEntry" exists.
-                4) In any array of "VnfcConfigurationData" structures, the content of "vnfcInstanceId"
-                   is unique (i.e. there shall be no two entries with the same content of "vnfcInstanceId").
+                3)  A "newEntry" has a "corresponding entry" if there exists an "oldEntry" that
+                    has the same content of the "vnfcInstanceId" attribute as the "newEntry";
+                    a "newEntry" has no corresponding entry if no such "oldEntry" exists.
+                4)  In any array of "VnfcConfigurationData" structures, the content of "vnfcInstanceId"
+                    is unique (i.e. there shall be no two entries with the same content of "vnfcInstanceId").
               Provisions:
-                1) For each "newEntry" in "newList" that has no corresponding entry in "oldList",
-                   the "oldList" array shall be modified by adding that "newEntry".
+                1)  For each "newEntry" in "newList" that has no corresponding entry in "oldList",
+                    the "oldList" array shall be modified by adding that "newEntry".
 
-                2) For each "newEntry" in "newList" that has a corresponding "oldEntry" in "oldList",
-                   the value of "oldEntry" shall be updated with the value of "newEntry" according to
-                  the rules of JSON Merge PATCH (see IETF RFC 7396 ).
+                2)  For each "newEntry" in "newList" that has a corresponding "oldEntry" in "oldList",
+                    the value of "oldEntry" shall be updated with the value of "newEntry" according to
+                    the rules of JSON Merge PATCH (see IETF RFC 7396 ).
         type: array
         items:
           $ref: '#/definitions/VnfcConfigurationData'
@@ -53,7 +53,7 @@ definitions:
           as "deleteIdList" as defined below this table.
         type: array
         items:
-          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
+          $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
 
   VnfConfiguration:
     description: >
@@ -86,16 +86,11 @@ definitions:
         type: array
         items:
           $ref: '#/definitions/CpConfiguration'
-      dhcpServer:
-        description: >
-          IP address of the DHCP server that the VNF instance can use to obtain
-          IP addresses to be assigned to its external CPs.
-        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress'
       vnfSpecificData:
         description: >
           Additional configurable properties of the VNF instance declared in the
           VNFD as "VnfConfigurableProperties". see note.
-        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs'
+        $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs'
 
   VnfcConfigurationData:
     description: >
@@ -110,7 +105,7 @@ definitions:
         description: >
           Identifier of a VNFC instance to which this set of configuration data applies.
           The identifier references the "id" attribute in a "VnfcInfo" structure.
-        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf'
+        $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf'
       intCpConfig:
         description: >
           Configuration parameters for the internal CPs of the VNFC instance.
@@ -121,12 +116,12 @@ definitions:
         description: >
           IP address of the DHCP server that the VNF instance can use to obtain
           IP addresses to be assigned to its external CPs.
-        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress'
+        $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IpAddress'
       vnfcSpecificData:
         description: >
           Additional configurable properties of the VNFC instance declared in the
           VNFD as "VnfcConfigurableProperties". See note.
-        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs'
+        $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs'
 
   CpConfiguration:
     description: >
@@ -140,11 +135,11 @@ definitions:
       cpId:
         description: >
           Identifier of a CP instance within the namespace of a specific VNF instance or a VNFC instance.
-        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf'
+        $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf'
       cpdId:
         description: >
           Identifier of the CPD in the VNFD.
-        $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd'
+        $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd'
       addresses:
         description: >
           Network address and port assigned to the CP.
@@ -177,11 +172,11 @@ definitions:
           macAddress:
             description: >
               Mac address. See NOTE 2.
-            $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/MacAddress'
+            $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/MacAddress'
           ipAddress:
             description: >
               IP address. See NOTE 2.
-            $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress'
+            $ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IpAddress'
       useDynamicAddress:
         description: >
           Set to true if an address shall be assigned dynamically. Otherwise set to false.

src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml

@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.4.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V3.6.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf
+  description: ETSI GS NFV-SOL 002 V4.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnffm/v1
@@ -115,6 +115,8 @@ paths:
       parameters:
         - $ref: ../../components/SOL002_params.yaml#/components/parameters/Accept
         - $ref: ../../components/SOL002_params.yaml#/components/parameters/ContentType
+        - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Unmodified-Since
+        - $ref: ../../components/SOL002_params.yaml#/components/parameters/If-Match
       requestBody:
         $ref: '#/components/requestBodies/IndividualAlarmRequest'
       responses:
@@ -404,7 +406,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications
+            $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmModifications
       required: true
 
     IndividualAlarmEscalateRequest:
@@ -420,7 +422,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscriptionRequest
+            $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/FmSubscriptionRequest
       required: true
 
   responses:
@@ -492,6 +494,21 @@ components:
           explode: false
           schema:
             type: string
+        ETag:
+          description: >
+            Used to provide the current entity-tag for the selected resource representation. It can be sent in
+            "200 OK", "201 Created" and "204 No Content" responses.
+          style: simple
+          schema:
+            type: string
+        Last-Modified:
+          description: >
+            Used to provide a timestamp indicating the date and time at which the server believes the selected resource
+            representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses.
+          style: simple
+          schema:
+            type: string
+            format: date-time
       content:
         application/json:
           schema:
@@ -523,10 +540,25 @@ components:
           explode: false
           schema:
             type: string
+        ETag:
+          description: >
+            Used to provide the current entity-tag for the selected resource representation. It can be sent in
+            "200 OK", "201 Created" and "204 No Content" responses.
+          style: simple
+          schema:
+            type: string
+        Last-Modified:
+          description: >
+            Used to provide a timestamp indicating the date and time at which the server believes the selected resource
+            representation was last modified. It can be sent in "200 OK", "201 Created" and "204 No Content" responses.
+          style: simple
+          schema:
+            type: string
+            format: date-time
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications
+            $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmModifications
 
     IndividualAlarm.Patch.409:
       description: |
@@ -568,7 +600,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
+            $ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"
 
     IndividualAlarmEscalate.Post.204:
       description: |
@@ -625,7 +657,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription
+            $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/FmSubscription
 
     Subscriptions.Post.201:
       description: |
@@ -665,7 +697,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription
+            $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/FmSubscription
 
     IndividualSubscription.Get.200:
       description: |
@@ -696,7 +728,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription
+            $ref: definitions/SOL002VNFFaultManagement_def.yaml#/definitions/FmSubscription
 
     IndividualSubscription.Delete.204:
       description: |

src/SOL002/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml

@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.4.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V3.6.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf
+  description: ETSI GS NFV-SOL 002 V4.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.pdf
 
 servers:
   - url: http://127.0.0.1/callback/v1
@@ -200,7 +200,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmClearedNotification
+            $ref: ../VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmClearedNotification
       required: true
 
     AlarmListRebuiltNotification:
@@ -209,7 +209,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmListRebuiltNotification
+            $ref: ../VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml#/definitions/AlarmListRebuiltNotification
       required: true
 
   responses:

src/SOL002/VNFIndicator/VNFIndicator.yaml

@@ -16,11 +16,11 @@ info:
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
-  version: 1.3.1-impl:etsi.org:ETSI_NFV_OpenAPI:1
+  version: 1.10.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
 
 externalDocs:
-  description: ETSI GS NFV-SOL 002 V3.6.1
-  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/03.06.01_60/gs_NFV-SOL002v030601p.pdf
+  description: ETSI GS NFV-SOL 002 V4.3.1
+  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/002/04.03.01_60/gs_NFV-SOL002v040301p.pdf
 
 servers:
   - url: http://127.0.0.1/vnfind/v1
@@ -365,9 +365,9 @@ components:
       in: path
       description: |
         Identifier of this subscription. NOTE:
-         This identifier can be retrieved from the resource referenced by the "Location" HTTP header
-         in the response to a POST request creating a new subscription resource. It can also be retrieved
-         from the "id" attribute in the payload body of that response.
+        This identifier can be retrieved from the resource referenced by the "Location" HTTP header
+        in the response to a POST request creating a new subscription resource. It can also be retrieved
+        from the "id" attribute in the payload body of that response.
       required: true
       style: simple
       explode: false
@@ -380,7 +380,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscriptionRequest
+            $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscriptionRequest
       required: true
 
   responses:
@@ -420,7 +420,7 @@ components:
           schema:
             type: array
             items:
-              $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator
+              $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicator
 
     VnfIndicators.Get.200:
       description: |
@@ -458,7 +458,7 @@ components:
           schema:
             type: array
             items:
-              $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator
+              $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicator
 
     VnfIndividualIndicator.Get.200:
       description: |
@@ -481,7 +481,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator
+            $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicator
 
     VnfIndicatorSubscriptions.Get.200:
       description: |
@@ -519,7 +519,7 @@ components:
           schema:
             type: array
             items:
-              $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
+              $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
 
     VnfIndicatorSubscription.Post.201:
       description: |
@@ -560,7 +560,7 @@ components:
           schema:
             type: array
             items:
-              $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
+              $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
 
     VnfIndicatorSubscription.Get.200:
       description: |
@@ -583,7 +583,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
+            $ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
 
     VnfIndicatorSubscription.Delete.204:
       description: |

src/definitions/SOL002SOL003VNFIndicator_def.yaml → src/SOL002/VNFIndicator/definitions/SOL002VNFIndicator_def.yaml

 # Copyright (c) ETSI 2017.
 # https://forge.etsi.org/etsi-forge-copyright-notice.txt
 
-definitions:
+definitions:  
   VnfIndicator:
     description: >
-      This type represents a VNF indicator value. It shall comply with the provisions defined in table 8.5.2.2-1.
+      This type represents a VNF indicator value.
 
       NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
     type: object
@@ -17,7 +17,7 @@ definitions:
       id:
         description: >
           Identifier of this VNF indicator.
-        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd"
       name:
         description: >
           Human readable name of the indicator. Shall be present if defined in
@@ -30,7 +30,7 @@ definitions:
       vnfInstanceId:
         description: >
           Identifier of the "Individual VNF instance" which provides the indicator value.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
       _links:
         description: >
           Links for this resource.
@@ -42,16 +42,16 @@ definitions:
           self:
             description: >
               URI of this resource.
-            $ref: "SOL002SOL003_def.yaml#/definitions/Link"
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
           vnfInstance:
             description: >
               Link to the related "Individual VNF instance" resource.
-            $ref: "SOL002SOL003_def.yaml#/definitions/Link"
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
 
   VnfIndicatorNotificationsFilter:
     description: >
-      This type represents a subscription filter for notifications related to VNF indicators. 
-      It shall comply with the provisions defined in table 8.5.3.2-1. 
+      This type represents a subscription filter for notifications related to VNF indicators.
+
       At a particular nesting level in the filter structure, the following applies: 
       All attributes shall match in order for the filter to match (logical "and" between different 
       filter attributes). If an attribute is an array, the attribute shall match if at least one of 
@@ -64,7 +64,7 @@ definitions:
       vnfInstanceSubscriptionFilter:
         description: >
           Filter criteria to select VNF instances about which to notify.
-        $ref: "SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/VnfInstanceSubscriptionFilter"
       notificationTypes:
         description: >
           Match particular notification types. 
@@ -82,7 +82,7 @@ definitions:
           Match particular VNF indicator identifiers.
         type: array
         items:
-          $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
+          $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd"
 
   VnfIndicatorSubscription:
     description: >
@@ -97,7 +97,7 @@ definitions:
       id:
         description: >
           Identifier of this "Individual subscription" resource.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
       filter:
         description: >
           Filter settings for this subscription, to define the subset of all
@@ -120,7 +120,7 @@ definitions:
           self:
             description: >
               URI of this resource.
-            $ref: "SOL002SOL003_def.yaml#/definitions/Link"
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
 
   VnfIndicatorSubscriptionRequest:
     description: >
@@ -140,7 +140,7 @@ definitions:
       callbackUri:
         description: >
           The URI of the endpoint to send the notification to.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Uri"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Uri"
       authentication:
         description: >
           Authentication parameters to configure the use of Authorization when
@@ -148,11 +148,11 @@ definitions:
           in clause 8.3.4 of ETSI GS NFV-SOL 013.
           This attribute shall only be present if the subscriber requires
           authorization of notifications.
-        $ref: "SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/SubscriptionAuthentication"
 
   VnfIndicatorValueChangeNotification:
     description: >
-      This type represents a VNF indicator value change notification. It shall comply with the provisions defined in table 8.5.2.5-1.
+      This type represents a VNF indicator value change notification.
       The notification shall be triggered by the VNFM when the value of an indicator has changed.
 
       NOTE:	ETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.
@@ -172,7 +172,7 @@ definitions:
           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: "SOL002SOL003_def.yaml#/definitions/Identifier"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
       notificationType:
         description: >
           Discriminator for the different notification types. Shall be set to
@@ -183,15 +183,15 @@ definitions:
       subscriptionId:
         description: >
           Identifier of the subscription that this notification relates to.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
       timeStamp:
         description: >
           Date-time of the generation of the notification.
-        $ref: "SOL002SOL003_def.yaml#/definitions/DateTime"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime"
       vnfIndicatorId:
         description: >
           Identifier of the VNF indicator whose value has changed.
-        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd"
       name:
         description: >
           Human readable name of the VNF indicator. Shall be present if
@@ -204,7 +204,7 @@ definitions:
       vnfInstanceId:
         description: >
           Identifier of the VNF instance which provides the indicator value.
-        $ref: "SOL002SOL003_def.yaml#/definitions/Identifier"
+        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
       _links:
         description: >
           Links for this resource.
@@ -217,16 +217,16 @@ definitions:
             description: >
               Link to the related "Individual VNF instance" resource. Shall be present
               if the VNF instance information is accessible as a resource.
-            $ref: "SOL002SOL003_def.yaml#/definitions/NotificationLink"
+            $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink"
           subscription: