diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index a20b0d5d18b6b48e62ddf1715ad0cec48cf98011..9631f072c1f19898772e6acd7a54954b553a286c 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -13,7 +13,7 @@ POST Cancel operation task
     ...    Test title: POST Cancel operation task
     ...    Test objective: The objective is to test that POST method cancel the NS LCM operation
     ...    Pre-conditions: NS instance status equal to STARTING, PROCESSING or ROLLING_BACK
-    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance status equal to FAILED_TEMP     
@@ -26,7 +26,7 @@ POST Cancel operation task Not Found
     ...    Test title: POST Cancel operation task Not Found
     ...    Test objective: The objective is to test that POST method fail completing the Cancel NS LCM operation if the resource is not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none       
@@ -39,7 +39,7 @@ POST Cancel operation task Conflict
     ...    Test title: POST Cancel operation task Conflict
     ...    Test objective: The objective is to test that POST method fail if a status conflict exist on the NS LCM operation. (i.e. NS instance status not equal to STARTING, PROCESSING or ROLLING_BACK)
     ...    Pre-conditions: NS instance status not equal to STARTING, PROCESSING or ROLLING_BACK
-    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.15.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -52,7 +52,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 6.4.15.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.15.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,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 6.4.15.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.15.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -76,7 +76,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 6.4.15.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.15.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,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 6.4.15.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.15.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
index 7a0fc2c99a838f4c30a28ffe6320e6478a682a9b..ee81316fb4654459c06a22c23062254536c764f6 100644
--- a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
@@ -13,7 +13,7 @@ POST Continue operation task
     ...    Test title: POST Continue operation task
     ...    Test objective: The objective is to test that POST method trigger a continue on the LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP 
@@ -26,7 +26,7 @@ POST Continue operation task Not Found
     ...    Test title: POST Continue operation task Not Found
     ...    Test objective: The objective is to test that POST method cannot perform a continue operation task because the resource is not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -39,7 +39,7 @@ POST Continue operation task Conflict
     ...    Test title: POST Continue operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of operation status conflict (i.e. NS instance status not equal to FAILED_TEMP )
     ...    Pre-conditions: NS instance status not equal to FAILED_TEMP 
-    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.13.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -52,7 +52,7 @@ GET Continue operation task - Method not implemented
     ...    Test title: GET Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.13.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.13.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -64,7 +64,7 @@ PUT Continue operation task - Method not implemented
     ...    Test title: PUT Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.13.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.13.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ PATCH Continue operation task - Method not implemented
     ...    Test title: PATCH Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.14.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ DELETE Continue operation task - Method not implemented
     ...    Test title: DELETE Continue operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.14.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index c51eff2004abd67526a8e083718f4596eff5d481..4f9e7bb84d3301f7d57d0dc1d590edefea221853 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -15,7 +15,7 @@ NS Instance Creation
     ...    Test title: NS Instance Creation
     ...    Test objective: The objective is to test the workflow for Creating a NS instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS resource is in NOT_ISTANTIATED state
@@ -32,7 +32,7 @@ NS Instance Creation with DISABLED Network Service Descriptor
     ...    Test title: NS Instance Creation with DISABLED Network Service Descriptor
     ...    Test objective: The objective is to test the workflow for Creating a NS instance with a disabled NSD
     ...    Pre-conditions: One or more Network Service Descriptors are onboarded in the NFVO in disabled operational state.
-    ...    Reference: Clauses 6.4.2.3.1 and 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clauses 6.4.2.3.1 and 5.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index 40b7de31a71cce16e3dd9f49756ce3295b87893e..d3c7a2273c5460fef89674db6e8ccb40a6113093 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -15,7 +15,7 @@ NS Instance Deletion
     ...    Test title: NS Instance Deletion
     ...    Test objective: The objective is to test the workflow for Deleting a NS instance
     ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS Instance resource is deleted
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index 162c7ebcf7a5c16f58f97770a0443370c2c81656..726aa0f833ca65daa951d6847a2b488bd03f49ca 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -13,7 +13,7 @@ POST Fail operation task
     ...    Test title: POST Fail operation task
     ...    Test objective: The objective is to test that POST method trigger a state change to "finally failed" on the NS LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -26,7 +26,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 fail if the NS LCM resource is not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -39,7 +39,7 @@ POST Fail operation task Conflict
     ...    Test title: POST Fail operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of status conflict on the NS LCM operation (i.e NS instance status not equal to FAILED_TEMP)
     ...    Pre-conditions: NS instance status not equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.14.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.14.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.14.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.14.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.14.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.14.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTask.robot b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
index 1bb24b7ebd6e7615470f24ed624c470baab0e879..7f17bfdaf1f98ecd60fe9a5fcdc5a8a447356e24 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
@@ -13,7 +13,7 @@ POST Heal a NSInstance
     ...    Test title: POST Heal a NSInstance
     ...    Test objective: The objective is to test that POST method trigger a Heal NS instance
     ...    Pre-conditions: NS Instance is in INSTANTIATED state.
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance is still in INSTANTIATED state.
@@ -26,7 +26,7 @@ POST Heal a NSInstance - Conflict (Not Instantited)
     ...    Test title: POST Heal a NSInstance - Conflict (Not Instantited)
     ...    Test objective: The objective is to test that POST method fail if NS instance is in NOT_INSTANTIATE state 
     ...    Pre-conditions: NS Instance is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.7.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS Instance is still in NOT_INSTANTIATED state
@@ -39,7 +39,7 @@ GET Heal NSInstance- Method not implemented
     ...    Test title: GET Heal NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.7.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Heal NSInstance - Method not implemented
     ...    Test title: PUT Heal NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.7.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PATCH Heal NSInstance - Method not implemented
     ...    Test title: PATCH Heal NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.7.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ DELETE Heal NSInstance - Method not implemented
     ...    Test title: DELETE Heal NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.7.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
index 4020ab55802aad80711abf619ea85e36f76bb367..57cb3f68a951ae83c409a8f5f4f1603471219e63 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTaskWorkflow.robot
@@ -14,7 +14,7 @@ Heal Flow of NS lifecycle management operations
     ...    Test title: Heal Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Healing a NS instance
     ...    Pre-conditions: the resource is in INSTANTIATED state
-    ...    Reference: Clause 6.4.7 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.7 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS Instance still in INSTANTIATED state
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index 5d7acba23b52a826f88400694334cc555729263c..a526989c1fac4b6ad903053be25bab54101458d5 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -13,7 +13,7 @@ POST Individual NSInstance - Method not implemented
     ...    Test title: POST Individual NSInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Information about an individual NS Instance
     ...    Test title: GET Information about an individual NS Instance
     ...    Test objective: The objective is to test that GET method returns an individual NS instance
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ PUT Individual NSInstance - Method not implemented
     ...    Test title: PUT Individual NSInstance - Method not implemented
     ...    Test objective: TThe objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ PATCH Individual NSInstance - Method not implemented
     ...    Test title: PATCH Individual NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ DELETE Individual NSInstance
     ...    Test title: DELETE Individual NSInstance
     ...    Test objective: The objective is to test that DELETE method delete a not INSTANTIATED NS instance
     ...    Pre-conditions: NS instance is not INSTANTIATED .
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Check Postcondition NS Instance is deleted
@@ -77,7 +77,7 @@ DELETE Individual NSInstance Conflict
     ...    Test title: DELETE Individual NSInstance Conflict
     ...    Test objective: The objective is to test that DELETE method cannot delete an INSTANTIATED NS instance
     ...    Pre-conditions: one instance of a NS in INSTANTIATED state
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Check Postcondition NS Instance is not deleted
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index 537618b0584270184626de527260e2a162679bb1..4c69983151ed615bd017dcd322ca841e3e333a14 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -12,7 +12,7 @@ Post Individual NS LCM occurrences - Method not implemented
     ...    Test title: Post Individual NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.10.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ Get status information about Individual NS LCM occurrences
     ...    Test title: Get status information about Individual NS LCM occurrences
     ...    Test objective: The objective is to test that GET method returns the LCM occurrence of the NS
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.10.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +38,7 @@ PUT status information about Individual NS LCM occurrences - Method not implemen
     ...    Test title: PUT status information about Individual NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.10.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ PATCH status information about Individual NS LCM occurrences - Method not implem
     ...    Test title: PATCH status information about Individual NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.10.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -62,7 +62,7 @@ DELETE status information about Individual NS LCM occurrences - Method not imple
     ...    Test title: DELETE status information about Individual NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.10.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.10.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
index 9855f532fef4949a867aacbd856ff00872683bbb..9fbb30b4e932cde06f94a0341e991fb4ed3976ce 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
@@ -14,7 +14,7 @@ POST Individual Subscription - Method not implemented
     ...    Test title: POST Individual Subscription - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.17.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.17.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +26,7 @@ GET Information about an individual subscription
     ...    Test title: GET Information about an individual subscription
     ...    Test objective: The objective is to test the retrieval of NS lifecycle management subscription and perform a JSON schema validation of the returned subscription data structure
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.17.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.17.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ PUT an individual subscription - Method not implemented
     ...    Test title: PUT an individual subscription - Method not implemented
     ...    Test objective: TThe objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.17.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.17.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PATCH an individual subscription - Method not implemented
     ...    Test title: PATCH an individual subscription - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.17.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.17.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ DELETE an individual subscription
     ...    Test title: DELETE an individual subscription
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: At least one lifecycle management subscription is available in the NFVO
-    ...    Reference: Clause 6.4.17.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.17.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS lifecycle management subscription is not available anymore on NFVO
diff --git a/SOL005/NSLifecycleManagement-API/IndividualVNFSnapshot.robot b/SOL005/NSLifecycleManagement-API/IndividualVNFSnapshot.robot
index cc3648bb85316fd2b2cd47e809fa304d60f04537..b3f060c2d8a658379ccfdc572cd216f6a2780555 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualVNFSnapshot.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualVNFSnapshot.robot
@@ -7,7 +7,7 @@ POST Individual VNF Snapshot - Method not implemented
     ...    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 6.4.20.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.20.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Information about an individual VNF Snapshot - SUCCESSFUL
     ...    Test title: GET Information about an individual VNF Snapshot - SUCCESSFUL
     ...    Test objective: The objective is to GET information about an individual VNF Snapshot
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.20.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.20.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET Information about an individual VNF Snapshot - NOT FOUND
     ...    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: none
-    ...    Reference: Clause 6.4.20.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.20.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual VNF Snapshot - Method not implemented
     ...    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 6.4.20.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.20.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ PATCH Individual VNF Snapshot - Method not implemented
     ...    Test title: PATCH Individual VNF Snapshot - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.20.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.20.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot not modified
@@ -69,7 +69,7 @@ DELETE Individual VNF Snapshot
     ...    Test title: DELETE Individual VNF Snapshot
     ...    Test objective: The objective is to delete a VNF Snapshot
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.20.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.20.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot resource is deleted.
@@ -82,7 +82,7 @@ DELETE Individual VNF Snapshot - Conflict
     ...    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 6.4.20.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.20.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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: VNF Snapshot resource is not deleted.
diff --git a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
index d356523516e35616c34a391f6ba01cee4894d321..7b2098795b4c12f9ffe50eca29289d080032c559 100644
--- a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
@@ -13,7 +13,7 @@ POST Instantiate a nsInstance
     ...    Test title: POST Instantiate a nsInstance
     ...    Test objective: The objective is to test that POST method instantiate a new NS instance
     ...    Pre-conditions: An NS instance created and it is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is instantiated on the NFVO
@@ -27,7 +27,7 @@ POST Instantiate a nsInstance Conflict
     ...    Test title: POST Instantiate a nsInstance Conflict
     ...    Test objective: The objective is to test that the operation cannot be performed due to a conflict with the state of resource (i.e. the resource is in INSTANTIATED state)
     ...    Pre-conditions: resource is in INSTANTIATED state
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is not instantiated on the NFVO
@@ -41,7 +41,7 @@ GET Instantiate NSInstance - Method not implemented
     ...    Test title: GET Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation cannot be performed due because method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none.
@@ -53,7 +53,7 @@ PUT Instantiate NSInstance - Method not implemented
     ...    Test title: PUT Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation cannot be performed due because method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none.
@@ -65,7 +65,7 @@ PATCH Instantiate NSInstance - Method not implemented
     ...    Test title: PATCH Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation cannot be performed due because method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none.
@@ -77,7 +77,7 @@ DELETE Instantiate NSInstance - Method not implemented
     ...    Test title: DELETE Instantiate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that the operation cannot be performed due because method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none.
diff --git a/SOL005/NSLifecycleManagement-API/InstantiateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/InstantiateNSTaskWorkflow.robot
index 3c848e3785b621180d01cd8ee29702d5fb9604d6..79f219cac6a16130cca32a7b444efedd90678c33 100644
--- a/SOL005/NSLifecycleManagement-API/InstantiateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/InstantiateNSTaskWorkflow.robot
@@ -14,7 +14,7 @@ Instantiate Flow of NS lifecycle management operations
     ...    Test title: Instantiate Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Instantiate a NS instance
     ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: the resource is in INSTANTIATED state
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index 0c33d1a0539256e4e8e96f7d6eb8349a38536278..c74757086c97362c9009d89a1348403c8a0e1a1b 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -12,7 +12,7 @@ POST Create a new NsInstance
     ...    Test title: POST Create a new NsInstance
     ...    Test objective: The objective is to test the creation of a new Ns Instances and perform a JSON schema validation of the collected instance data structure
     ...    Pre-conditions: none.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: A Ns instance is instantiated.
@@ -27,7 +27,7 @@ GET information about multiple NS instances
     ...    Test title: GET information about multiple NS instances
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances and perform a JSON schema and content validation of the collected instance data structure
     ...    Pre-conditions: An existing Ns instance.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -39,8 +39,8 @@ GET information about multiple NS instances Bad Request Invalid attribute-based
     [Documentation]    Test ID: 5.3.2.1.3
     ...    Test title: GET information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances using attribute-based filter and perform a JSON schema and content validation of the collected instance data structure
-    ...    Pre-conditions: A Ns instance is instantiated, a bad filter parameter (filter parameters are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v3.3.1).
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Pre-conditions: A Ns instance is instantiated, a bad filter parameter (filter parameters are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v3.5.1).
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -52,8 +52,8 @@ GET information about multiple NS instances Bad Request Invalid attribute select
     [Documentation]    Test ID: 5.3.2.1.4
     ...    Test title: GET information about multiple NS instances Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances using attribute-based filter and perform a JSON schema and content validation of the collected instance data structure
-    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector (attribute selectors are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v3.3.1).
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector (attribute selectors are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v3.5.1).
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -66,7 +66,7 @@ GET NSInstances with "all_fields" attribute selector
     ...    Test title: GET NSInstances with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -79,7 +79,7 @@ GET NSInstances with "exclude_default" attribute selector
     ...    Test title: GET NSInstances with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ GET NSInstances with "fields" attribute selector
     ...    Test title: GET NSInstances with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -105,7 +105,7 @@ GET NSInstances with "exclude_fields" attribute selector
     ...    Test title: GET NSInstances with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -118,7 +118,7 @@ PUT NSInstances - Method not implemented
     ...    Test title: PUT Individual NS instance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -130,7 +130,7 @@ PATCH NSInstances - Method not implemented
     ...    Test title: PATCH NSInstances - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -142,7 +142,7 @@ DELETE NSInstances - Method not implemented
     ...    Test title: DELETE NSInstances - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -154,7 +154,7 @@ GET information about multiple NS instances as Paged Response
     ...    Test title: GET information about multiple NS instances as Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances as a Paged Response.
     ...    Pre-conditions: An existing Ns instance.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -166,8 +166,8 @@ GET information about multiple NS instances - Bad Request Response too Big
     [Documentation]    Test ID: 5.3.2.1.13
     ...    Test title: GET information about multiple NS instances - Bad Request Response too Big
     ...    Test objective: The objective is to test the retrieval of all the available NS Instances fails because reponse is too big, and perform a JSON schema and content validation of the collected instance data structure
-    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector (attribute selectors are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v3.3.1).
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector (attribute selectors are listed in Table 6.4.2.3.2-1  - ETSI GS NFV-SOL 005 [3] v3.5.1).
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
@@ -180,7 +180,7 @@ GET NSInstances with "fields" and "exclude_default" attribute selector
     ...    Test title: GET NSInstances with "fields" and "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active NSInstances with attribute selector list and exclude_default
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  none
     ...    Post-Conditions: none
@@ -193,7 +193,7 @@ GET information about multiple NS instances - Filter
     ...    Test title: GET information about multiple NS instances - Filter
     ...    Test objective: The objective is to test the retrieval of NS Instances using filter and perform a JSON schema and content validation of the collected instance data structure
     ...    Pre-conditions: An existing Ns instance.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
     ...    Post-Conditions: none.
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
index dc0a0c6747a87fb3360c2310c57c397e8cca222e..51e08e3dc6aa784550603930dd4df208aa8533fb 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
@@ -12,7 +12,7 @@ POST NS LCM occurrences - Method not implemented
     ...    Test title: POST NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -24,7 +24,7 @@ GET status information about multiple NS LCM occurrences
     ...    Test title: GET status information about multiple NS LCM occurrences
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -37,7 +37,7 @@ GET status information about multiple NS LCM occurrences Bad Request Invalid att
     ...    Test title: GET status information about multiple NS LCM occurrences Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail because of wrong query parameter
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO, Invalid filter parameter
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -50,7 +50,7 @@ GET status information about multiple NS LCM occurrences Bad Request Invalid att
     ...    Test title: GET status information about multiple NS LCM occurrences Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail because of wrong attributes selector
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO, Invalid attribute selector
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ GET status information about multiple NS LCM occurrences with "all_fields"
     ...    Test title: GET status information about multiple NS LCM occurrences with "all_fields"
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ GET status information about multiple NS LCM occurrences with "exclude_default"
     ...    Test title: GET status information about multiple NS LCM occurrences with "exclude_default"
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +89,7 @@ GET status information about multiple NS LCM occurrences with "fields"
     ...    Test title: GET status information about multiple NS LCM occurrences with "fields"
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -102,7 +102,7 @@ GET status information about multiple NS LCM occurrences with "exclude_fields"
     ...    Test title: GET status information about multiple NS LCM occurrences with "exclude_fields"
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -115,7 +115,7 @@ PUT status information about multiple NS LCM occurrences - Method not implemente
     ...    Test title: PUT status information about multiple NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -127,7 +127,7 @@ PATCH status information about multiple NS LCM occurrences - Method not implemen
     ...    Test title: PATCH status information about multiple NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -139,7 +139,7 @@ DELETE status information about multiple NS LCM occurrences - Method not impleme
     ...    Test title: DELETE status information about multiple NS LCM occurrences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -151,7 +151,7 @@ GET status information about multiple NS LCM occurrences as Paged Response
     ...    Test title: GET status information about multiple NS LCM occurrences as Paged Reponse
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS as paged response.
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -164,7 +164,7 @@ GET status information about multiple NS LCM occurrences - Bad Request Response
     ...    Test title: GET status information about multiple NS LCM occurrences - Bad Request Response too Big
     ...    Test objective: The objective is to test that GET method fail because response is too big, and perform the JSON schema validation of the failed operation HTTP response. 
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO, Invalid filter parameter
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -177,7 +177,7 @@ GET status information about multiple NS LCM occurrences with "fields" and "excl
     ...    Test title: GET status information about multiple NS LCM occurrences with "fields" and "exclude_default"
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -190,7 +190,7 @@ GET status information about multiple NS LCM occurrences - Filter
     ...    Test title: GET status information about multiple NS LCM occurrences - Filter
     ...    Test objective: The objective is to test that GET method returns a list of LCM occurrences of the NS using filtering-based query parameters
     ...    Pre-conditions: At least one LCM occurrences available in the NFVO
-    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.9.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
index 49b2db4f81171dc09ebc087d0e85dfebb4511a29..74ddf0e5b4884261a6e72702a45973229bba3219 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
@@ -15,7 +15,7 @@ Ns Lcm Operation Occurrence Notification
     ...    Test title: Ns Lcm Operation Occurrence Notification
     ...    Test objective: The objective is to test that Ns Lcm Operation Occurrence Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for NS LCM Operation Occurrence notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ Ns Identifier Creation Notification
     ...    Test title: Ns Identifier Creation Notification
     ...    Test objective: The objective is to test that Ns Identifier Creation Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for Ns Identifier Creation notification is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -39,7 +39,7 @@ Ns Identifier Deletion Notification
     ...    Test title: Ns Identifier Deletion Notification
     ...    Test objective: The objective is to test that Ns Identifier Deletion Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: A subscription for Ns Identifier Deletion notification is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSLifecycleManagement-API/Notifications.robot b/SOL005/NSLifecycleManagement-API/Notifications.robot
index ba6fa836a09217647d050bebdee07679d4697373..6e1bceaa15674d017ac42dfcdc767ccb671a4371 100644
--- a/SOL005/NSLifecycleManagement-API/Notifications.robot
+++ b/SOL005/NSLifecycleManagement-API/Notifications.robot
@@ -13,7 +13,7 @@ NS LCM Operation Occurrence Start Notification
     ...    Test title: NS LCM Operation Occurrence Start Notification
     ...    Test objective: The objective is to test the dispatch of NS LCM Operation Occurrence Start Notification when a new NS LCM operation is started in the NFVO, 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 NS LCM Operation Occurrence notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -27,7 +27,7 @@ NS LCM Operation Occurrence Result Notification
     ...    Test title: NS LCM Operation Occurrence Result Notification
     ...    Test objective: The objective is to test the dispatch of NS LCM Operation Occurrence Result Notification when a NS LCM operation is completed in the NFVO, 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 NS LCM operation is in progress, and a subscription for NS LCM Operation Occurrence notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -41,7 +41,7 @@ NS Identifier Creation Notification
     ...    Test title: NS Identifier Creation Notification
     ...    Test objective: The objective is to test the dispatch of NS Identifier Creation Notification when a new NS instance resource is created in the NFVO, 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 NS identifier creation notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -54,7 +54,7 @@ NS Identifier Deletion Notification
     ...    Test title: NS Identifier Deletion Notification
     ...    Test objective: The objective is to test the dispatch of NS Identifier Deletion Notification when a NS instance resource is deleted in the NFVO, 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 NS instance resource is created, and a subscription for NS identifier creation notifications is available in the NFVO.
-    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.18.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
index 32859c776ed4295361764a67730020cc4640e7ea..45353fbd5c052160e201000c05613581f0b4abff 100644
--- a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
@@ -13,7 +13,7 @@ Post Retry operation task
     ...    Test title: Post Retry operation task
     ...    Test objective: The objective is to test that POST method trigger a retry of NS lifecycle operation in case of temporary failure
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP
@@ -27,7 +27,7 @@ Post Retry operation task Not Found
     ...    Test title: Post Retry operation task Not Found
     ...    Test objective: The objective is to test that POST method fail in case of NS lifecycle operation not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -40,7 +40,7 @@ Post Retry operation task Conflict
     ...    Test title: Post Retry operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of NS lifecycle operation status conflict (i.e.  NS instance status not equal to FAILED_TEMP)
     ...    Pre-conditions:  NS instance status not equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.11.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.11.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.11.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.11.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    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 test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.11.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.11.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
index 74651f25a39b1a12cfabfd0584c395cc09295da5..fe3b9c5005c3d23866116b452a1e63cb4467c86f 100644
--- a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
@@ -13,7 +13,7 @@ POST Rollback operation task
     ...    Test title: POST Rollback operation task
     ...    Test objective: The objective is to test that POST method triggers a rollback on the NS LCM operation
     ...    Pre-conditions: NS instance status equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance status not equal to FAILED_TEMP    
@@ -26,7 +26,7 @@ POST Rollback operation task Not Found
     ...    Test title: POST Rollback operation task Not Found
     ...    Test objective: The objective is to test that POST method fails if  NS LCM operation is not found
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none  
@@ -39,7 +39,7 @@ POST Rollback operation task Conflict
     ...    Test title: POST Rollback operation task Conflict
     ...    Test objective: The objective is to test that POST method fail in case of NS LCM operation status conflict (i.e. NS instance status not equal to FAILED_TEMP)
     ...    Pre-conditions: NS instance status not equal to FAILED_TEMP
-    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.12.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none      
@@ -52,7 +52,7 @@ GET Rollback operation task - Method not implemented
     ...    Test title: GET Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.12.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PUT Rollback operation task - Method not implemented
     ...    Test title: PUT Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.12.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ PATCH Rollback operation task - Method not implemented
     ...    Test title: PATCH Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.12.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +88,7 @@ DELETE Rollback operation task - Method not implemented
     ...    Test title: DELETE Rollback operation task - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.12.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.12.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
index 4bbb56506e3b6f61fe11fd65596d8c2185744996..9f02dd434b57d071cb79c88d5a8e65b4e0c0c3ff 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
@@ -13,7 +13,7 @@ POST Scale a nsInstance
     ...    Test title: POST Scale a nsInstance
     ...    Test objective: The objective is to test that POST method scales NS instance
     ...    Pre-conditions: NS instance is INSTANTIATED state
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance is INSTANTIATED state and NS has been scaled
@@ -27,7 +27,7 @@ POST Scale a nsInstance - Conflict (Not Instantited)
     ...    Test title: POST Scale a nsInstance - Conflict (Not Instantited)
     ...    Test objective: The objective is to test that POST method cannot scale NS instance because of conflict in resource status (i.e. because the resource is in  NOT_INSTANTIATED state)
     ...    Pre-conditions: NS instance is in NOT_INSTANTIATED state.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The Scale NS operation is not triggered on the NFVO
@@ -40,7 +40,7 @@ GET Scale NSInstance- Method not implemented
     ...    Test title: GET Scale NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ PUT Scale NSInstance - Method not implemented
     ...    Test title: PUT Scale NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PATCH Scale NSInstance - Method not implemented
     ...    Test title: PATCH Scale NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ DELETE Scale NSInstance - Method not implemented
     ...    Test title: DELETE Scale NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
index 9f4de02b1420292ad85c32316d42fcbcf30333d1..0ee6d93d89de0bc67c1d1296992fe11a0277041a 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTaskWorkflow.robot
@@ -14,7 +14,7 @@ Scale Flow of NS lifecycle management operations
     ...    Test title: Instantiate Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Instantiate a NS instance
     ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: the resource is in INSTANTIATED state    
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index 2c7293a89a0d1008f39551632e859f60028bf472..09fe3ed62067394966afb38647b75776963e729a 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -15,7 +15,7 @@ POST Create a new subscription
     ...    Test title: POST Create a new subscription
     ...    Test objective: The objective is to test that POST method create a subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: subscription is created in the NFVO     
@@ -29,7 +29,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Test title: POST Create a new subscription - DUPLICATION
     ...    Test objective: The objective is to test that POST method create a duplicate subscription 
     ...    Pre-conditions: a subscription shall already exist
-    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: duplication supported by NFVO
     ...    Post-Conditions: duplicate subscription is created in the NFVO     
@@ -43,7 +43,7 @@ POST Create a new Subscription - NO-DUPLICATION
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The objective is to test that POST method cannot create a duplicate subscription 
     ...    Pre-conditions: a subscription shall already exist
-    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: duplication NOT supported by NFVO
     ...    Post-Conditions: duplicate subscription is not created in the NFVO     
@@ -56,7 +56,7 @@ GET Subscriptions
     ...    Test title: GET Subscriptions
     ...    Test objective: The objective is to test that GET method  retrieve the list of existing subscriptions
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -69,7 +69,7 @@ GET Subscription - Filter
     ...    Test title: GET Subscription - Filter
     ...    Test objective: The objective is Get the list of active subscriptions using a filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -82,7 +82,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 an invalid filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -95,7 +95,7 @@ GET subscriptions with "all_fields" attribute selector
     ...    Test title: GET subscriptions with "all_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -108,7 +108,7 @@ GET subscriptions with "exclude_default" attribute selector
     ...    Test title: GET subscriptions with "exclude_default" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -121,7 +121,7 @@ GET subscriptions with "fields" attribute selector
     ...    Test title: GET subscriptions with "fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -134,7 +134,7 @@ GET subscriptions with "exclude_fields" attribute selector
     ...    Test title: GET subscriptions with "exclude_fields" attribute selector
     ...    Test objective: The objective is to retrieve the list of active subscriptions with attribute selector
     ...    Pre-conditions: 
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability:  
     ...    Post-Conditions: 
@@ -147,7 +147,7 @@ PUT subscriptions - Method not implemented
     ...    Test title: PUT subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method cannot modify a NS lifecycle management subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -159,7 +159,7 @@ PATCH subscriptions - Method not implemented
     ...    Test title: PATCH subscriptions - Method not implemented
     ...    Test objective: The objective is to test that PUT method cannot modify a NS lifecycle management subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -171,7 +171,7 @@ DELETE subscriptions - Method not implemented
     ...    Test title: DELETE subscriptions - Method not implemented
     ...    Test objective: The objective is to test that DELETE method cannot modify a NS lifecycle management subscription
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -183,7 +183,7 @@ GET Subscriptions as Paged Response
     ...    Test title: GET Subscriptions as Paged Response
     ...    Test objective: The objective is to test that GET method  retrieve the list of existing subscriptions as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports paged response
     ...    Post-Conditions: none    
@@ -196,7 +196,7 @@ GET subscriptions - Bad Request Response too Big
     ...    Test title: GET subscriptions - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of active subscriptions list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support paged response
     ...    Post-Conditions: none 
@@ -209,7 +209,7 @@ POST Create a new subscription - Unprocessable Entity
     ...    Test title: POST Create a new subscription - Unprocessable Entity
     ...    Test objective: The objective is to test the creation of a new lifecycle management subscription fials when 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
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.16.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none     
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index d65c808210ac21ab4950a7c8bdfb7dfecc1153c8..4abf657b7b14c5299dcf0ac7f9b48bd1f28cde86 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -12,7 +12,7 @@ POST Terminate a NSInstance
     ...    Test title: POST Terminate a NSInstance
     ...    Test objective: The objective is to test that POST method terminate the NS
     ...    Pre-conditions: NS instance in INSTANTIATED state
-    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance has NOT_INSTANTIATED state
@@ -26,7 +26,7 @@ POST Terminate a NSInstance - Conflict (Not Instantited)
     ...    Test title: POST Terminate a NSInstance - Conflict (Not Instantited)
     ...    Test objective: The objective is to test that POST method cannot terminate the NS because of conflict in resource status (i.e. the resource is not in INSTANTIATED state) 
     ...    Pre-conditions: NS instance is in NOT_INSTANTIATED state
-    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.8.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: NS instance is in NOT_INSTANTIATED state
@@ -40,7 +40,7 @@ GET Terminate NSInstance- Method not implemented
     ...    Test title: GET Terminate NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.8.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ PUT Terminate NSInstance - Method not implemented
     ...    Test title: PUT Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.8.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -64,7 +64,7 @@ PATCH Terminate NSInstance - Method not implemented
     ...    Test title: PATCH Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.8.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -76,7 +76,7 @@ DELETE Terminate NSInstance - Method not implemented
     ...    Test title: DELETE Terminate NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.8.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
index b6bd1278ca623bb4ad423b831df8bb07d75d3ed0..cc508316c16e98262ecd787138c0d8441cce1725 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTaskWorkflow.robot
@@ -14,7 +14,7 @@ Terminate Flow of NS lifecycle management operations
     ...    Test title: Terminate Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Terminate a NS instance
     ...    Pre-conditions: the resource is in INSTANTIATED state
-    ...    Reference: Clause 6.4.8 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.8 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: the resource is in NOT_INSTANTIATED state
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
index 967cd9d057f469eb64f4cf7b11f41eb7d6746505..b30e8fbed12cf3c28f9ab535eeaf2dd808d4bbf1 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
@@ -13,7 +13,7 @@ POST Update a NSInstance
     ...    Test title: POST Update a NSInstance
     ...    Test objective: The objective is to test that POST method update a NS instance
     ...    Pre-conditions: An NS instance is in INSTANTIATED state
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The NS instance is still INSTANTIATED and updated on the NFVO
@@ -26,7 +26,7 @@ POST Update a NSInstance - Conflict (Not Instantited)
     ...    Test title: POST Update a NSInstance - Conflict (Not Instantited)
     ...    Test objective: The objective is to test that POST method fail if a NS Instance is not existing or is in NOT_INSTANTIATED state
     ...    Pre-conditions: An NS instance is in INSTANTIATED state 
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: The  NS instance is not updated on the NFVO
@@ -39,7 +39,7 @@ GET Update NSInstance- Method not implemented
     ...    Test title: GET Update NSInstance- Method not implemented
     ...    Test objective: The objective is to test that GET method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -51,7 +51,7 @@ PUT Update NSInstance - Method not implemented
     ...    Test title: PUT Update NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -63,7 +63,7 @@ PATCH Update NSInstance - Method not implemented
     ...    Test title: PATCH Update NSInstance - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -75,7 +75,7 @@ DELETE Update NSInstance - Method not implemented
     ...    Test title: DELETE Update NSInstance - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
index 564bb6431f05f70389b7f8f1189f6e526214928f..43c6f3809a969efc27b99de49f0f45663ebc9966 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTaskWorkflow.robot
@@ -15,7 +15,7 @@ Update Flow of NS lifecycle management operations
     ...    Test title: Update Flow of NS lifecycle management operations
     ...    Test objective: The objective is to test the workflow for Update a NS instance
     ...    Pre-conditions: the resource is in INSTANTIATED state
-    ...    Reference: Clause 6.4.6 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.6 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: the resource is in INSTANTIATED state
diff --git a/SOL005/NSLifecycleManagement-API/VNFSnapshots.robot b/SOL005/NSLifecycleManagement-API/VNFSnapshots.robot
index dfa5b2e3291212b30aac3bbbbc5e03113f0d7917..7dedffc7ede8c5b7bb663838245ac3407d260f9c 100644
--- a/SOL005/NSLifecycleManagement-API/VNFSnapshots.robot
+++ b/SOL005/NSLifecycleManagement-API/VNFSnapshots.robot
@@ -7,7 +7,7 @@ POST VNF Snapshots - Method Not Implemented
     ...    Test title: POST VNF Snapshots - Method Not Implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.19.3.1 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.1 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET information about multiple VNF Snapshots
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET information about multiple VNF Snapshots Bad Request Invalid attribute-based
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET information about multiple VNF Snapshots Bad Request Invalid attribute selec
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ GET information about multiple VNF Snapshots with "all_fields" attribute selecto
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ GET information about multiple VNF Snapshots with "exclude_default" attribute se
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET information about multiple VNF Snapshots with "fields" attribute selector
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET information about multiple VNF Snapshots with "exclude_default" and "fields"
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ GET information about multiple VNF Snapshots with "exclude_fields" attribute sel
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ GET VNF Snapshots - Bad Request Response too Big
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support paged response.
     ...    Post-Conditions: none 
@@ -136,7 +136,7 @@ GET VNF Snapshots as Paged Response
     ...    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 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports paged response.
     ...    Post-Conditions: none    
@@ -149,7 +149,7 @@ PUT VNF Snapshots - Method not implemented
     ...    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 6.4.19.3.3 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.3 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -161,7 +161,7 @@ PATCH VNF Snapshots - Method not implemented
     ...    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 6.4.19.3.4 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.4 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -173,7 +173,7 @@ DELETE VNF Snapshots - Method not implemented
     ...    Test title: DELETE VNF Snapshots - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 6.4.19.3.5 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.5 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -185,7 +185,7 @@ GET information about multiple VNF Snapshots using Filter
     ...    Test title: GET information about multiple VNF Snapshots using Filter
     ...    Test objective: The objective is to get information about multiples VNF snapshots using filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.3.1
+    ...    Reference: Clause 6.4.19.3.2 - ETSI GS NFV-SOL 005 [3] v3.5.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none