From 8a02ccc392c53f7745720c6ac5a4a72830182064 Mon Sep 17 00:00:00 2001
From: hammad zafar <hammad.zafar@xflowresearch.com>
Date: Fri, 19 Feb 2021 22:25:26 +0500
Subject: [PATCH] added new resources and updated references

---
 .../ApiVersion.robot                          |   20 +-
 .../CancelOperationTask.robot                 |   14 +-
 .../ChangeExternalVNFConnectivityTask.robot   |   12 +-
 .../ChangeVNFFlavourTask.robot                |   14 +-
 .../FailOperationTask.robot                   |   14 +-
 .../HealVNFTask.robot                         |   14 +-
 .../IndividualSubscription.robot              |   10 +-
 .../IndividualVNFInstance.robot               |   16 +-
 .../IndividualVNFSnapshot.robot               |   91 +
 .../IndividualVnfLcmOperationOccurence.robot  |   10 +-
 .../InstantiateVNFTask.robot                  |   12 +-
 .../NotificationConsumer.robot                |    6 +-
 .../NotificationEndpoint.robot                |    8 +-
 .../OperateVNFTask.robot                      |   14 +-
 .../RetryOperationTask.robot                  |   14 +-
 .../RollbackOperationTask.robot               |   14 +-
 .../ScaleVNFTask.robot                        |   14 +-
 .../ScaleVNFToLevelTask.robot                 |   14 +-
 .../Subscriptions.robot                       |   32 +-
 .../TerminateVNFTask.robot                    |   12 +-
 .../VNFSnapshots.robot                        |  184 ++
 .../VnfLcmOperationKeywords.robot             |  180 +-
 .../VnfLcmOperationOccurences.robot           |   28 +-
 .../environment/variables.txt                 |    3 +
 .../jsons/CreateVnfSnapshotInfoRequest.json   |    3 +
 .../schemas/VnfSnapshotInfo.schema.json       | 1531 ++++++++++++++++
 .../schemas/VnfSnapshotsInfo.schema.json      | 1535 +++++++++++++++++
 27 files changed, 3672 insertions(+), 147 deletions(-)
 create mode 100644 SOL002/VNFLifecycleManagement-API/IndividualVNFSnapshot.robot
 create mode 100644 SOL002/VNFLifecycleManagement-API/VNFSnapshots.robot
 create mode 100644 SOL002/VNFLifecycleManagement-API/jsons/CreateVnfSnapshotInfoRequest.json
 create mode 100644 SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotInfo.schema.json
 create mode 100644 SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotsInfo.schema.json

diff --git a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
index d2268491..3cbf78a9 100644
--- a/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
+++ b/SOL002/VNFLifecycleManagement-API/ApiVersion.robot
@@ -11,7 +11,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index db8a558e..459342cb 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -14,7 +14,7 @@ Post Cancel operation task
     ...    Test title: POST Cancel operation task
     ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
     ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: the resource is in FAILED_TEMP state    
@@ -27,7 +27,7 @@ Post Cancel operation task Conflict
     ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The POST method is NOT cancelling an ongoing VNF lifecycle operation due to the fact that the VNF instance resource is not in STARTING, PROCESSING or ROLLING_BACK state
     ...    Pre-conditions: operation is not in STARTING, PROCESSING or ROLLING_BACK state
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -41,7 +41,7 @@ Post Cancel operation task Not Found
     ...    Test title: POST Cancel operation task
     ...    Test objective: The objective is to test that POST method cannot cancel a VNF lifecycle operation because the resource is not found
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.17.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -54,7 +54,7 @@ GET Cancel operation task - Method not implemented
     ...    Test title: GET Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -66,7 +66,7 @@ PUT Cancel operation task - Method not implemented
     ...    Test title: PUT Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.17.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -78,7 +78,7 @@ PATCH Cancel operation task - Method not implemented
     ...    Test title: PATCH Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.17.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -90,7 +90,7 @@ DELETE Cancel operation task - Method not implemented
     ...    Test title: DELETE Cancel operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.17.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.17.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index f46fda1d..cbccf0f7 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -13,7 +13,7 @@ POST Change external VNF connectivity
     ...    Test title: POST Change external VNF connectivity
     ...    Test objective: The objective is to test that POST method triggers a change in VNF external connectivity
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null         
@@ -26,7 +26,7 @@ GET Change external VNF connectivity - Method not implemented
     ...    Test title: GET Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.11.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ PUT Change external VNF connectivity - Method not implemented
     ...    Test title: PUT Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.11.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -50,7 +50,7 @@ PATCH Change external VNF connectivity - Method not implemented
     ...    Test title: PATCH Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.11.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -62,7 +62,7 @@ DELETE Change external VNF connectivity - Method not implemented
     ...    Test title: DELETE Change external VNF connectivity - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.11.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -74,7 +74,7 @@ POST Change external VNF connectivity Conflict
     ...    Test title: POST Change external VNF connectivity Conflict
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.11.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 37a3a533..0ad837b2 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -13,7 +13,7 @@ POST Change deployment flavour of a vnfInstance
     ...    Test title: POST Change deployment flavour of a vnfInstance
     ...    Test objective: The objective is to test that POST method trigger a change in VNF deployment flavour
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null  
@@ -26,7 +26,7 @@ POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -39,7 +39,7 @@ POST Change deployment flavour of a vnfInstance Not Found
     ...    Test title: POST Change deployment flavour of a vnfInstance Not Found
     ...    Test objective: The objective is to test that POST method cannot trigger a change in VNF deployment flavour because the VNF instance resource is not found. 
     ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.7.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -52,7 +52,7 @@ GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: GET Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.7.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -64,7 +64,7 @@ PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: PUT Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.7.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -76,7 +76,7 @@ PATCH Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: PATCH Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.7.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -88,7 +88,7 @@ DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test title: DELETE Change deployment flavour VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.7.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index 071e57c7..00c244dc 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -12,7 +12,7 @@ POST Fail operation task
     ...    Test title: POST Fail operation task
     ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -26,7 +26,7 @@ POST Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Fail operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" due to confilct with the state of LCM Operation Occurrence
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none     
@@ -39,7 +39,7 @@ POST Fail operation task Not Found
     ...    Test title: POST Fail operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation because the operation is not supported
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.16.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -52,7 +52,7 @@ GET Fail operation task - Method not implemented
     ...    Test title: GET Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.16.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Fail operation task - Method not implemented
     ...    Test title: PUT Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.16.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -76,7 +76,7 @@ PATCH Fail operation task - Method not implemented
     ...    Test title: PATCH Fail operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.16.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -88,7 +88,7 @@ DELETE Fail operation task - Method not implemented
     ...    Test title: DELETE Fail operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.16.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index 63508caf..3b72583e 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -13,7 +13,7 @@ POST Heal a vnfInstance
     ...    Test title: POST Heal a vnfInstance
     ...    Test objective: The objective is to test that POST method heal a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ POST Heal a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Heal a vnfInstance (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: the VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ POST Heal a vnfInstance Not Found
     ...    Test title: POST Heal a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed because the VNF instance resource is not found. 
     ...    Pre-conditions: the VNF instance resource is not existing
-    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET Heal VNFInstance - Method not implemented
     ...    Test title: GET Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.9.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PUT Heal VNFInstance - Method not implemented
     ...    Test title: PUT Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.9.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PATCH Heal VNFInstance - Method not implemented
     ...    Test title: PATCH Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.9.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Heal VNFInstance - Method not implemented
     ...    Test title: DELETE Heal a vnfInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.9.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
index 03e5e173..45052754 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -11,7 +11,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.19.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -23,7 +23,7 @@ GET Individual Subscription
     ...    Test title: GET Individual Subscription
     ...    Test objective: The objective is to test the Get individual subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.19.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title: PUT Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.19.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title: PATCH Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.19.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE an individual subscription
     ...    Test title: DELETE Individual Subscription
     ...    Test objective: The objective is to test that the DELETE method removes an individual subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.19.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 65aba97b..c50fd9f0 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -18,7 +18,7 @@ POST Individual VNFInstance - Method not implemented
     ...    Test title: POST Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -30,7 +30,7 @@ GET Information about an individual VNF Instance
     ...    Test title: GET Information about an individual VNF Instance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -44,7 +44,7 @@ PUT Individual VNFInstance - Method not implemented
     ...    Test title: PUT Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance not modified
@@ -56,7 +56,7 @@ PATCH Individual VNFInstance
     ...    Test title: PATCH Individual VNFInstance
     ...    Test objective: This method modifies an individual VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance modified
@@ -69,7 +69,7 @@ PATCH Individual VNFInstance Precondition failed
     ...    Test title: PATCH Individual VNFInstance Precondition failed
     ...    Test objective: The objective is to that the modification of individual VNFInstance fails because precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity.
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -82,7 +82,7 @@ PATCH Individual VNFInstance Conflict
     ...    Test title: PATCH Individual VNFInstance Conflict
     ...    Test objective: The objective is to verify that modification operation cannot be executed currently, due to a conflict with the state of the VNF instance resource because another LCM Operation is ongoing. 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -95,7 +95,7 @@ DELETE Individual VNFInstance
     ...    Test title: DELETE Individual VNFInstance
     ...    Test objective: The objective is to delete a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: VNF instance deleted
@@ -107,7 +107,7 @@ DELETE Individual VNFInstance Conflict
     ...    Test title: DELETE Individual VNFInstance Conflict
     ...    Test objective: The objective is to verify that The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource.
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
-    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFSnapshot.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFSnapshot.robot
new file mode 100644
index 00000000..c76466be
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFSnapshot.robot
@@ -0,0 +1,91 @@
+*** Settings ***
+Resource   environment/variables.txt 
+Resource   VnfLcmOperationKeywords.robot  
+
+*** Test Cases ***
+POST Individual VNF Snapshot - Method not implemented
+    [Documentation]    Test ID: 6.3.5.26.1
+    ...    Test title: POST Individual VNF Snapshot - Method not implemented
+    ...    Test objective: The objective is to test that POST method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.24.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    POST individual VNF Snapshot
+    Check HTTP Response Status Code Is    405
+    
+GET Information about an individual VNF Snapshot - SUCCESSFUL
+    [Documentation]    Test ID: 6.3.5.26.2
+    ...    Test title: GET Information about an individual VNF Snapshot - SUCCESSFUL
+    ...    Test objective: The objective is to create a new VNF Snapshot resource
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET individual VNF Snapshot
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    VnfSnapshotInfo
+        
+GET Information about an individual VNF Snapshot - NOT FOUND
+     [Documentation]    Test ID: 6.3.5.26.3
+    ...    Test title: GET Information about an individual VNF Snapshot - NOT FOUND
+    ...    Test objective: The objective is to test that the retrieval of individual VNF Snapshot fails when using an invalid resource identifier.
+    ...    Pre-conditions: At least one individual VNF Snapshot is available in the NFV-MANO.
+    ...    Reference: Clause 5.4.24.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_NFV-MANO
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET Individual VNF Snapshot with Invalid URI
+    Check HTTP Response Status Code Is    404
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+PUT Individual VNF Snapshot - Method not implemented 
+     [Documentation]    Test ID: 6.3.5.26.4
+    ...    Test title: PUT Individual VNF Snapshot - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not implemented
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.24.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: VNF Snapshot not modified
+    PUT individual VNF Snapshot
+    Check HTTP Response Status Code Is    405
+
+PATCH Individual VNF Snapshot - Method Not Allowed
+    [Documentation]    Test ID: 6.3.5.26.5
+    ...    Test title: PATCH Individual VNF Snapshot
+    ...    Test objective: This method modifies an individual VNF Snapshot resource
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.24.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: VNF Snapshot modified
+    PATCH individual VNF Snapshot
+    Check HTTP Response Status Code Is    405
+
+DELETE Individual VNF Snapshot
+    [Documentation]    Test ID: 6.3.5.26.6
+    ...    Test title: DELETE Individual VNF Snapshot
+    ...    Test objective: The objective is to delete a VNF Snapshot
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.24.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: VNF Snapshot deleted
+    DELETE individual VNF Snapshot
+    Check HTTP Response Status Code Is    204
+
+DELETE Individual VNF Snapshot - Conflict
+     [Documentation]    Test ID: 6.3.5.26.7
+    ...    Test title: DELETE Individual VNF Snapshot Conflict
+    ...    Test objective: The objective is to verify that The operation cannot be executed currently, due to a conflict with the state of the VNF Snapshot resource.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.24.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: VNF snapshot is in use by some operation such as reverting a VNF instance to a VNF snapshot or creating a VNF snapshot package.
+    ...    Post-Conditions: none
+    DELETE individual VNF Snapshot - CONFLICT
+    Check HTTP Response Status Code Is    409
+    Check HTTP Response Body Json Schema Is    ProblemDetails
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index cf5882df..1b640165 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -10,7 +10,7 @@ Post Individual VNF LCM OP occurrences - Method not implemented
     ...    Test title: Post Individual VNF LCM OP occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -22,7 +22,7 @@ Get status information about multiple VNF instances
     ...    Test title: Get status information about multiple VNF instances
     ...    Test objective: The objective is to test that this method retrieve status information about a VNF lifecycle management operation occurrence 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT status information about multiple VNF instances - Method not implemented
     ...    Test title: PUT status information about multiple VNF instances - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -48,7 +48,7 @@ PATCH status information about multiple VNF instances - Method not implemented
     ...    Test title: PATCH status information about multiple VNF instances - Method not implemented 
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -60,7 +60,7 @@ DELETE status information about multiple VNF instances - Method not implemented
     ...    Test title: DELETE status information about multiple VNF instances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.13.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none  
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 2c43ee7a..ec1d6fae 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -15,7 +15,7 @@ POST Instantiate a vnfInstance
     ...    Test title: POST Instantiate a vnfInstance
     ...    Test objective: The objective is to instantiate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -28,7 +28,7 @@ POST Instantiate a vnfInstance Conflict
     ...    Test title: POST Instantiate a vnfInstance Conflict
     ...    Test objective: The objective is to verify that the instantiation of the vnf cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
-    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -41,7 +41,7 @@ GET Instantiate VNFInstance - Method not implemented
     ...    Test title: GET Instantiate VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.4.3.2  - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ PUT Instantiate VNFInstance - Method not implemented
     ...    Test title: PUT Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.4.3.3  - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PATCH Instantiate VNFInstance - Method not implemented
     ...    Test title: PATCH Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.4.3.4  - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ DELETE Instantiate VNFInstance - Method not implemented
     ...    Test title: DELETE Instantiate VNFInstance  - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.4.3.5  - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
index 7befae05..375066cc 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationConsumer.robot
@@ -14,7 +14,7 @@ VNF LCM Operation Occurrence Notification
     ...    Test title: VNF LCM Operation Occurrence Start Notification
     ...    Test objective:  The objective is to test that VNF LCM Operation Occurrence Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -26,7 +26,7 @@ VNF Identifier Creation Notification
     ...    Test title: VNF Identifier Creation Notification
     ...    Test objective:  The objective is to test that VNF Identifier Creation Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for VNF Identifier Creation Notification is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -38,7 +38,7 @@ VNF Identifier Deletion Notification
     ...    Test title: VNF Identifier Deletion Notification
     ...    Test objective:  The objective is to test that VNF Identifier Deletion Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A subscription for VNF Identifier Deletion Notification is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 6a3ecfce..54704f21 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ VNF LCM Operation Occurrence Start Notification
     ...    Test title: VNF LCM Operation Occurrence Start Notification
     ...    Test objective: The objective is to test the dispatch of VNF LCM Operation Occurrence Start Notification when a new VNF LCM operation is started in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system. 
     ...    Pre-conditions: A subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ VNF LCM Operation Occurrence Result Notification
     ...    Test title: VNF LCM Operation Occurrence Result Notification
     ...    Test objective: The objective is to test the dispatch of VNF LCM Operation Occurrence Result Notification when a VNF LCM operation is completed in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: An VNF LCM operation is in progress, and a subscription for VNF LCM Operation Occurrence notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ VNF Identifier Creation Notification
     ...    Test title: VNF Identifier Creation Notification
     ...    Test objective: The objective is to test the dispatch of VNF Identifier Creation Notification when a new VNF instance resource is created in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A subscription for VNF identifier creation notifications is available in the VNFM.
-    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.20.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -54,7 +54,7 @@ VNF Identifier Deletion Notification
     ...    Test title: VNF Identifier Deletion Notification
     ...    Test objective: The objective is to test the dispatch of VNF Identifier Deletion Notification when a VNF instance resource is deleted in the VNFM, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF instance resource is created, and a subscription for VNF identifier creation notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index ccaea1ae..eaf8b083 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -13,7 +13,7 @@ POST Operate a vnfInstance
     ...    Test title: POST Operate a vnfInstance
     ...    Test objective: The objective is to test that POST method operate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Operate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: the VNF instance resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ POST Operate a vnfInstance Not Found
     ...    Test title: POST Operate a vnfInstance Not Found
     ...    Test objective: The objective is to test that the operation cannot be executed currently, because the resource is not existing
     ...    Pre-conditions: the VNF instance resource is in  not existing
-    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.10.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ GET Operate VNFInstance - Method not implemented
     ...    Test title: GET Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.10.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Operate VNFInstance - Method not implemented
     ...    Test title: PUT Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.10.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ PATCH Operate VNFInstance - Method not implemented
     ...    Test title: PATCH Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.10.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ DELETE Operate VNFInstance - Method not implemented
     ...    Test title: DELETE Operate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.10.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index 63871208..15f3ebd8 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -14,7 +14,7 @@ POST Retry operation task
     ...    Test title: POST Retry operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates retrying a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ POST Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Retry operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that the retry operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (i.e. the VNF instance resource is not in FAILED_TEMP state)
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -40,7 +40,7 @@ POST Retry operation task Not Found
     ...    Test title: POST Retry operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.14.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -53,7 +53,7 @@ GET Retry operation task - Method not implemented
     ...    Test title: GET Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.14.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ PUT Retry operation task - Method not implemented
     ...    Test title: PUT Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.14.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +77,7 @@ PATCH Retry operation task - Method not implemented
     ...    Test title: PATCH Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.14.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Retry operation task - Method not implemented
     ...    Test title: DELETE Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.14.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.14.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 382bd006..7e38d0f0 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -14,7 +14,7 @@ POST Rollback operation task
     ...    Test title: POST Rollback operation task
     ...    Test objective: The objective is to test that POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test title: POST Rollback operation task Conflict (Not-FAILED_TEMP)
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
     ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -40,7 +40,7 @@ POST Rollback operation task Not Found
     ...    Test title: POST Rollback operation task Not Found
     ...    Test objective: The objective is to test that the retry operation cannot be executed because the operation is not supported
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.15.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -53,7 +53,7 @@ GET Rollback operation task - Method not implemented
     ...    Test title: GET Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.15.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -65,7 +65,7 @@ PUT Rollback operation task - Method not implemented
     ...    Test title: PUT Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.15.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -77,7 +77,7 @@ PATCH Rollback operation task - Method not implemented
     ...    Test title: PATCH Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.15.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ DELETE Rollback operation task - Method not implemented
     ...    Test title: DELETE Rollback operation task - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.15.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 9e2a1070..8e5fe90e 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -13,7 +13,7 @@ POST Scale a vnfInstance
     ...    Test title: POST Scale a vnfInstance
     ...    Test objective: The objective is to scale a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Scale a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ POST Scale a vnfInstance Not Found
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: none 
-    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ GET Scale VNFInstance - Method not implemented
     ...    Test title: GET Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions: none  
-    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Scale VNFInstance - Method not implemented
     ...    Test title: PUT Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ PATCH Scale VNFInstance - Method not implemented
     ...    Test title: PATCH Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ DELETE Scale VNFInstance - Method not implemented
     ...    Test title: DELETE Scale VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 1afc0bd1..d1bccb6e 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -12,7 +12,7 @@ POST Scale a vnfInstance to level
     ...    Test title: POST Scale a vnfInstance to level
     ...    Test objective: The objective is to scale a VNF instance to a target level.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test title: POST Scale a vnfInstance to level Conflict (Not-Instantiated)
     ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set. 
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ POST Scale a vnfInstance Not Found
     ...    Test title: POST Scale a vnfInstance Not Found
     ...    Test objective: The objective is to verify that the VNF Scale operation fails when the VNF instance resource is not present
     ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
-    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none 
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ GET Scale to level VNFInstance - Method not implemented
     ...    Test title: GET Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PUT Scale to level VNFInstance - Method not implemented
     ...    Test title: PUT Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ PATCH Scale to level VNFInstance - Method not implemented
     ...    Test title: PATCH Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -87,7 +87,7 @@ DELETE Scale to level VNFInstance - Method not implemented
     ...    Test title: DELETE Scale to level VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index 65bff9a7..13a1206a 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -15,7 +15,7 @@ POST Create a new subscription
     ...    Test title: POST Create a new subscription
     ...    Test objective: The POST method creates a new subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: in response header Location shall not be null
@@ -28,7 +28,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
@@ -41,7 +41,7 @@ POST Create a new Subscription - NO-DUPLICATION
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The POST method creates a new subscription even if an existing subscription to same content exist
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: SUT should not support duplication of subscription creation
     ...    Post-Conditions: in response header Location shall not be null
@@ -54,7 +54,7 @@ GET Subscriptions
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -67,7 +67,7 @@ GET Subscription - Filter
     ...    Test title: GET Subscriptions - Filter
     ...    Test objective: The objective is Get the list of active subscriptions using a "filter"
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -80,7 +80,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is Get the list of active subscriptions using a filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -93,7 +93,7 @@ GET subscriptions - Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET subscriptions with all_fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -106,7 +106,7 @@ GET subscriptions with exclude_default attribute selector
     ...    Test title: GET subscriptions with exclude_default attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -119,7 +119,7 @@ GET subscriptions with fields attribute selector
     ...    Test title: GET subscriptions with fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -132,7 +132,7 @@ GET subscriptions with exclude_fields attribute selector
     ...    Test title: GET subscriptions with exclude_fields attribute selector
     ...    Test objective: The objective is Get the list of active subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -145,7 +145,7 @@ PUT subscriptions - Method not implemented
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -157,7 +157,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -169,7 +169,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.18.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: check that resources are not deleted
@@ -182,7 +182,7 @@ POST Create a new Subscription - Unprocessable Entity
     ...    Test title: POST Create a new Subscription - Unprocessable Entity
     ...    Test objective: The objective is to test that content type of the payload body is supported and the payload body of a request contains syntactically correct data but the data cannot be processed.
     ...    re-conditions: none
-    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -195,7 +195,7 @@ GET information about multiple subscriptions to get Paged Response
     ...    Test title: GET information about multiple subscriptions to get Paged Response
     ...    Test objective: The objective is to retrieve information about the subscriptions to get paged response
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions:  
@@ -208,7 +208,7 @@ GET information about multiple subscriptions for Bad Request Response too big
     ...    Test title: GET information about multiple subscriptions for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about subscriptions when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: 
-    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.18.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: 
     ...    Post-Conditions: 
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index 56ef35f6..a5799b24 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -13,7 +13,7 @@ POST Terminate a vnfInstance
     ...    Test title: POST Terminate a vnfInstance
     ...    Test objective: The objective is to test that POST method terminate a VNF instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test title: POST Terminate a vnfInstance Conflict (Not-Instantiated)
     ...    Test objective: The objective is to test that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource or that a required child attribute of the "extensions" attribue has not been set.  
     ...    Pre-conditions:  VNF instance resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.8.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ GET Terminate VNFInstance - Method not implemented
     ...    Test title:  GET Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.8.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Terminate VNFInstance - Method not implemented
     ...    Test title:  PUT Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.8.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PATCH Terminate VNFInstance - Method not implemented
     ...    Test title:  PATCH Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.8.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ DELETE Terminate VNFInstance - Method not implemented
     ...    Test title:  DELETE Terminate VNFInstance - Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.8.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFLifecycleManagement-API/VNFSnapshots.robot b/SOL002/VNFLifecycleManagement-API/VNFSnapshots.robot
new file mode 100644
index 00000000..bd87090b
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/VNFSnapshots.robot
@@ -0,0 +1,184 @@
+*** Settings ***
+Resource    environment/variables.txt  
+Resource    VnfLcmOperationKeywords.robot
+
+*** Test Cases ***
+POST Create a new VNF Snapshot
+    [Documentation]    Test ID: 6.3.5.25.1
+    ...    Test title: POST Create a new VNF Snapshot
+    ...    Test objective: The objective is to create a new VNF snapshot
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.23.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: VNF snapshot is created
+    POST Create a new VNF Snapshot
+    Check HTTP Response Status Code Is    201
+    Check HTTP Response Body Json Schema Is    VnfSnapshotInfo
+    Check HTTP Location Header Contains URI of Created Resource
+
+GET information about multiple VNF Snapshots  
+    [Documentation]    Test ID: 6.3.5.25.2
+    ...    Test title: GET information about multiple VNF Snapshots
+    ...    Test objective: The objective is to get information about multiples VNF snapshots
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple VNF Snapshots
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    VnfSnapshotsInfo
+    
+GET information about multiple VNF Snapshots Bad Request Invalid attribute-based filtering parameters
+    [Documentation]    Test ID: 6.3.5.25.3
+    ...    Test title: GET information about multiple VNF Snapshots Bad Request Invalid attribute-based filtering parameters
+    ...    Test objective: The objective is to get information about multiples VNF Snapshots with Invalid attribute-based filtering parameters
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple VNF Snapshots with bad attribute
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+GET information about multiple VNF Snapshots Bad Request Invalid attribute selector
+    [Documentation]    Test ID: 6.3.5.25.4
+    ...    Test title: GET information about multiple VNF Snapshots Bad Request Invalid attribute selector
+    ...    Test objective: The objective is to get information about multiples VNF Snapshots with Invalid attribute-based filtering parameters
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple VNF Snapshots with bad filter
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
+GET information about multiple VNF Snapshots with "all_fields" attribute selector
+    [Documentation]    Test ID: 6.3.5.25.5
+    ...    Test title: GET information about multiple VNF Snapshots with "all_fields" attribute selector
+    ...    Test objective: The objective is to query information about multiple VNF Snapshots
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple VNF Snapshots with all_fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    VnfSnapshotsInfo
+
+GET information about multiple VNF Snapshots with "exclude_default" attribute selector
+    [Documentation]    Test ID: 6.3.5.25.6
+    ...    Test title: GET information about multiple VNF Snapshots with "exclude_default" attribute selector
+    ...    Test objective: The objective is to query information about multiple VNF Snapshots
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple VNF Snapshots with exclude_default attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    VnfSnapshotsInfo
+    
+GET information about multiple VNF Snapshots with "fields" attribute selector
+    [Documentation]    Test ID: 6.3.5.25.7
+    ...    Test title: GET information about multiple VNF Snapshots with "fields" attribute selector
+    ...    Test objective: The objective is to query information about multiple VNF Snapshots
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple VNF Snapshots with fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    VnfSnapshotsInfo
+
+GET information about multiple VNF Snapshots with "exclude_default" and "fields" attribute selector
+    [Documentation]    Test ID: 6.3.5.25.8
+    ...    Test title: GET information about multiple VNF Snapshots with "exclude_default" and "fields" attribute selector
+    ...    Test objective: The objective is to query information about multiple VNF Snapshots
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple VNF Snapshots with exclude_default and fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    VnfSnapshotsInfo
+    
+GET information about multiple VNF Snapshots with "exclude_fields" attribute selector
+    [Documentation]    Test ID: 6.3.5.25.9
+    ...    Test title: GET information about multiple VNF Snapshots with "exclude_fields" attribute selector
+    ...    Test objective: The objective is to query information about multiple VNF Snapshots
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    GET multiple VNF Snapshots with exclude_fields attribute selector
+    Check HTTP Response Status Code Is    200
+    Check HTTP Response Body Json Schema Is    VnfSnapshotsInfo  
+    
+GET VNF Snapshots - Bad Request Response too Big
+    [Documentation]    Test ID: 6.3.5.25.10
+    ...    Test title: GET VNF Snapshots - Bad Request Response too Big
+    ...    Test objective: The objective is test that the retrieval of existing VNF Snapshots list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: VNFM does not support paged response.
+    ...    Post-Conditions: none 
+    GET VNF Snapshots without Paging support
+    Check HTTP Response Status Code Is    400
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+
+GET VNF Snapshots as Paged Response
+    [Documentation]    Test ID: 6.3.5.25.11
+    ...    Test title: GET VNF Snapshots as Paged Response
+    ...    Test objective: The objective is to test that GET method retrieves the list of existing VNF Snapshots as paged response.
+    ...    Pre-conditions: none
+    ...    Reference: Clause 5.4.23.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: VNFM supports paged response.
+    ...    Post-Conditions: none    
+    GET VNF Snapshots with Paging support
+    Check HTTP Response Status Code Is  200
+    Check HTTP Response Header Contains Link
+        
+PUT VNF Snapshots - Method not implemented
+    [Documentation]    Test ID: 6.3.5.25.12
+    ...    Test title: PUT VNF Snapshots - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not implemented
+    ...    Pre-conditions:  none
+    ...    Reference: Clause 5.4.23.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PUT VNF Snapshots
+    Check HTTP Response Status Code Is    405
+
+PATCH VNF Snapshots - Method not implemented
+    [Documentation]    Test ID: 6.3.5.25.13
+    ...    Test title: PATCH VNF Snapshots - Method not implemented
+    ...    Test objective: The objective is to test that PATCH method is not implemented
+    ...    Pre-conditions: none 
+    ...    Reference: Clause 5.4.23.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: none
+    PATCH VNF Snapshots
+    Check HTTP Response Status Code Is    405
+
+DELETE VNF Snapshots - Method not implemented
+    [Documentation]    Test ID: 6.3.5.25.11
+    ...    Test title: DELETE VNF Snapshots - Method not implemented
+    ...    Test objective: The objective is to test that PUT method is not implemented
+    ...    Pre-conditions: none 
+    ...    Reference: Clause 5.4.23.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
+    ...    Config ID: Config_prod_VE
+    ...    Applicability: none
+    ...    Post-Conditions: VNF instance not deleted
+    DELETE VNF Snapshots
+    Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
index bb432d41..f1867db7 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationKeywords.robot
@@ -38,6 +38,10 @@ Check Operation Occurrence Id
     ${vnfLcmOpOccId}=    Get Value From Json    ${response['headers']}    $..Location
     Should Not Be Empty    ${vnfLcmOpOccId}
 
+Check HTTP Location Header Contains URI of Created Resource
+    ${URI}=    Get Value From Json    ${response['headers']}    $..Location
+    Should Not Be Empty    ${URI}
+
 Check HTTP Response Body Json Schema Is
     [Arguments]    ${input}
     ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
@@ -188,6 +192,117 @@ DELETE multiple vnfInstances
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}   
 
+POST Create a new VNF Snapshot	
+    Log    Create VNF snapshot by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/CreateVnfSnapshotInfoRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots    ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 	
+
+GET multiple VNF Snapshots	
+    Log    Query VNF The GET method queries information about multiple VNF snapshots.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots 
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 		
+
+GET multiple VNF Snapshots with bad attribute	
+    Log    Query VNF The GET method queries information about multiple VNF snapshots.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots?attribute_not_exist=some_value
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 	
+
+GET multiple VNF Snapshots with bad filter	
+    Log    Query VNF The GET method queries information about multiple VNF snapshots.
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"} 
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots?fields=wrong_field
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 	
+	
+GET multiple VNF Snapshots with all_fields attribute selector
+    Log    Query status information about multiple VNF snapshots, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots?exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET multiple VNF Snapshots with exclude_default attribute selector
+    Log    Query status information about multiple VNF snapshots using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots?exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET multiple VNF Snapshots with fields attribute selector
+    Log    Query status information about multiple VNF snapshots, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots?fields=${fields}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}	    
+    
+GET multiple VNF Snapshots with exclude_default and fields attribute selector
+    Log    Query status information about multiple VNF snapshots, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots?fields=${fields}&exclude_default
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+GET multiple VNF Snapshots with exclude_fields attribute selector
+    Log    Query status information about multiple VNF snapshots, using fields
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots?exclude_fields=${fields}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output} 	
+
+GET VNF Snapshots without Paging support
+    Run Keyword If    ${PAGING_SUPPORTED} == 0    GET multiple VNF Snapshots
+    
+GET VNF Snapshots with Paging support
+    Run Keyword If    ${PAGING_SUPPORTED} == 1    GET multiple VNF Snapshots
+    
+Check HTTP Response Header Contains Link
+    ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
+    Should Not Be Empty    ${linkURL}
+
+PUT VNF Snapshots
+    log    Trying to perform a PUT. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots   	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+PATCH VNF Snapshots
+    Log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots	 	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}
+	
+DELETE VNF Snapshots
+    Log    Trying to perform a DELETE. This method should not be implemented
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snaphots 	 	
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}   
+
 POST individual vnfInstance
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -227,6 +342,7 @@ PATCH individual vnfInstance
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+	
 DELETE individual vnfInstance
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
@@ -234,6 +350,69 @@ DELETE individual vnfInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
+POST individual VNF Snapshot
+    log    Trying to perform a POST. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId}    
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}        
+
+GET individual VNF Snapshot
+    log    Trying to get information about an individual VNF snapshot
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}      
+
+GET individual VNF Snapshot with invalid URI
+    log    Trying to get information about an individual VNF snapshot
+    Set Headers    {"Accept":"${ACCEPT}"}  
+    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${invalidVnfSnapshotInfoId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse}      
+	
+PUT individual VNF Snapshot
+    log    Trying to perform a PUT. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+PATCH individual VNF Snapshot
+    log    Trying to perform a PATCH. This method should not be implemented
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+DELETE individual VNF Snapshot
+    log    Trying to DELETE an individual VNF Snapshot
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+DELETE individual VNF Snapshot - CONFLICT
+    log    Trying to DELETE an individual VNF Snapshot that is already in use by another operation
+    Set Headers  {"Accept":"${ACCEPT}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_snapshots/${vnfSnapshotInfoId_InUse} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
 POST instantiate individual vnfInstance	
     Log    Trying to Instantiate a vnf Instance
     Set Headers  {"Accept":"${ACCEPT}"}  
@@ -273,7 +452,6 @@ DELETE instantiate individual vnfInstance
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
 	
-
 POST Scale vnfInstance
     [Arguments]    ${vnf_state}
     [Documentation]    ${vnf_state} differentiate the VNF ID to be used in the different POST requests
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index d5e329d3..37a48e47 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -13,7 +13,7 @@ POST VNF LCM operation occurrences - Method not implemented
     ...    Test title: POST VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.1 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ GET status information about multiple VNF LCM operation occurrences
     ...    Test title: GET status information about multiple VNF LCM operation occurrences
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -39,7 +39,7 @@ GET status information about multiple VNF LCM operation occurrences Bad Request
     ...    Test title: GET status information about multiple VNF LCM operation occurrences Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -52,7 +52,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     ...    Test title: GET status information about multiple VNF LCM Operation occurrences Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -65,7 +65,7 @@ GET status information about multiple VNF LCM Operation occurrences with "all_fi
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "all_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -78,7 +78,7 @@ GET status information about multiple VNF LCM Operation occurrences with "exlude
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -91,7 +91,7 @@ GET status information about multiple VNF LCM Operation occurrences with "fields
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -104,7 +104,7 @@ GET status information about multiple VNF LCM Operation occurrences with "exclud
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -117,7 +117,7 @@ PUT status information about multiple VNF LCM operation occurrences - Method not
     ...    Test title: PUT status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.3 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -129,7 +129,7 @@ PATCH status information about multiple VNF LCM operation occurrences - Method n
     ...    Test title: PATCH status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.4 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -141,7 +141,7 @@ DELETE status information about multiple VNF LCM operation occurrences - Method
     ...    Test title: DELETE status information about multiple VNF LCM operation occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.5 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -153,7 +153,7 @@ GET status information about multiple VNF LCM operation occurances to get Paged
     ...    Test title: GET status information about multiple VNF LCM operation occurances to get Paged Response
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences to get paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -166,7 +166,7 @@ GET status information about multiple VNF LCM Operation occurrences Bad Request
     ...    Test title: GET status information about multiple VNF LCM Operation occurrences Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because Response is too big.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -179,7 +179,7 @@ GET status information about multiple VNF LCM Operation occurrences with "exlude
     ...    Test title: GET status information about multiple VNF LCM Operation OCC with "exclude_default" and "fields"
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
-    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 5.4.12.3.2 - ETSI GS NFV-SOL 002 [2] v3.3.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none   
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index a6a16693..e16cba00 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -45,8 +45,11 @@ ${notInstantiatedVnfInstanceId}    NOT_INSTANTIATED_VNF_INSTANCE_ID
 ${NOT_EXISTANT_VNF_INSTANCE_ID}    NOT_EXISTANT_VNF_INSTANCE_ID    
 ${SYNC_MODE}    0
 
+${PAGING_SUPPORTED}    0
+
 ${vnfSnapshotInfoId}
 ${invalidVnfSnapshotInfoId}
+${vnfSnapshotInfoId_InUse}    snapshotId-of-a-resource-AlreadyInUse
 
 ${callback_uri}    http://localhost
 ${callback_port}    9091
diff --git a/SOL002/VNFLifecycleManagement-API/jsons/CreateVnfSnapshotInfoRequest.json b/SOL002/VNFLifecycleManagement-API/jsons/CreateVnfSnapshotInfoRequest.json
new file mode 100644
index 00000000..55fd9aa6
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/jsons/CreateVnfSnapshotInfoRequest.json
@@ -0,0 +1,3 @@
+{
+  "vnfSnapshotPkgId": ""
+}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotInfo.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotInfo.schema.json
new file mode 100644
index 00000000..7f4f90f3
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotInfo.schema.json
@@ -0,0 +1,1531 @@
+{
+  "description": "This type represents an individual VNF snapshot resource.\n",
+  "type": "object",
+  "required": [
+    "id"
+  ],
+  "properties": {
+    "id": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "vnfSnapshotPkgId": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "vnfSnapshot": {
+      "description": "This type represents a VNF snapshot.\n",
+      "type": "object",
+      "required": [
+        "id",
+        "vnfInstanceId",
+        "triggeredAt",
+        "vnfdId",
+        "vnfInfo",
+        "vnfcSnapshots"
+      ],
+      "properties": {
+        "id": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "vnfInstanceId": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "creationStartedAt": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "creationFinishedAt": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "vnfdId": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "vnfInstance": {
+          "description": "This type represents a VNF instance.\n",
+          "type": "object",
+          "required": [
+            "id",
+            "vnfdId",
+            "vnfProvider",
+            "vnfProductName",
+            "vnfSoftwareVersion",
+            "vnfdVersion",
+            "instantiationState",
+            "_links"
+          ],
+          "properties": {
+            "id": {
+              "description": "An identifier with the intention of being globally unique.\n",
+              "type": "string"
+            },
+            "vnfInstanceName": {
+              "description": "Name of the VNF instance. This attribute can be modified with the PATCH method.\n",
+              "type": "string"
+            },
+            "vnfInstanceDescription": {
+              "description": "Human-readable description of the VNF instance. This attribute can be modified with the PATCH method.\n",
+              "type": "string"
+            },
+            "vnfdId": {
+              "description": "An identifier with the intention of being globally unique.\n",
+              "type": "string"
+            },
+            "vnfProvider": {
+              "description": "Provider of the VNF and the VNFD. The value is copied from the VNFD.\n",
+              "type": "string"
+            },
+            "vnfProductName": {
+              "description": "Name to identify the VNF Product. The value is copied from the VNFD.\n",
+              "type": "string"
+            },
+            "vnfSoftwareVersion": {
+              "description": "A version.\n",
+              "type": "string"
+            },
+            "vnfdVersion": {
+              "description": "A version.\n",
+              "type": "string"
+            },
+            "vnfConfigurableProperties": {
+              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+              "type": "object"
+            },
+            "instantiationState": {
+              "description": "The instantiation state of the VNF.\n",
+              "type": "string",
+              "enum": [
+                "NOT_INSTANTIATED",
+                "INSTANTIATED"
+              ]
+            },
+            "instantiatedVnfInfo": {
+              "description": "Information specific to an instantiated VNF instance. This attribute shall be present if the instantiateState attribute value is INSTANTIATED.\n",
+              "type": "object",
+              "required": [
+                "flavourId",
+                "vnfState",
+                "extCpInfo"
+              ],
+              "properties": {
+                "flavourId": {
+                  "description": "An identifier that is unique within a VNF descriptor.\n",
+                  "type": "string"
+                },
+                "vnfState": {
+                  "description": "STARTED: The VNF instance is up and running. STOPPED: The VNF instance has been shut down.\n",
+                  "type": "string",
+                  "enum": [
+                    "STARTED",
+                    "STOPPED"
+                  ]
+                },
+                "scaleStatus": {
+                  "description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect.\n",
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "aspectId",
+                      "scaleLevel"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "aspectId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "scaleLevel": {
+                        "description": "Indicates the scale level. The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.\n",
+                        "type": "integer"
+                      }
+                    }
+                  }
+                },
+                "maxScaleLevels": {
+                  "description": "Maximum allowed scale levels of the VNF, one entry per aspect. This attribute shall be present if the VNF supports scaling.\n",
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "aspectId",
+                      "scaleLevel"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "aspectId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "scaleLevel": {
+                        "description": "Indicates the scale level. The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.\n",
+                        "type": "integer"
+                      }
+                    }
+                  }
+                },
+                "extCpInfo": {
+                  "description": "Information about the external CPs exposed by the VNF instance. When trunking is enabled, the list of entries includes both, external CPs corresponding to parent ports of a trunk, and external CPs associated to sub-ports of a trunk.\n",
+                  "type": "array",
+                  "minItems": 1,
+                  "items": {
+                    "description": "This type represents information about an external CP of a VNF. It shall comply with the provisions defined in table 5.5.3.25 1.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "cpdId",
+                      "cpConfigId",
+                      "cpProtocolInfo"
+                    ],
+                    "oneOf": [
+                      {
+                        "required": [
+                          "associatedVnfcCpId"
+                        ]
+                      },
+                      {
+                        "required": [
+                          "associatedVnfVirtualLinkId"
+                        ]
+                      }
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "cpdId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "cpConfigId": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "cpProtocolInfo": {
+                        "description": "Network protocol information for this CP.\n",
+                        "type": "array",
+                        "items": {
+                          "description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
+                          "type": "object",
+                          "required": [
+                            "layerProtocol"
+                          ],
+                          "properties": {
+                            "layerProtocol": {
+                              "description": "The identifier of layer(s) and protocol(s) associated to the network address information. Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
+                              "type": "string",
+                              "enum": [
+                                "IP_OVER_ETHERNET"
+                              ]
+                            },
+                            "ipOverEthernet": {
+                              "description": "This type represents information about a network address that has been assigned.\n",
+                              "type": "object",
+                              "anyOf": [
+                                {
+                                  "required": [
+                                    "macAddress"
+                                  ]
+                                },
+                                {
+                                  "required": [
+                                    "ipAddresses"
+                                  ]
+                                }
+                              ],
+                              "oneOf": [
+                                {
+                                  "required": [
+                                    "addresses"
+                                  ]
+                                },
+                                {
+                                  "required": [
+                                    "addressRange"
+                                  ]
+                                }
+                              ],
+                              "properties": {
+                                "macAddress": {
+                                  "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
+                                  "type": "string",
+                                  "format": "MAC"
+                                },
+                                "segmentationId": {
+                                  "description": "Identification of the network segment to which the Cp instance connects to. If the Cp instance represents a subport in a trunk, segmentationId shall be present.  Otherwise it shall not be present. Depending on the NFVI networking infrastructure, the segmentationId may indicate the actual network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the transport header of the packets or it may be an identifier used between the application and the NFVI networking infrastructure to identify the network sub-interface of the trunk port in question. In the latter case the NFVI infrastructure will map this local segmentationId to whatever segmentationId is actually used by the NFVI’s transport technology.\n",
+                                  "type": "string"
+                                },
+                                "ipAddresses": {
+                                  "description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet. At least one of \"macAddress\" or \"ipAddresses\" shall be present.\n",
+                                  "type": "array",
+                                  "items": {
+                                    "type": "object",
+                                    "required": [
+                                      "type"
+                                    ],
+                                    "properties": {
+                                      "type": {
+                                        "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
+                                        "type": "string",
+                                        "enum": [
+                                          "IPV4",
+                                          "IPV6"
+                                        ]
+                                      },
+                                      "addresses": {
+                                        "description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided). Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                        "type": "array",
+                                        "items": {
+                                          "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                          "type": "string",
+                                          "format": "IP"
+                                        }
+                                      },
+                                      "isDynamic": {
+                                        "description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
+                                        "type": "boolean"
+                                      },
+                                      "addressRange": {
+                                        "description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                        "type": "object",
+                                        "required": [
+                                          "minAddress",
+                                          "maxAddress"
+                                        ],
+                                        "properties": {
+                                          "minAddress": {
+                                            "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                            "type": "string",
+                                            "format": "IP"
+                                          },
+                                          "maxAddress": {
+                                            "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                            "type": "string",
+                                            "format": "IP"
+                                          }
+                                        }
+                                      },
+                                      "subnetId": {
+                                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                        "type": "string"
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      },
+                      "extLinkPortId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "metadata": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      },
+                      "associatedVnfcCpId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "associatedVnfVirtualLinkId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      }
+                    }
+                  }
+                },
+                "extVirtualLinkInfo": {
+                  "description": "Information about the external VLs the VNF instance is connected to.\n",
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "resourceHandle",
+                      "currentVnfExtCpData"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "resourceHandle": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "extLinkPorts": {
+                        "description": "Link ports of this VL.\n",
+                        "type": "array",
+                        "items": {
+                          "description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL.\n",
+                          "type": "object",
+                          "required": [
+                            "id",
+                            "resourceHandle"
+                          ],
+                          "properties": {
+                            "id": {
+                              "description": "An identifier with the intention of being globally unique.\n",
+                              "type": "string"
+                            },
+                            "resourceHandle": {
+                              "required": [
+                                "resourceId"
+                              ],
+                              "type": "object",
+                              "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                              "properties": {
+                                "vimConnectionId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceProviderId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceId": {
+                                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                  "type": "string"
+                                },
+                                "vimLevelResourceType": {
+                                  "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                                  "type": "string"
+                                }
+                              }
+                            },
+                            "cpInstanceId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            }
+                          }
+                        }
+                      },
+                      "currentVnfExtCpData": {
+                        "description": "Allows the API consumer to read the current CP configuration information for the connection of external CPs to the external virtual link. This attribute reflects the current configuration information that has resulted from merging into this attribute the \"VnfExtCpData\" information which was passed as part of the \"ExtVirtualLinkData\" structure in the input of the most recent VNF LCM operation such as \"InstantiateVnfRequest\", \"ChangeExtVnfConnectivityRequest\", \"ChangeVnfFlavourRequest\" or \"ChangeCurrentVnfPkgRequest\", or has been provided by the NFVO during the granting procedure. If applying such change results in an empty list of \"currentVnfExtCpData\" structure instances, the affected instance of \"ExtVirtualLinkInfo\" shall be removed from its parent data structure.\n",
+                        "type": "array",
+                        "items": {
+                          "description": "This type represents configuration information for external CPs created from a CPD.\n",
+                          "type": "object",
+                          "required": [
+                            "cpdId"
+                          ],
+                          "properties": {
+                            "cpdId": {
+                              "description": "An identifier that is unique within a VNF descriptor.\n",
+                              "type": "string"
+                            },
+                            "cpConfig": {
+                              "description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is managed by the API consumer. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). Within one VNF instance, all VNFC instances created from a particular VDU have the same external connectivity. Thus, given a particular value of the “cpdId” attribute, there shall be one “cpConfig” entry for each VNFC instance that has been or can be created from a VDU which includes a CPD identified by the “cpdId” attribute. If the cpConfig represents a subport in a trunk, all “cpConfig” entries in this list shall have the same segmentationId, which means they are connected to the same set of external VLs via the trunk. The map entry value shall be set to \"null\" in order to delete a \"VnfExtCpConfig\" entry identified by a particular key value from the map, i.e. for the disconnection of an existing external CP instance addressed by cpInstanceId in the deleted map entry from a particular external virtual link, and deletion of that instance in case it represents a subport. Deleting the last key from the map removes the affected instance of the \"VnfExtCpData\" structure from its parent data structure.\n",
+                              "type": "object",
+                              "additionalProperties": {
+                                "description": "This type represents an externally provided link port or network address information per instance of an external connection point. In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the external VL. In a link port is not provided, the VNFM shall create a link port on the external VL, and use that link port to connect the external CP to the external VL.\n",
+                                "anyOf": [
+                                  {
+                                    "required": [
+                                      "linkPortId"
+                                    ]
+                                  },
+                                  {
+                                    "required": [
+                                      "cpProtocolData"
+                                    ]
+                                  }
+                                ],
+                                "type": "object",
+                                "properties": {
+                                  "parentCpConfigId": {
+                                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                                    "type": "string"
+                                  },
+                                  "linkPortId": {
+                                    "description": "An identifier with the intention of being globally unique.\n",
+                                    "type": "string"
+                                  },
+                                  "cpProtocolData": {
+                                    "description": "Parameters for configuring the network protocols on the link port that connects the CP to a VL. The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\": 1) Void 2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes \n   shall be present for an external CP instance representing a subport \n   that is to be created, or an external CP instance that is to be created \n   by creating the corresponding VNFC or VNF instance during the current or \n   a subsequent LCM operation, or for an existing external CP instance \n   that is to be re-configured or added to a particular external virtual link.\n3) If the \"linkPortId\" attribute is absent, the VNFM shall create a\n   link port.\n4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\"\n   attribute shall be provided referencing a pre-created link port,\n   and the VNFM can use means outside the scope of the present\n   document to obtain the pre-configured address information for the\n   connection point from the resource representing the link port.\n5) If both \"cpProtocolData\" and \"linkportId\" are provided, the API\n   consumer shall ensure that the cpProtocolData can be used with the\n   pre-created link port referenced by \"linkPortId\".\n",
+                                    "type": "array",
+                                    "items": {
+                                      "description": "This type represents network protocol data.\n",
+                                      "type": "object",
+                                      "required": [
+                                        "layerProtocol"
+                                      ],
+                                      "properties": {
+                                        "layerProtocol": {
+                                          "description": "Identifier of layer(s) and protocol(s). This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
+                                          "type": "string",
+                                          "enum": [
+                                            "IP_OVER_ETHERNET"
+                                          ]
+                                        },
+                                        "ipOverEthernet": {
+                                          "description": "This type represents network address data for IP over Ethernet.\n",
+                                          "type": "object",
+                                          "anyOf": [
+                                            {
+                                              "required": [
+                                                "macAddress"
+                                              ]
+                                            },
+                                            {
+                                              "required": [
+                                                "ipAddresses"
+                                              ]
+                                            }
+                                          ],
+                                          "oneOf": [
+                                            {
+                                              "required": [
+                                                "fixedAddresses"
+                                              ]
+                                            },
+                                            {
+                                              "required": [
+                                                "numDynamicAddresses"
+                                              ]
+                                            },
+                                            {
+                                              "required": [
+                                                "ipAddressRange"
+                                              ]
+                                            }
+                                          ],
+                                          "properties": {
+                                            "macAddress": {
+                                              "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
+                                              "type": "string",
+                                              "format": "MAC"
+                                            },
+                                            "segmentationId": {
+                                              "description": "Identification of the network segment to which the Cp instance connects to. If the Cp instance represents a subport in a trunk, segmentationId shall be present. Otherwise it shall not be present. Depending on the NFVI networking infrastructure, the segmentationId may indicate the actual network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the transport header of the packets or it may be an identifier used between the application and the NFVI networking infrastructure to identify the network sub-interface of the trunk port in question. In the latter case the NFVI infrastructure will map this local segmentationId to whatever segmentationId is actually used by the NFVI’s transport technology.\n",
+                                              "type": "string"
+                                            },
+                                            "ipAddresses": {
+                                              "description": "List of IP addresses to assign to the CP instance. Each entry represents IP address data for fixed or dynamic IP address assignment per subnet. If this attribute is not present, no IP address shall be assigned.\n",
+                                              "type": "array",
+                                              "items": {
+                                                "type": "object",
+                                                "required": [
+                                                  "type"
+                                                ],
+                                                "properties": {
+                                                  "type": {
+                                                    "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
+                                                    "type": "string",
+                                                    "enum": [
+                                                      "IPV4",
+                                                      "IPV6"
+                                                    ]
+                                                  },
+                                                  "fixedAddresses": {
+                                                    "description": "Fixed addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
+                                                    "type": "array",
+                                                    "items": {
+                                                      "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                      "type": "string",
+                                                      "format": "IP"
+                                                    }
+                                                  },
+                                                  "numDynamicAddresses": {
+                                                    "description": "Number of dynamic addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
+                                                    "type": "integer"
+                                                  },
+                                                  "addressRange": {
+                                                    "description": "An IP address range to be used, e.g. in case of egress connections. In case this attribute is present, IP addresses from the range will be used.\n",
+                                                    "type": "object",
+                                                    "required": [
+                                                      "minAddress",
+                                                      "maxAddress"
+                                                    ],
+                                                    "properties": {
+                                                      "minAddress": {
+                                                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                        "type": "string",
+                                                        "format": "IP"
+                                                      },
+                                                      "maxAddress": {
+                                                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                        "type": "string",
+                                                        "format": "IP"
+                                                      }
+                                                    }
+                                                  },
+                                                  "subnetId": {
+                                                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                                    "type": "string"
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "extManagedVirtualLinkInfo": {
+                  "description": "External virtual links the VNF instance is connected to. It is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n",
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "vnfVirtualLinkDescId",
+                      "networkResource"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfVirtualLinkDescId": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "networkResource": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "vnfLinkPorts": {
+                        "description": "Link ports of this VL.\n",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "required": [
+                            "id",
+                            "resourceHandle"
+                          ],
+                          "properties": {
+                            "id": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "resourceHandle": {
+                              "required": [
+                                "resourceId"
+                              ],
+                              "type": "object",
+                              "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                              "properties": {
+                                "vimConnectionId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceProviderId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceId": {
+                                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                  "type": "string"
+                                },
+                                "vimLevelResourceType": {
+                                  "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                                  "type": "string"
+                                }
+                              }
+                            },
+                            "cpInstanceId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "cpInstanceType": {
+                              "description": "Type of the CP instance that is identified by cpInstanceId. Shall be present if \"cpInstanceId\" is present, and shall be absent otherwise. Permitted values: VNFC_CP: The link port is connected to a VNFC CP EXT_CP: The link port is associated to an external CP.\n",
+                              "type": "string",
+                              "enum": [
+                                "VNFC_CP",
+                                "EXT_CP"
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "monitoringParameters": {
+                  "description": "Active monitoring parameters.\n",
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "performanceMetric"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "name": {
+                        "description": "Human readable name of the monitoring parameter, as defined in the VNFD.\n",
+                        "type": "string"
+                      },
+                      "performanceMetric": {
+                        "description": "Performance metric that is monitored. This attribute shall contain the related \"Measurement Name\" value as defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+                        "type": "string"
+                      }
+                    }
+                  }
+                },
+                "localizationLanguage": {
+                  "description": "Information about localization language of the VNF (includes e.g. strings in the VNFD). The localization languages supported by a VNF can be declared in the VNFD, and localization language selection can take place at instantiation time. The value shall comply with the format defined in IETF RFC 5646.\n",
+                  "type": "string"
+                },
+                "vnfcResourceInfo": {
+                  "description": "Information about the virtualised compute and storage resources used by the VNFCs of the VNF instance.\n",
+                  "type": "array",
+                  "items": {
+                    "description": "This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "vduId",
+                      "computeResource",
+                      "vnfcCpInfo"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vduId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "computeResource": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "storageResourceIds": {
+                        "description": "References to the VirtualStorage resources. The value refers to a VirtualStorageResourceInfo item in the VnfInstance.\n",
+                        "type": "array",
+                        "items": {
+                          "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                          "type": "string"
+                        }
+                      },
+                      "reservationId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfcCpInfo": {
+                        "description": "All the CPs of the VNFC instance. Shall be present when that particular CP of the VNFC instance is exposed as an external CP of the VNF instance or is connected to an external CP of the VNF instance. A VNFC CP is \"connected to\" an external CP if the VNFC CP is connected to an internal VL that exposes an external CP. A VNFC CP is \"exposed as\" an external CP if it is connected directly to an external VL. May be present otherwise.\n",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "required": [
+                            "id",
+                            "cpdId"
+                          ],
+                          "properties": {
+                            "id": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "cpdId": {
+                              "description": "An identifier that is unique within a VNF descriptor.\n",
+                              "type": "string"
+                            },
+                            "vnfExtCpId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "cpProtocolInfo": {
+                              "description": "Network protocol information for this CP. May be omitted if the VNFC CP is exposed as an external CP. The information can be omitted because it is already available as part of the external CP information.\n",
+                              "type": "array",
+                              "items": {
+                                "description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
+                                "type": "object",
+                                "required": [
+                                  "layerProtocol"
+                                ],
+                                "properties": {
+                                  "layerProtocol": {
+                                    "description": "The identifier of layer(s) and protocol(s) associated to the network address information. Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
+                                    "type": "string",
+                                    "enum": [
+                                      "IP_OVER_ETHERNET"
+                                    ]
+                                  },
+                                  "ipOverEthernet": {
+                                    "description": "This type represents information about a network address that has been assigned.\n",
+                                    "type": "object",
+                                    "anyOf": [
+                                      {
+                                        "required": [
+                                          "macAddress"
+                                        ]
+                                      },
+                                      {
+                                        "required": [
+                                          "ipAddresses"
+                                        ]
+                                      }
+                                    ],
+                                    "oneOf": [
+                                      {
+                                        "required": [
+                                          "addresses"
+                                        ]
+                                      },
+                                      {
+                                        "required": [
+                                          "addressRange"
+                                        ]
+                                      }
+                                    ],
+                                    "properties": {
+                                      "macAddress": {
+                                        "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
+                                        "type": "string",
+                                        "format": "MAC"
+                                      },
+                                      "segmentationId": {
+                                        "description": "Identification of the network segment to which the Cp instance connects to. If the Cp instance represents a subport in a trunk, segmentationId shall be present.  Otherwise it shall not be present. Depending on the NFVI networking infrastructure, the segmentationId may indicate the actual network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the transport header of the packets or it may be an identifier used between the application and the NFVI networking infrastructure to identify the network sub-interface of the trunk port in question. In the latter case the NFVI infrastructure will map this local segmentationId to whatever segmentationId is actually used by the NFVI’s transport technology.\n",
+                                        "type": "string"
+                                      },
+                                      "ipAddresses": {
+                                        "description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet. At least one of \"macAddress\" or \"ipAddresses\" shall be present.\n",
+                                        "type": "array",
+                                        "items": {
+                                          "type": "object",
+                                          "required": [
+                                            "type"
+                                          ],
+                                          "properties": {
+                                            "type": {
+                                              "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
+                                              "type": "string",
+                                              "enum": [
+                                                "IPV4",
+                                                "IPV6"
+                                              ]
+                                            },
+                                            "addresses": {
+                                              "description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided). Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                              "type": "array",
+                                              "items": {
+                                                "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                "type": "string",
+                                                "format": "IP"
+                                              }
+                                            },
+                                            "isDynamic": {
+                                              "description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
+                                              "type": "boolean"
+                                            },
+                                            "addressRange": {
+                                              "description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                              "type": "object",
+                                              "required": [
+                                                "minAddress",
+                                                "maxAddress"
+                                              ],
+                                              "properties": {
+                                                "minAddress": {
+                                                  "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                  "type": "string",
+                                                  "format": "IP"
+                                                },
+                                                "maxAddress": {
+                                                  "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                  "type": "string",
+                                                  "format": "IP"
+                                                }
+                                              }
+                                            },
+                                            "subnetId": {
+                                              "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                              "type": "string"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "vnfLinkPortId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "metadata": {
+                              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                              "type": "object"
+                            }
+                          }
+                        }
+                      },
+                      "metadata": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      }
+                    }
+                  }
+                },
+                "vnfVirtualLinkResourceInfo": {
+                  "description": "Information about the virtualised network resources used by the VLs of the VNF instance.\n",
+                  "type": "array",
+                  "items": {
+                    "description": "This type represents the information that allows addressing a virtualised resource that is used by an internal VL instance in a VNF instance.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "vnfVirtualLinkDescId",
+                      "networkResource",
+                      "vnfLinkPorts"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfVirtualLinkDescId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "networkResource": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "reservationId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfLinkPorts": {
+                        "description": "Links ports of this VL. Shall be present when the linkPort is used for external connectivity by the VNF (refer to VnfLinkPortInfo). May be present otherwise.\n",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "required": [
+                            "id",
+                            "resourceHandle"
+                          ],
+                          "properties": {
+                            "id": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "resourceHandle": {
+                              "required": [
+                                "resourceId"
+                              ],
+                              "type": "object",
+                              "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                              "properties": {
+                                "vimConnectionId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceProviderId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceId": {
+                                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                  "type": "string"
+                                },
+                                "vimLevelResourceType": {
+                                  "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                                  "type": "string"
+                                }
+                              }
+                            },
+                            "cpInstanceId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "cpInstanceType": {
+                              "description": "Type of the CP instance that is identified by cpInstanceId. Shall be present if \"cpInstanceId\" is present, and shall be absent otherwise. Permitted values: VNFC_CP: The link port is connected to a VNFC CP EXT_CP: The link port is associated to an external CP.\n",
+                              "type": "string",
+                              "enum": [
+                                "VNFC_CP",
+                                "EXT_CP"
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      "metadata": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      }
+                    }
+                  }
+                },
+                "vnfVirtualStorageResourceInfo": {
+                  "description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
+                  "type": "array",
+                  "items": {
+                    "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "virtualStorageDescId",
+                      "storageResource"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "virtualStorageDescId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "storageResource": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "reservationId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "metadata": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      }
+                    }
+                  }
+                },
+                "vnfcInfo": {
+                  "description": "Information about the VNFC instances.\n",
+                  "type": "array",
+                  "items": {
+                    "description": "This type represents the information about a VNFC instance that is part of a VNF instance. It shall comply with the provisions defined in table 5.5.3.23-1.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "vduId",
+                      "vnfcState"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vduId": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfcResourceInfoId": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfcState": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfcConfigurableProperties": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "metadata": {
+              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+              "type": "object"
+            },
+            "extensions": {
+              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+              "type": "object"
+            },
+            "_links": {
+              "description": "Links to resources related to this resource.\n",
+              "type": "object",
+              "required": [
+                "self"
+              ],
+              "properties": {
+                "self": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "indicators": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "instantiate": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "terminate": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "scale": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "scaleToLevel": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "changeFlavour": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "heal": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "operate": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "changeExtConn": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "createSnapshot": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "revertToSnapshot": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "vnfcSnapshots": {
+          "description": "Information about VNFC snapshots constituting this VNF snapshot.\n",
+          "type": "array",
+          "items": {
+            "description": "This type represents a VNFC snapshot.\n",
+            "type": "object",
+            "required": [
+              "id",
+              "vnfcInstanceId",
+              "triggeredAt",
+              "vnfcInfo"
+            ],
+            "properties": {
+              "id": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+              },
+              "vnfcInstanceId": {
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                "type": "string"
+              },
+              "creationStartedAt": {
+                "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+                "type": "string",
+                "format": "date-time"
+              },
+              "creationFinishedAt": {
+                "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+                "type": "string",
+                "format": "date-time"
+              },
+              "vnfcResourceInfoId": {
+                "description": "This type represents the information about a VNFC instance that is part of a VNF instance. It shall comply with the provisions defined in table 5.5.3.23-1.\n",
+                "type": "object",
+                "required": [
+                  "id",
+                  "vduId",
+                  "vnfcState"
+                ],
+                "properties": {
+                  "id": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "vduId": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "vnfcResourceInfoId": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "vnfcState": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "vnfcConfigurableProperties": {
+                    "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                    "type": "object"
+                  }
+                }
+              },
+              "computeSnapshotResource": {
+                "required": [
+                  "resourceId"
+                ],
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "properties": {
+                  "vimConnectionId": {
+                    "description": "An identifier with the intention of being globally unique.\n",
+                    "type": "string"
+                  },
+                  "resourceProviderId": {
+                    "description": "An identifier with the intention of being globally unique.\n",
+                    "type": "string"
+                  },
+                  "resourceId": {
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                    "type": "string"
+                  },
+                  "vimLevelResourceType": {
+                    "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                    "type": "string"
+                  }
+                }
+              },
+              "storageSnapshotResources": {
+                "description": "Mapping of the storage resources associated to the VNFC with the storage snapshot resources.\n",
+                "type": "object",
+                "required": [
+                  "storageResourceId"
+                ],
+                "properties": {
+                  "storageResourceId": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "storageSnapshotResource": {
+                    "required": [
+                      "resourceId"
+                    ],
+                    "type": "object",
+                    "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                    "properties": {
+                      "vimConnectionId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "resourceProviderId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "resourceId": {
+                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                        "type": "string"
+                      },
+                      "vimLevelResourceType": {
+                        "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              },
+              "userDefinedData": {
+                "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                "type": "object"
+              }
+            }
+          }
+        },
+        "userDefinedData": {
+          "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+          "type": "object"
+        }
+      }
+    },
+    "_links": {
+      "description": "Links to resources related to this resource.\n",
+      "type": "object",
+      "required": [
+        "self"
+      ],
+      "properties": {
+        "self": {
+          "description": "This type represents a link to a resource using an absolute URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "takenFrom": {
+          "description": "This type represents a link to a resource using an absolute URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotsInfo.schema.json b/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotsInfo.schema.json
new file mode 100644
index 00000000..1ea63e51
--- /dev/null
+++ b/SOL002/VNFLifecycleManagement-API/schemas/VnfSnapshotsInfo.schema.json
@@ -0,0 +1,1535 @@
+{
+  "type": "array",
+  "items": 
+  {
+  "description": "This type represents an individual VNF snapshot resource.\n",
+  "type": "object",
+  "required": [
+    "id"
+  ],
+  "properties": {
+    "id": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "vnfSnapshotPkgId": {
+      "description": "An identifier with the intention of being globally unique.\n",
+      "type": "string"
+    },
+    "vnfSnapshot": {
+      "description": "This type represents a VNF snapshot.\n",
+      "type": "object",
+      "required": [
+        "id",
+        "vnfInstanceId",
+        "triggeredAt",
+        "vnfdId",
+        "vnfInfo",
+        "vnfcSnapshots"
+      ],
+      "properties": {
+        "id": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "vnfInstanceId": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "creationStartedAt": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "creationFinishedAt": {
+          "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+          "type": "string",
+          "format": "date-time"
+        },
+        "vnfdId": {
+          "description": "An identifier with the intention of being globally unique.\n",
+          "type": "string"
+        },
+        "vnfInstance": {
+          "description": "This type represents a VNF instance.\n",
+          "type": "object",
+          "required": [
+            "id",
+            "vnfdId",
+            "vnfProvider",
+            "vnfProductName",
+            "vnfSoftwareVersion",
+            "vnfdVersion",
+            "instantiationState",
+            "_links"
+          ],
+          "properties": {
+            "id": {
+              "description": "An identifier with the intention of being globally unique.\n",
+              "type": "string"
+            },
+            "vnfInstanceName": {
+              "description": "Name of the VNF instance. This attribute can be modified with the PATCH method.\n",
+              "type": "string"
+            },
+            "vnfInstanceDescription": {
+              "description": "Human-readable description of the VNF instance. This attribute can be modified with the PATCH method.\n",
+              "type": "string"
+            },
+            "vnfdId": {
+              "description": "An identifier with the intention of being globally unique.\n",
+              "type": "string"
+            },
+            "vnfProvider": {
+              "description": "Provider of the VNF and the VNFD. The value is copied from the VNFD.\n",
+              "type": "string"
+            },
+            "vnfProductName": {
+              "description": "Name to identify the VNF Product. The value is copied from the VNFD.\n",
+              "type": "string"
+            },
+            "vnfSoftwareVersion": {
+              "description": "A version.\n",
+              "type": "string"
+            },
+            "vnfdVersion": {
+              "description": "A version.\n",
+              "type": "string"
+            },
+            "vnfConfigurableProperties": {
+              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+              "type": "object"
+            },
+            "instantiationState": {
+              "description": "The instantiation state of the VNF.\n",
+              "type": "string",
+              "enum": [
+                "NOT_INSTANTIATED",
+                "INSTANTIATED"
+              ]
+            },
+            "instantiatedVnfInfo": {
+              "description": "Information specific to an instantiated VNF instance. This attribute shall be present if the instantiateState attribute value is INSTANTIATED.\n",
+              "type": "object",
+              "required": [
+                "flavourId",
+                "vnfState",
+                "extCpInfo"
+              ],
+              "properties": {
+                "flavourId": {
+                  "description": "An identifier that is unique within a VNF descriptor.\n",
+                  "type": "string"
+                },
+                "vnfState": {
+                  "description": "STARTED: The VNF instance is up and running. STOPPED: The VNF instance has been shut down.\n",
+                  "type": "string",
+                  "enum": [
+                    "STARTED",
+                    "STOPPED"
+                  ]
+                },
+                "scaleStatus": {
+                  "description": "Scale status of the VNF, one entry per aspect. Represents for every scaling aspect how \"big\" the VNF has been scaled w.r.t. that aspect.\n",
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "aspectId",
+                      "scaleLevel"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "aspectId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "scaleLevel": {
+                        "description": "Indicates the scale level. The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.\n",
+                        "type": "integer"
+                      }
+                    }
+                  }
+                },
+                "maxScaleLevels": {
+                  "description": "Maximum allowed scale levels of the VNF, one entry per aspect. This attribute shall be present if the VNF supports scaling.\n",
+                  "type": "array",
+                  "items": {
+                    "required": [
+                      "aspectId",
+                      "scaleLevel"
+                    ],
+                    "type": "object",
+                    "properties": {
+                      "aspectId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "scaleLevel": {
+                        "description": "Indicates the scale level. The minimum value shall be 0 and the maximum value shall be <= maxScaleLevel as described in the VNFD.\n",
+                        "type": "integer"
+                      }
+                    }
+                  }
+                },
+                "extCpInfo": {
+                  "description": "Information about the external CPs exposed by the VNF instance. When trunking is enabled, the list of entries includes both, external CPs corresponding to parent ports of a trunk, and external CPs associated to sub-ports of a trunk.\n",
+                  "type": "array",
+                  "minItems": 1,
+                  "items": {
+                    "description": "This type represents information about an external CP of a VNF. It shall comply with the provisions defined in table 5.5.3.25 1.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "cpdId",
+                      "cpConfigId",
+                      "cpProtocolInfo"
+                    ],
+                    "oneOf": [
+                      {
+                        "required": [
+                          "associatedVnfcCpId"
+                        ]
+                      },
+                      {
+                        "required": [
+                          "associatedVnfVirtualLinkId"
+                        ]
+                      }
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "cpdId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "cpConfigId": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "cpProtocolInfo": {
+                        "description": "Network protocol information for this CP.\n",
+                        "type": "array",
+                        "items": {
+                          "description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
+                          "type": "object",
+                          "required": [
+                            "layerProtocol"
+                          ],
+                          "properties": {
+                            "layerProtocol": {
+                              "description": "The identifier of layer(s) and protocol(s) associated to the network address information. Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
+                              "type": "string",
+                              "enum": [
+                                "IP_OVER_ETHERNET"
+                              ]
+                            },
+                            "ipOverEthernet": {
+                              "description": "This type represents information about a network address that has been assigned.\n",
+                              "type": "object",
+                              "anyOf": [
+                                {
+                                  "required": [
+                                    "macAddress"
+                                  ]
+                                },
+                                {
+                                  "required": [
+                                    "ipAddresses"
+                                  ]
+                                }
+                              ],
+                              "oneOf": [
+                                {
+                                  "required": [
+                                    "addresses"
+                                  ]
+                                },
+                                {
+                                  "required": [
+                                    "addressRange"
+                                  ]
+                                }
+                              ],
+                              "properties": {
+                                "macAddress": {
+                                  "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
+                                  "type": "string",
+                                  "format": "MAC"
+                                },
+                                "segmentationId": {
+                                  "description": "Identification of the network segment to which the Cp instance connects to. If the Cp instance represents a subport in a trunk, segmentationId shall be present.  Otherwise it shall not be present. Depending on the NFVI networking infrastructure, the segmentationId may indicate the actual network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the transport header of the packets or it may be an identifier used between the application and the NFVI networking infrastructure to identify the network sub-interface of the trunk port in question. In the latter case the NFVI infrastructure will map this local segmentationId to whatever segmentationId is actually used by the NFVI’s transport technology.\n",
+                                  "type": "string"
+                                },
+                                "ipAddresses": {
+                                  "description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet. At least one of \"macAddress\" or \"ipAddresses\" shall be present.\n",
+                                  "type": "array",
+                                  "items": {
+                                    "type": "object",
+                                    "required": [
+                                      "type"
+                                    ],
+                                    "properties": {
+                                      "type": {
+                                        "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
+                                        "type": "string",
+                                        "enum": [
+                                          "IPV4",
+                                          "IPV6"
+                                        ]
+                                      },
+                                      "addresses": {
+                                        "description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided). Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                        "type": "array",
+                                        "items": {
+                                          "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                          "type": "string",
+                                          "format": "IP"
+                                        }
+                                      },
+                                      "isDynamic": {
+                                        "description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
+                                        "type": "boolean"
+                                      },
+                                      "addressRange": {
+                                        "description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                        "type": "object",
+                                        "required": [
+                                          "minAddress",
+                                          "maxAddress"
+                                        ],
+                                        "properties": {
+                                          "minAddress": {
+                                            "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                            "type": "string",
+                                            "format": "IP"
+                                          },
+                                          "maxAddress": {
+                                            "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                            "type": "string",
+                                            "format": "IP"
+                                          }
+                                        }
+                                      },
+                                      "subnetId": {
+                                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                        "type": "string"
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      },
+                      "extLinkPortId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "metadata": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      },
+                      "associatedVnfcCpId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "associatedVnfVirtualLinkId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      }
+                    }
+                  }
+                },
+                "extVirtualLinkInfo": {
+                  "description": "Information about the external VLs the VNF instance is connected to.\n",
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "resourceHandle",
+                      "currentVnfExtCpData"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "resourceHandle": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "extLinkPorts": {
+                        "description": "Link ports of this VL.\n",
+                        "type": "array",
+                        "items": {
+                          "description": "This type represents information about a link port of an external VL, i.e. a port providing connectivity for the VNF to an NS VL.\n",
+                          "type": "object",
+                          "required": [
+                            "id",
+                            "resourceHandle"
+                          ],
+                          "properties": {
+                            "id": {
+                              "description": "An identifier with the intention of being globally unique.\n",
+                              "type": "string"
+                            },
+                            "resourceHandle": {
+                              "required": [
+                                "resourceId"
+                              ],
+                              "type": "object",
+                              "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                              "properties": {
+                                "vimConnectionId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceProviderId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceId": {
+                                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                  "type": "string"
+                                },
+                                "vimLevelResourceType": {
+                                  "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                                  "type": "string"
+                                }
+                              }
+                            },
+                            "cpInstanceId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            }
+                          }
+                        }
+                      },
+                      "currentVnfExtCpData": {
+                        "description": "Allows the API consumer to read the current CP configuration information for the connection of external CPs to the external virtual link. This attribute reflects the current configuration information that has resulted from merging into this attribute the \"VnfExtCpData\" information which was passed as part of the \"ExtVirtualLinkData\" structure in the input of the most recent VNF LCM operation such as \"InstantiateVnfRequest\", \"ChangeExtVnfConnectivityRequest\", \"ChangeVnfFlavourRequest\" or \"ChangeCurrentVnfPkgRequest\", or has been provided by the NFVO during the granting procedure. If applying such change results in an empty list of \"currentVnfExtCpData\" structure instances, the affected instance of \"ExtVirtualLinkInfo\" shall be removed from its parent data structure.\n",
+                        "type": "array",
+                        "items": {
+                          "description": "This type represents configuration information for external CPs created from a CPD.\n",
+                          "type": "object",
+                          "required": [
+                            "cpdId"
+                          ],
+                          "properties": {
+                            "cpdId": {
+                              "description": "An identifier that is unique within a VNF descriptor.\n",
+                              "type": "string"
+                            },
+                            "cpConfig": {
+                              "description": "Map of instance data that need to be configured on the CP instances created from the respective CPD. The key of the map which identifies the individual VnfExtCpConfig entries is managed by the API consumer. The entries shall be applied by the VNFM according to the rules of JSON Merge Patch (see IETF RFC 7396). Within one VNF instance, all VNFC instances created from a particular VDU have the same external connectivity. Thus, given a particular value of the “cpdId” attribute, there shall be one “cpConfig” entry for each VNFC instance that has been or can be created from a VDU which includes a CPD identified by the “cpdId” attribute. If the cpConfig represents a subport in a trunk, all “cpConfig” entries in this list shall have the same segmentationId, which means they are connected to the same set of external VLs via the trunk. The map entry value shall be set to \"null\" in order to delete a \"VnfExtCpConfig\" entry identified by a particular key value from the map, i.e. for the disconnection of an existing external CP instance addressed by cpInstanceId in the deleted map entry from a particular external virtual link, and deletion of that instance in case it represents a subport. Deleting the last key from the map removes the affected instance of the \"VnfExtCpData\" structure from its parent data structure.\n",
+                              "type": "object",
+                              "additionalProperties": {
+                                "description": "This type represents an externally provided link port or network address information per instance of an external connection point. In case a link port is provided, the VNFM shall use that link port when connecting the external CP to the external VL. In a link port is not provided, the VNFM shall create a link port on the external VL, and use that link port to connect the external CP to the external VL.\n",
+                                "anyOf": [
+                                  {
+                                    "required": [
+                                      "linkPortId"
+                                    ]
+                                  },
+                                  {
+                                    "required": [
+                                      "cpProtocolData"
+                                    ]
+                                  }
+                                ],
+                                "type": "object",
+                                "properties": {
+                                  "parentCpConfigId": {
+                                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                                    "type": "string"
+                                  },
+                                  "linkPortId": {
+                                    "description": "An identifier with the intention of being globally unique.\n",
+                                    "type": "string"
+                                  },
+                                  "cpProtocolData": {
+                                    "description": "Parameters for configuring the network protocols on the link port that connects the CP to a VL. The following conditions apply to the attributes \"linkPortId\" and \"cpProtocolData\": 1) Void 2) At least one of the \"linkPortId\" and \"cpProtocolData\" attributes \n   shall be present for an external CP instance representing a subport \n   that is to be created, or an external CP instance that is to be created \n   by creating the corresponding VNFC or VNF instance during the current or \n   a subsequent LCM operation, or for an existing external CP instance \n   that is to be re-configured or added to a particular external virtual link.\n3) If the \"linkPortId\" attribute is absent, the VNFM shall create a\n   link port.\n4) If the \"cpProtocolData\" attribute is absent, the \"linkPortId\"\n   attribute shall be provided referencing a pre-created link port,\n   and the VNFM can use means outside the scope of the present\n   document to obtain the pre-configured address information for the\n   connection point from the resource representing the link port.\n5) If both \"cpProtocolData\" and \"linkportId\" are provided, the API\n   consumer shall ensure that the cpProtocolData can be used with the\n   pre-created link port referenced by \"linkPortId\".\n",
+                                    "type": "array",
+                                    "items": {
+                                      "description": "This type represents network protocol data.\n",
+                                      "type": "object",
+                                      "required": [
+                                        "layerProtocol"
+                                      ],
+                                      "properties": {
+                                        "layerProtocol": {
+                                          "description": "Identifier of layer(s) and protocol(s). This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
+                                          "type": "string",
+                                          "enum": [
+                                            "IP_OVER_ETHERNET"
+                                          ]
+                                        },
+                                        "ipOverEthernet": {
+                                          "description": "This type represents network address data for IP over Ethernet.\n",
+                                          "type": "object",
+                                          "anyOf": [
+                                            {
+                                              "required": [
+                                                "macAddress"
+                                              ]
+                                            },
+                                            {
+                                              "required": [
+                                                "ipAddresses"
+                                              ]
+                                            }
+                                          ],
+                                          "oneOf": [
+                                            {
+                                              "required": [
+                                                "fixedAddresses"
+                                              ]
+                                            },
+                                            {
+                                              "required": [
+                                                "numDynamicAddresses"
+                                              ]
+                                            },
+                                            {
+                                              "required": [
+                                                "ipAddressRange"
+                                              ]
+                                            }
+                                          ],
+                                          "properties": {
+                                            "macAddress": {
+                                              "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
+                                              "type": "string",
+                                              "format": "MAC"
+                                            },
+                                            "segmentationId": {
+                                              "description": "Identification of the network segment to which the Cp instance connects to. If the Cp instance represents a subport in a trunk, segmentationId shall be present. Otherwise it shall not be present. Depending on the NFVI networking infrastructure, the segmentationId may indicate the actual network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the transport header of the packets or it may be an identifier used between the application and the NFVI networking infrastructure to identify the network sub-interface of the trunk port in question. In the latter case the NFVI infrastructure will map this local segmentationId to whatever segmentationId is actually used by the NFVI’s transport technology.\n",
+                                              "type": "string"
+                                            },
+                                            "ipAddresses": {
+                                              "description": "List of IP addresses to assign to the CP instance. Each entry represents IP address data for fixed or dynamic IP address assignment per subnet. If this attribute is not present, no IP address shall be assigned.\n",
+                                              "type": "array",
+                                              "items": {
+                                                "type": "object",
+                                                "required": [
+                                                  "type"
+                                                ],
+                                                "properties": {
+                                                  "type": {
+                                                    "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
+                                                    "type": "string",
+                                                    "enum": [
+                                                      "IPV4",
+                                                      "IPV6"
+                                                    ]
+                                                  },
+                                                  "fixedAddresses": {
+                                                    "description": "Fixed addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
+                                                    "type": "array",
+                                                    "items": {
+                                                      "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                      "type": "string",
+                                                      "format": "IP"
+                                                    }
+                                                  },
+                                                  "numDynamicAddresses": {
+                                                    "description": "Number of dynamic addresses to assign (from the subnet defined by \"subnetId\" if provided). Exactly one of \"fixedAddresses\", \"numDynamicAddresses\" or \"ipAddressRange\" shall be present.\n",
+                                                    "type": "integer"
+                                                  },
+                                                  "addressRange": {
+                                                    "description": "An IP address range to be used, e.g. in case of egress connections. In case this attribute is present, IP addresses from the range will be used.\n",
+                                                    "type": "object",
+                                                    "required": [
+                                                      "minAddress",
+                                                      "maxAddress"
+                                                    ],
+                                                    "properties": {
+                                                      "minAddress": {
+                                                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                        "type": "string",
+                                                        "format": "IP"
+                                                      },
+                                                      "maxAddress": {
+                                                        "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                        "type": "string",
+                                                        "format": "IP"
+                                                      }
+                                                    }
+                                                  },
+                                                  "subnetId": {
+                                                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                                    "type": "string"
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "extManagedVirtualLinkInfo": {
+                  "description": "External virtual links the VNF instance is connected to. It is possible to have several ExtManagedVirtualLinkInfo for the same VNF internal VL in case of a multi-site VNF spanning several VIMs. The set of ExtManagedVirtualLinkInfo corresponding to the same VNF internal VL shall indicate so by referencing to the same VnfVirtualLinkDesc and externally-managed multi-site VL instance (refer to clause 5.5.3.5).\n",
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "vnfVirtualLinkDescId",
+                      "networkResource"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfVirtualLinkDescId": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "networkResource": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "vnfLinkPorts": {
+                        "description": "Link ports of this VL.\n",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "required": [
+                            "id",
+                            "resourceHandle"
+                          ],
+                          "properties": {
+                            "id": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "resourceHandle": {
+                              "required": [
+                                "resourceId"
+                              ],
+                              "type": "object",
+                              "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                              "properties": {
+                                "vimConnectionId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceProviderId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceId": {
+                                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                  "type": "string"
+                                },
+                                "vimLevelResourceType": {
+                                  "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                                  "type": "string"
+                                }
+                              }
+                            },
+                            "cpInstanceId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "cpInstanceType": {
+                              "description": "Type of the CP instance that is identified by cpInstanceId. Shall be present if \"cpInstanceId\" is present, and shall be absent otherwise. Permitted values: VNFC_CP: The link port is connected to a VNFC CP EXT_CP: The link port is associated to an external CP.\n",
+                              "type": "string",
+                              "enum": [
+                                "VNFC_CP",
+                                "EXT_CP"
+                              ]
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "monitoringParameters": {
+                  "description": "Active monitoring parameters.\n",
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "performanceMetric"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "name": {
+                        "description": "Human readable name of the monitoring parameter, as defined in the VNFD.\n",
+                        "type": "string"
+                      },
+                      "performanceMetric": {
+                        "description": "Performance metric that is monitored. This attribute shall contain the related \"Measurement Name\" value as defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+                        "type": "string"
+                      }
+                    }
+                  }
+                },
+                "localizationLanguage": {
+                  "description": "Information about localization language of the VNF (includes e.g. strings in the VNFD). The localization languages supported by a VNF can be declared in the VNFD, and localization language selection can take place at instantiation time. The value shall comply with the format defined in IETF RFC 5646.\n",
+                  "type": "string"
+                },
+                "vnfcResourceInfo": {
+                  "description": "Information about the virtualised compute and storage resources used by the VNFCs of the VNF instance.\n",
+                  "type": "array",
+                  "items": {
+                    "description": "This type represents the information on virtualised compute and storage resources used by a VNFC in a VNF instance.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "vduId",
+                      "computeResource",
+                      "vnfcCpInfo"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vduId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "computeResource": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "storageResourceIds": {
+                        "description": "References to the VirtualStorage resources. The value refers to a VirtualStorageResourceInfo item in the VnfInstance.\n",
+                        "type": "array",
+                        "items": {
+                          "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                          "type": "string"
+                        }
+                      },
+                      "reservationId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfcCpInfo": {
+                        "description": "All the CPs of the VNFC instance. Shall be present when that particular CP of the VNFC instance is exposed as an external CP of the VNF instance or is connected to an external CP of the VNF instance. A VNFC CP is \"connected to\" an external CP if the VNFC CP is connected to an internal VL that exposes an external CP. A VNFC CP is \"exposed as\" an external CP if it is connected directly to an external VL. May be present otherwise.\n",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "required": [
+                            "id",
+                            "cpdId"
+                          ],
+                          "properties": {
+                            "id": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "cpdId": {
+                              "description": "An identifier that is unique within a VNF descriptor.\n",
+                              "type": "string"
+                            },
+                            "vnfExtCpId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "cpProtocolInfo": {
+                              "description": "Network protocol information for this CP. May be omitted if the VNFC CP is exposed as an external CP. The information can be omitted because it is already available as part of the external CP information.\n",
+                              "type": "array",
+                              "items": {
+                                "description": "This type describes the protocol layer(s) that a CP uses together with protocol-related information, like addresses.\n",
+                                "type": "object",
+                                "required": [
+                                  "layerProtocol"
+                                ],
+                                "properties": {
+                                  "layerProtocol": {
+                                    "description": "The identifier of layer(s) and protocol(s) associated to the network address information. Permitted values: IP_OVER_ETHERNET This attribute allows to signal the addition of further types of layer and protocol in future versions of the present document in a backwards-compatible way. In the current version of the present document, only IP over Ethernet is supported.\n",
+                                    "type": "string",
+                                    "enum": [
+                                      "IP_OVER_ETHERNET"
+                                    ]
+                                  },
+                                  "ipOverEthernet": {
+                                    "description": "This type represents information about a network address that has been assigned.\n",
+                                    "type": "object",
+                                    "anyOf": [
+                                      {
+                                        "required": [
+                                          "macAddress"
+                                        ]
+                                      },
+                                      {
+                                        "required": [
+                                          "ipAddresses"
+                                        ]
+                                      }
+                                    ],
+                                    "oneOf": [
+                                      {
+                                        "required": [
+                                          "addresses"
+                                        ]
+                                      },
+                                      {
+                                        "required": [
+                                          "addressRange"
+                                        ]
+                                      }
+                                    ],
+                                    "properties": {
+                                      "macAddress": {
+                                        "description": "A MAC address. Representation: string that consists of groups of two hexadecimal digits, separated by hyphens or colons.\n",
+                                        "type": "string",
+                                        "format": "MAC"
+                                      },
+                                      "segmentationId": {
+                                        "description": "Identification of the network segment to which the Cp instance connects to. If the Cp instance represents a subport in a trunk, segmentationId shall be present.  Otherwise it shall not be present. Depending on the NFVI networking infrastructure, the segmentationId may indicate the actual network segment value (e.g. vlan Id, Vxlan segmentation id, etc.) used in the transport header of the packets or it may be an identifier used between the application and the NFVI networking infrastructure to identify the network sub-interface of the trunk port in question. In the latter case the NFVI infrastructure will map this local segmentationId to whatever segmentationId is actually used by the NFVI’s transport technology.\n",
+                                        "type": "string"
+                                      },
+                                      "ipAddresses": {
+                                        "description": "Addresses assigned to the CP instance. Each entry represents IP addresses assigned by fixed or dynamic IP address assignment per subnet. At least one of \"macAddress\" or \"ipAddresses\" shall be present.\n",
+                                        "type": "array",
+                                        "items": {
+                                          "type": "object",
+                                          "required": [
+                                            "type"
+                                          ],
+                                          "properties": {
+                                            "type": {
+                                              "description": "The type of the IP addresses. Permitted values: IPV4, IPV6.\n",
+                                              "type": "string",
+                                              "enum": [
+                                                "IPV4",
+                                                "IPV6"
+                                              ]
+                                            },
+                                            "addresses": {
+                                              "description": "Fixed addresses assigned (from the subnet defined by \"subnetId\" if provided). Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                              "type": "array",
+                                              "items": {
+                                                "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                "type": "string",
+                                                "format": "IP"
+                                              }
+                                            },
+                                            "isDynamic": {
+                                              "description": "Indicates whether this set of addresses was assigned dynamically (true) or based on address information provided as input from the API consumer (false). Shall be present if \"addresses\" is present and shall be absent otherwise.\n",
+                                              "type": "boolean"
+                                            },
+                                            "addressRange": {
+                                              "description": "An IP address range used, e.g., in case of egress connections. Exactly one of \"addresses\" or \"addressRange\" shall be present.\n",
+                                              "type": "object",
+                                              "required": [
+                                                "minAddress",
+                                                "maxAddress"
+                                              ],
+                                              "properties": {
+                                                "minAddress": {
+                                                  "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                  "type": "string",
+                                                  "format": "IP"
+                                                },
+                                                "maxAddress": {
+                                                  "description": "An IPV4 or IPV6 address. Representation: In case of an IPV4 address, string that consists of four decimal integers separated by dots, each integer ranging from 0 to 255. In case of an IPV6 address, string that consists of groups of zero to four hexadecimal digits, separated by colons.\n",
+                                                  "type": "string",
+                                                  "format": "IP"
+                                                }
+                                              }
+                                            },
+                                            "subnetId": {
+                                              "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                              "type": "string"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            "vnfLinkPortId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "metadata": {
+                              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                              "type": "object"
+                            }
+                          }
+                        }
+                      },
+                      "metadata": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      }
+                    }
+                  }
+                },
+                "vnfVirtualLinkResourceInfo": {
+                  "description": "Information about the virtualised network resources used by the VLs of the VNF instance.\n",
+                  "type": "array",
+                  "items": {
+                    "description": "This type represents the information that allows addressing a virtualised resource that is used by an internal VL instance in a VNF instance.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "vnfVirtualLinkDescId",
+                      "networkResource",
+                      "vnfLinkPorts"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfVirtualLinkDescId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "networkResource": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "reservationId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfLinkPorts": {
+                        "description": "Links ports of this VL. Shall be present when the linkPort is used for external connectivity by the VNF (refer to VnfLinkPortInfo). May be present otherwise.\n",
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "required": [
+                            "id",
+                            "resourceHandle"
+                          ],
+                          "properties": {
+                            "id": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "resourceHandle": {
+                              "required": [
+                                "resourceId"
+                              ],
+                              "type": "object",
+                              "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                              "properties": {
+                                "vimConnectionId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceProviderId": {
+                                  "description": "An identifier with the intention of being globally unique.\n",
+                                  "type": "string"
+                                },
+                                "resourceId": {
+                                  "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                                  "type": "string"
+                                },
+                                "vimLevelResourceType": {
+                                  "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                                  "type": "string"
+                                }
+                              }
+                            },
+                            "cpInstanceId": {
+                              "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                              "type": "string"
+                            },
+                            "cpInstanceType": {
+                              "description": "Type of the CP instance that is identified by cpInstanceId. Shall be present if \"cpInstanceId\" is present, and shall be absent otherwise. Permitted values: VNFC_CP: The link port is connected to a VNFC CP EXT_CP: The link port is associated to an external CP.\n",
+                              "type": "string",
+                              "enum": [
+                                "VNFC_CP",
+                                "EXT_CP"
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      "metadata": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      }
+                    }
+                  }
+                },
+                "vnfVirtualStorageResourceInfo": {
+                  "description": "Information on the virtualised storage resource(s) used as storage for the VNF instance.\n",
+                  "type": "array",
+                  "items": {
+                    "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "virtualStorageDescId",
+                      "storageResource"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "virtualStorageDescId": {
+                        "description": "An identifier that is unique within a VNF descriptor.\n",
+                        "type": "string"
+                      },
+                      "vnfdId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "storageResource": {
+                        "required": [
+                          "resourceId"
+                        ],
+                        "type": "object",
+                        "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                        "properties": {
+                          "vimConnectionId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceProviderId": {
+                            "description": "An identifier with the intention of being globally unique.\n",
+                            "type": "string"
+                          },
+                          "resourceId": {
+                            "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                            "type": "string"
+                          },
+                          "vimLevelResourceType": {
+                            "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                            "type": "string"
+                          }
+                        }
+                      },
+                      "reservationId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "metadata": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      }
+                    }
+                  }
+                },
+                "vnfcInfo": {
+                  "description": "Information about the VNFC instances.\n",
+                  "type": "array",
+                  "items": {
+                    "description": "This type represents the information about a VNFC instance that is part of a VNF instance. It shall comply with the provisions defined in table 5.5.3.23-1.\n",
+                    "type": "object",
+                    "required": [
+                      "id",
+                      "vduId",
+                      "vnfcState"
+                    ],
+                    "properties": {
+                      "id": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vduId": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfcResourceInfoId": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfcState": {
+                        "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                        "type": "string"
+                      },
+                      "vnfcConfigurableProperties": {
+                        "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                        "type": "object"
+                      }
+                    }
+                  }
+                }
+              }
+            },
+            "metadata": {
+              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+              "type": "object"
+            },
+            "extensions": {
+              "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+              "type": "object"
+            },
+            "_links": {
+              "description": "Links to resources related to this resource.\n",
+              "type": "object",
+              "required": [
+                "self"
+              ],
+              "properties": {
+                "self": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "indicators": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "instantiate": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "terminate": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "scale": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "scaleToLevel": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "changeFlavour": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "heal": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "operate": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "changeExtConn": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "createSnapshot": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                },
+                "revertToSnapshot": {
+                  "description": "This type represents a link to a resource using an absolute URI.\n",
+                  "type": "object",
+                  "required": [
+                    "href"
+                  ],
+                  "properties": {
+                    "href": {
+                      "description": "String formatted according to IETF RFC 3986.\n",
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "vnfcSnapshots": {
+          "description": "Information about VNFC snapshots constituting this VNF snapshot.\n",
+          "type": "array",
+          "items": {
+            "description": "This type represents a VNFC snapshot.\n",
+            "type": "object",
+            "required": [
+              "id",
+              "vnfcInstanceId",
+              "triggeredAt",
+              "vnfcInfo"
+            ],
+            "properties": {
+              "id": {
+                "description": "An identifier with the intention of being globally unique.\n",
+                "type": "string"
+              },
+              "vnfcInstanceId": {
+                "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                "type": "string"
+              },
+              "creationStartedAt": {
+                "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+                "type": "string",
+                "format": "date-time"
+              },
+              "creationFinishedAt": {
+                "description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+                "type": "string",
+                "format": "date-time"
+              },
+              "vnfcResourceInfoId": {
+                "description": "This type represents the information about a VNFC instance that is part of a VNF instance. It shall comply with the provisions defined in table 5.5.3.23-1.\n",
+                "type": "object",
+                "required": [
+                  "id",
+                  "vduId",
+                  "vnfcState"
+                ],
+                "properties": {
+                  "id": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "vduId": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "vnfcResourceInfoId": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "vnfcState": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "vnfcConfigurableProperties": {
+                    "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                    "type": "object"
+                  }
+                }
+              },
+              "computeSnapshotResource": {
+                "required": [
+                  "resourceId"
+                ],
+                "type": "object",
+                "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                "properties": {
+                  "vimConnectionId": {
+                    "description": "An identifier with the intention of being globally unique.\n",
+                    "type": "string"
+                  },
+                  "resourceProviderId": {
+                    "description": "An identifier with the intention of being globally unique.\n",
+                    "type": "string"
+                  },
+                  "resourceId": {
+                    "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                    "type": "string"
+                  },
+                  "vimLevelResourceType": {
+                    "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                    "type": "string"
+                  }
+                }
+              },
+              "storageSnapshotResources": {
+                "description": "Mapping of the storage resources associated to the VNFC with the storage snapshot resources.\n",
+                "type": "object",
+                "required": [
+                  "storageResourceId"
+                ],
+                "properties": {
+                  "storageResourceId": {
+                    "description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+                    "type": "string"
+                  },
+                  "storageSnapshotResource": {
+                    "required": [
+                      "resourceId"
+                    ],
+                    "type": "object",
+                    "description": "This type represents the information that allows addressing a virtualised resource that is used by a VNF instance. Information about the resource is available from the VIM.\n",
+                    "properties": {
+                      "vimConnectionId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "resourceProviderId": {
+                        "description": "An identifier with the intention of being globally unique.\n",
+                        "type": "string"
+                      },
+                      "resourceId": {
+                        "description": "An identifier maintained by the VIM or other resource provider. It is expected to be unique within the VIM instance.\n",
+                        "type": "string"
+                      },
+                      "vimLevelResourceType": {
+                        "description": "The value set of the \"vimLevelResourceType\" attribute is within the scope of the VIM or the resource provider and can be used as information that complements the ResourceHandle. This value set is different from the value set of the \"type\" attribute in the ResourceDefinition (refer to clause 9.5.3.2 in SOL003).\n",
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              },
+              "userDefinedData": {
+                "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+                "type": "object"
+              }
+            }
+          }
+        },
+        "userDefinedData": {
+          "description": "This type represents a list of key-value pairs. The order of the pairs in the list is not significant. In JSON, a set of keyvalue pairs is represented as an object. It shall comply with the provisions defined in clause 4 of IETF RFC 8259. In the following example, a list of key-value pairs with four keys (\"aString\", \"aNumber\", \"anArray\" and \"anObject\") is provided to illustrate that the values associated with different keys can be of different type.\n",
+          "type": "object"
+        }
+      }
+    },
+    "_links": {
+      "description": "Links to resources related to this resource.\n",
+      "type": "object",
+      "required": [
+        "self"
+      ],
+      "properties": {
+        "self": {
+          "description": "This type represents a link to a resource using an absolute URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        },
+        "takenFrom": {
+          "description": "This type represents a link to a resource using an absolute URI.\n",
+          "type": "object",
+          "required": [
+            "href"
+          ],
+          "properties": {
+            "href": {
+              "description": "String formatted according to IETF RFC 3986.\n",
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  }
+}
+}
\ No newline at end of file
-- 
GitLab