SOL003: fixing broken references

src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml

@@ -109,7 +109,7 @@ paths:
         - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/nextpage_opaque_marker
       responses:
         200:
-          $ref: '#/components/responses/VNFInstances.Get.20'
+          $ref: '#/components/responses/VNFInstances.Get.200'
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/400"
         401:
@@ -1773,7 +1773,7 @@ paths:
         for URI query parameters, request and response data structures, and response codes.
       parameters:
         - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Accept
-        - $ref: ../../components/SOL002SOL003_params.yaml#/components/parameters/Range
+        - $ref: '#/components/parameters/Range'
       responses:
         200:
           $ref: '#/components/responses/IndividualVnfSnapshotState.Get.200'
@@ -1857,6 +1857,19 @@ components:
       schema:
         type: string
 
+    Range:
+      name: Range
+      in: header
+      description: |
+        The request may contain a "Range" HTTP header to obtain single
+        range of bytes from a VNF state snapshot file. This can be used to
+        continue an aborted transmission.
+        If the "Range" header is present in the request and the VNFM
+        does not support responding to range requests with a 206
+        response, it shall return a 200 OK response instead.
+      schema:
+        type: string
+
   requestBodies:
     CreateVnfRequest:
       description: The VNF creation parameters
@@ -2038,7 +2051,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
+            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
 
     VNFInstances.Get.200:
       description: |
@@ -2088,7 +2101,7 @@ components:
           schema:
             type: array
             items:
-              $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
+              $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
 
     IndividualVnfInstance.Get.200:
       description: |
@@ -2121,8 +2134,8 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
-
+            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
+            
     IndividualVnfInstance.Patch.202:
       description: |
         202 ACCEPTED
@@ -2165,7 +2178,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
+            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"
 
     IndividualVnfInstance.Delete.204:
       description: |
@@ -2924,7 +2937,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo"
+            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo"
 
     VnfSnapshots.Get.200:
       description: |
@@ -2970,7 +2983,7 @@ components:
           schema:
             type: array
             items:
-              $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo"
+              $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo"
 
     IndividualVnfSnapshot.Get.200:
       description: |
@@ -3006,7 +3019,7 @@ components:
           schema:
             type: array
             items:
-              $ref: "definitions/SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo"
+              $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfSnapshotInfo"
 
     IndividualVnfSnapshot.Patch.200:
       description: |
@@ -3102,7 +3115,6 @@ components:
             type: string
             format: binary
 
-
     IndividualVnfSnapshotState.Get.206:
       description: |
         206 PARTIAL CONTENT

src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml

@@ -163,7 +163,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/VNFLifecycleOperationGranting_def.yaml#/definitions/GrantRequest"
+            $ref: "definitions/SOL003VNFLifecycleOperationGranting_def.yaml#/definitions/GrantRequest"
       required: true
 
   responses:
@@ -201,7 +201,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/VNFLifecycleOperationGranting_def.yaml#/definitions/Grant"
+            $ref: "definitions/SOL003VNFLifecycleOperationGranting_def.yaml#/definitions/Grant"
 
     Grants.Post.202:
       description: |
@@ -260,7 +260,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/VNFLifecycleOperationGranting_def.yaml#/definitions/Grant"
+            $ref: "definitions/SOL003VNFLifecycleOperationGranting_def.yaml#/definitions/Grant"
 
     IndividualGrant.Get.202:
       description: |

src/SOL003/VNFLifecycleOperationGranting/definitions/SOL003VNFLifecycleOperationGranting_def.yaml

@@ -463,7 +463,7 @@ definitions:
           Information to identify a snapshot resource. Shall only be present if the 
           operation to be granted concerns to creating a VNF snapshot from the VNF
           or to reverting the VNF to a VNF snapshot.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SnapshotResourceDefinition"
+        $ref: "#/definitions/SnapshotResourceDefinition"
 
   GrantInfo:
     description: >

src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml

@@ -891,7 +891,7 @@ paths:
           #    "Range" header did not match any available byte range in the artifact file
           #    (e.g. "access after end of file").
           #    The response body may contain a ProblemDetails structure.
-          #   $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
+          $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/416"
         500:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/components/responses/500"
         503:
@@ -1170,7 +1170,7 @@ components:
 
         If the "Range" header is present in the request and the NFVO
         does not support responding to range requests with a 206 response,
-        it shall return a 200 OK response instead as defined below.
+        it shall return a 200 OK response instead.
       required: false
       schema:
         type: string
@@ -1184,7 +1184,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/VNFPackageManagement_def.yaml#/definitions/PkgmSubscriptionRequest"
+            $ref: "definitions/SOL003VNFPackageManagement_def.yaml#/definitions/PkgmSubscriptionRequest"
       required: true
 
   responses:
@@ -1235,7 +1235,7 @@ components:
           schema:
             type: array
             items:
-              $ref: "definitions/VNFPackageManagement_def.yaml#/definitions/VnfPkgInfo"
+              $ref: "definitions/SOL003VNFPackageManagement_def.yaml#/definitions/VnfPkgInfo"
 
     IndividualVnfPackage.Get.200:
       description: |
@@ -1267,7 +1267,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/VNFPackageManagement_def.yaml#/definitions/VnfPkgInfo"
+            $ref: "definitions/SOL003VNFPackageManagement_def.yaml#/definitions/VnfPkgInfo"
 
     IndividualOnboardedVnfPackage.Get.200:
       description: |
@@ -1299,7 +1299,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/VNFPackageManagement_def.yaml#/definitions/VnfPkgInfo"
+            $ref: "definitions/SOL003VNFPackageManagement_def.yaml#/definitions/VnfPkgInfo"
 
     VnfdInIndividualVnfPackage.Get.200:
       description: |
@@ -1989,7 +1989,7 @@ components:
           schema:
             type: array
             items:
-              $ref: "definitions/VNFPackageManagement_def.yaml#/definitions/PkgmSubscription"
+              $ref: "definitions/SOL003VNFPackageManagement_def.yaml#/definitions/PkgmSubscription"
 
     Subscriptions.Get.200:
       description: |
@@ -2038,7 +2038,7 @@ components:
           schema:
             type: array
             items:
-              $ref: "definitions/VNFPackageManagement_def.yaml#/definitions/PkgmSubscription"
+              $ref: "definitions/SOL003VNFPackageManagement_def.yaml#/definitions/PkgmSubscription"
 
     IndividualSubscription.Get.200:
       description: |
@@ -2070,7 +2070,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/VNFPackageManagement_def.yaml#/definitions/PkgmSubscription"
+            $ref: "definitions/SOL003VNFPackageManagement_def.yaml#/definitions/PkgmSubscription"
 
     IndividualSubscription.Delete.204:
       description: |

src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml

@@ -164,7 +164,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/VNFPackageManagementNotification_def.yaml#/definitions/VnfPackageOnboardingNotification"
+            $ref: "definitions/SOL003VNFPackageManagementNotification_def.yaml#/definitions/VnfPackageOnboardingNotification"
       required: true
 
     VnfPackageChangeNotification:
@@ -173,7 +173,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "definitions/VNFPackageManagementNotification_def.yaml#/definitions/VnfPackageChangeNotification"
+            $ref: "definitions/SOL003VNFPackageManagementNotification_def.yaml#/definitions/VnfPackageChangeNotification"
       required: true
 
   responses:

src/SOL003/VNFPackageManagementNotification/definitions/SOL003VNFPackageManagementNotification_def.yaml

@@ -134,7 +134,7 @@ definitions:
         description: >
           New operational state of the VNF package.
           Only present when changeType is OP_STATE_CHANGE.
-        $ref: "../../VNFPackageManagement/definitions/VNFPackageManagement_def.yaml#/definitions/PackageOperationalStateType"
+        $ref: "../../VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml#/definitions/PackageOperationalStateType"
       _links:
         description: >
           Links to resources related to this notification.

src/SOL003/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml

@@ -290,7 +290,7 @@ components:
           schema:
             type: array
             items:
-              $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/VnfSnapshotPkgInfo
+              $ref: definitions/SOL003VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfo
 
     IndividualVNFSnapshotPackages.Get.200:
       description: |
@@ -323,7 +323,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ../../definitions/SOL002SOL003VNFPerformanceManagement_def.yaml#/definitions/VnfSnapshotPkgInfo
+            $ref: definitions/SOL003VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfo
 
     PackageContent.Get.200:
       description: |

src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml

@@ -240,7 +240,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: "xxx/VrQuotaAvailSubscriptionRequest"
+            $ref: "./definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml#/definitions/VrQuotaAvailSubscriptionRequest"
       required: true
 
 
@@ -286,7 +286,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ./definitions/VirtualisedResourcesQuotaAvailableNotification_def.yaml#/definitions/VrQuotaAvailSubscription
+            $ref: ./definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml#/definitions/VrQuotaAvailSubscription
 
     Subscriptions.Get.200:
       description: |
@@ -336,7 +336,7 @@ components:
           schema:
             type: array
             items:
-              $ref: ./definitions/VirtualisedResourcesQuotaAvailableNotification_def.yaml#/definitions/VrQuotaAvailSubscription
+              $ref: ./definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml#/definitions/VrQuotaAvailSubscription
     
     Subscriptions.Get.204:
       description: |
@@ -393,7 +393,7 @@ components:
       content:
         application/json:
           schema:
-            $ref: ./definitions/VirtualisedResourcesQuotaAvailableNotification_def.yaml#/definitions/VrQuotaAvailSubscription
+            $ref: ./definitions/SOL003VirtualisedResourcesQuotaAvailableNotification_def.yaml#/definitions/VrQuotaAvailSubscription
 
     IndividualSubscription.Delete.204:
       description: | 

src/definitions/SOL002SOL003VNFIndicator_def.yaml

@@ -285,7 +285,7 @@ definitions:
                 Shall be  present if defined in the VNFD. 
                 ETSI GS NFV-SOL 001 specifies the structure and format of 
                 the VNFD based on TOSCA specifications.
-              $ref: string
+              type: string
       _links:
         description: >
           Links for this resource.

src/definitions/SOL002SOL003VNFPerformanceManagement_def.yaml

@@ -301,8 +301,7 @@ definitions:
           Type of the measured object.
           The applicable measured object type for a measurement
           is defined in clause 7.2 of ETSI GS NFV-IFA 027.
-        type:
-          string
+        type: string
       objectInstanceIds:
         description: >
           Identifiers of the VNF instances for which performance information

src/definitions/SOL002SOL003_def.yaml

@@ -725,6 +725,24 @@ definitions:
 ########################################################################################################################
 # TO CHECK IF INCLUDE THESE DATA TYPES IN ANOTHER DEF FILES
 
+  VnfLinkPortData:
+    description: >
+      This type represents an externally provided link port to be used to connect a VNFC connection point 
+      to an exernally managed VL.
+    type: object
+    required:
+    - vnfLinkPortId
+    - resourceHandle
+    properties:
+      vnfLinkPortId:
+        description: >
+          Identifier of this link port as provided by the entity that has created the link port.
+        $ref: "#/definitions/Identifier"
+      resourceHandle:
+        description: >
+          Resource handle of the virtualised resource that realizes the link port.
+        $ref: "#/definitions/ResourceHandle"
+
   ExtLinkPortData:
     description: >
       This type represents an externally provided link port to be used to