From 4e15d6cf0fc1a790a59fd4514b7dae2ba0aaae69 Mon Sep 17 00:00:00 2001
From: aureliano sinatra <sinaure@gmail.com>
Date: Mon, 29 Jul 2019 11:20:51 +0200
Subject: [PATCH] corrections wording

---
 .../CancelOperationTask.robot                 |  4 +-
 .../FailOperationTask.robot                   |  4 +-
 .../NotificationEndpoint.robot                |  4 +-
 .../RetryOperationTask.robot                  |  4 +-
 .../RollbackOperationTask.robot               |  4 +-
 .../CancelOperationTask.robot                 |  4 +-
 .../CancelOperationWorkflow.robot             |  4 +-
 .../ChangeExternalVNFConnectivityTask.robot   |  2 +-
 ...hangeExternalVNFConnectivityWorkflow.robot |  4 +-
 .../ChangeVNFFlavourTask.robot                |  8 ++--
 .../ChangeVNFFlavourWorkflow.robot            |  2 +-
 .../FailOperationTask.robot                   |  4 +-
 .../HealVNFTask.robot                         |  2 +-
 .../HealVNFWorkflow.robot                     |  2 +-
 .../IndividualVNFInstance.robot               | 22 +++++-----
 .../IndividualVnfLcmOperationOccurence.robot  | 14 +++----
 .../InstantiateVNFTask.robot                  |  2 +-
 .../ModifyVNFInformationWorkflow.robot        |  4 +-
 .../NotificationEndpoint.robot                |  2 +-
 .../OperateVNFWorkflow.robot                  |  2 +-
 .../RetryOperationTask.robot                  | 14 +++----
 .../RetryOperationWorkflow.robot              |  4 +-
 .../RollBackOperationWorkflow.robot           |  4 +-
 .../RollbackOperationTask.robot               |  4 +-
 .../ScaleVNFTask.robot                        |  4 +-
 .../ScaleVNFToLevelWorkflow.robot             |  2 +-
 .../TerminatelVNFWorkflow.robot               |  2 +-
 .../VnfLcmMntOperationKeywords.robot          | 16 +++----
 .../VnfLcmOperationOccurences.robot           | 42 +++++++++----------
 .../FailOperationTask.robot                   |  6 +--
 .../HealNSTask.robot                          |  6 +--
 .../IndividualNSInstance.robot                | 17 ++++----
 .../IndividualNSLCMOccurences.robot           | 24 +++++------
 .../IndividualSubscription.robot              |  8 ++--
 .../NSInstances.robot                         | 18 ++++----
 .../NSLCMOccurences.robot                     | 30 ++++++-------
 .../NotificationEndpoint.robot                |  4 +-
 .../ScaleNSTask.robot                         |  6 +--
 .../Subscriptions.robot                       |  8 ++--
 .../TerminateNSTask.robot                     | 10 ++---
 .../UpdateNSTask.robot                        |  8 ++--
 41 files changed, 167 insertions(+), 168 deletions(-)

diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index 864b8f8a..d80fb5aa 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -12,8 +12,8 @@ Suite Setup    Check resource existance
 Post Cancel operation task
     [Documentation]    Test ID: 6.3.5.16.1
     ...    Test title: POST Cancel operation task
-    ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the related "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
+    ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
     ...    Reference:  section 5.4.17.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index e08cfe3a..6fa0b8ba 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -11,7 +11,7 @@ Post Fail operation task
     [Documentation]    Test ID: 6.3.5.15.1
     ...    Test title: Post Fail operation task
     ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.16.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -25,7 +25,7 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     [Documentation]    Test ID: 6.3.5.15.2
     ...    Test title: Post Fail operation task
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.16.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
index bdf6b50f..f4baa440 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -23,7 +23,7 @@ Deliver a notification - Operation Occurence
 Deliver a notification - Id Creation
      [Documentation]    Test ID: 6.3.5.19.2
     ...    Test title: Deliver a notification - Id Creation
-    ...    Test objective: The objective is to test that POST method trigger a notification about the creation of a VNF identifier and the related to a VNF instance resource.
+    ...    Test objective: The objective is to test that POST method trigger a notification about the creation of a VNF instance resource.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.20.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -34,7 +34,7 @@ Deliver a notification - Id Creation
 Deliver a notification - Id deletion
     [Documentation]    Test ID: 6.3.5.19.3
     ...    Test title: Deliver a notification - Id deletion
-    ...    Test objective: The objective is to test that POST method trigger A notification about the deletion of a VNF identifier and the related to a VNF instance resource
+    ...    Test objective: The objective is to test that POST method trigger A notification about the deletion of a VNF instance resource
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.20.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index 3371ce90..2f1ad366 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -13,7 +13,7 @@ Post Retry operation task
     [Documentation]    Test ID: 6.3.5.13.1
     ...    Test title: Post Retry operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates retrying a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.14.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -27,7 +27,7 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
     [Documentation]    Test ID: 6.3.5.13.2
     ...    Test title: Post Retry operation task
     ...    Test objective: The objective is to test that the retry operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (i.e. the VNF instance resource is not in FAILED_TEMP state)
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.14.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 716cdeb8..f0a3ba78 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -13,7 +13,7 @@ Post Rollback operation task
     [Documentation]    Test ID: 6.3.5.14.1
     ...    Test title: Post Rollback operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.15.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
@@ -27,7 +27,7 @@ Post Rollback operation task Conflict (Not-FAILED_TEMP)
     [Documentation]    Test ID: 6.3.5.14.2
     ...    Test title: Post Rollback operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.15.3.1 - SOL002 v2.4.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index 0550cfa8..1a84a332 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -11,8 +11,8 @@ Library    JSONSchemaLibrary    schemas/
 Post Cancel operation task
     [Documentation]    Test ID: 7.3.1.16.1
     ...    Test title: POST Cancel operation task
-    ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the related "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
+    ...    Test objective: The POST method initiates cancelling an ongoing VNF lifecycle operation while it is being executed or rolled back, i.e. the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" is either in "PROCESSING" or "ROLLING_BACK" state.
     ...    Reference:  section 5.4.17.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
index 9e2c4fb6..b7bbaae9 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationWorkflow.robot
@@ -16,7 +16,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Cancel a VNF LCM Operation - STARTING
-    [Documentation]    Test ID: 7.3.1.25
+    [Documentation]    Test ID: 7.3.1.25 
     ...    Test title: Cancel a VNF LCM Operation
     ...    Test objective: The objective is to test the workflow for Cancelling a VNF LCM Operation
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in STARTING state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
@@ -32,7 +32,7 @@ Cancel a VNF LCM Operation - STARTING
     Check Postcondition VNF Cancel - STARTING
 
 Cancel a VNF LCM Operation - PROCESSING - ROLLING_BACK
-    [Documentation]    Test ID: 7.3.1.2.2
+    [Documentation]    Test ID: 7.3.1.26
     ...    Test title: Cancel a VNF LCM Operation
     ...    Test objective: The objective is to test the workflow for Cancelling a VNF LCM Operation
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in PROCESSING or ROLLING_BACK state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 450858a3..6e7e4960 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -11,7 +11,7 @@ Library    JSONSchemaLibrary    schemas/
 POST Change external VNF connectivity 
     [Documentation]    Test ID: 7.3.1.10.1
     ...    Test title: POST Change external VNF connectivity
-    ...    Test objective: The objective is to test that POST method trigger a change in VNF external connectivity
+    ...    Test objective: The objective is to test that POST method trigger a change in VNF external connectivity. Supported types of changes that this operation are: 1. Disconnect the external CPs that are connected to a particular external VL, and connect them to a different external VL. 2. Change the connectivity parameters of the existing external CPs, including changing addresses.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.11.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
index 8cf3a3e4..f24523f1 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityWorkflow.robot
@@ -16,10 +16,10 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Operate a VNF Instance
-    [Documentation]    Test ID: 7.3.1.24
+    [Documentation]    Test ID: 7.3.1.27
     ...    Test title: Change the external connectivity of a VNF instance
     ...    Test objective: The objective is to change the external connectivity of a VNF instance.
-    ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.a.b.c)
+    ...    Pre-conditions: VNF instance in INSTANTIATED state 
     ...    Reference: section 5.4.11 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. Change the external connectivity of a VNF instance is supported for the VNF (as capability in the VNFD)
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 4770d21d..ade8c77c 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -12,7 +12,7 @@ POST Change deployment flavour of a vnfInstance
     [Documentation]    Test ID: 7.3.1.6.1
     ...    Test title: POST Change deployment flavour of a vnfInstance
     ...    Test objective: The objective is to test that POST method trigger a change in VNF deployment flavour
-    ...    Pre-conditions: none
+    ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.7.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -24,8 +24,8 @@ POST Change deployment flavour of a vnfInstance
 Change deployment flavour of a vnfInstance Conflict (Not-Instantiated)
     [Documentation]    Test ID: 7.3.1.6.2
     ...    Test title: POST Change deployment flavour of a vnfInstance
-    ...    Test objective: The objective is to test that POST method can't trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource. 
-    ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
+    ...    Test objective: The objective is to test that POST method can't trigger a change in VNF deployment flavour because of a conflict with the state of the VNF instance resource. (VNF instance resource is not in NOT-INSTANTIATED state)
+    ...    Pre-conditions: VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.7.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -40,7 +40,7 @@ Change deployment flavour of a vnfInstance Not Found
     [Documentation]    Test ID: 7.3.1.6.3
     ...    Test title: POST Change deployment flavour of a vnfInstance
     ...    Test objective: The objective is to test that POST method can't trigger a change in VNF deployment flavour because the VNF instance resource is not found. 
-    ...    Pre-conditions: VNF instance resource is not in NOT-INSTANTIATED state
+    ...    Pre-conditions: the VNF instance resource is not existing
     ...    Reference:  section 5.4.7.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
index 8be4c4ab..e3f9f9da 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourWorkflow.robot
@@ -16,7 +16,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Change VNF External Connectivity
-    [Documentation]    Test ID: 5.4.7.1
+    [Documentation]    Test ID: 7.3.1.28
     ...    Test title: Change VNF Flavour Workflow
     ...    Test objective: The objective is to test the workflow for a change flavour of an existing VNF instance
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.4.4.1). NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 3d2e02b7..8487ec75 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -12,7 +12,7 @@ Post Fail operation task
     [Documentation]    Test ID: 7.3.1.15.1
     ...    Test title: Post Fail operation task
     ...    Test objective: The objective is to test that POST method mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.16.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -26,7 +26,7 @@ Post Fail operation task Conflict (Not-FAILED_TEMP)
     [Documentation]    Test ID: 7.3.1.15.2
     ...    Test title: Post Fail operation task
     ...    Test objective: The objective is to test that POST method cannot mark as "finally failed" a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.16.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index 3ac5c806..d92525cb 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -12,7 +12,7 @@ POST Heal a vnfInstance
      [Documentation]    Test ID: 7.3.1.8.1
     ...    Test title: POST Heal a vnfInstance
     ...    Test objective: The objective is to test that POST method heal a VNF instance
-    ...    Pre-conditions: none
+    ...    Pre-conditions: the VNF instance resource is not in NOT-INSTANTIATED state
     ...    Reference:  section 5.4.9.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
index cbeefeba..0545eeac 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFWorkflow.robot
@@ -19,7 +19,7 @@ Heal a VNF Instance
     [Documentation]    Test ID: 7.3.1.22
     ...    Test title: Heal a VNF Instance
     ...    Test objective: The objective is to heal a VNF instance.
-    ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.a.b.c)
+    ...    Pre-conditions: VNF instance in INSTANTIATED state 
     ...    Reference: section 5.4.9 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. Heal a VNF instance is supported for the VNF (as capability in the VNFD)
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 73ac6077..b616454a 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Resource    environment/configuration.txt
-# Suite setup     Expect spec    SOL002-VNFLifecycleManagement-API.yaml
+# Suite setup     Expect spec    SOL003-VNFLifecycleManagement-API.yaml
 Resource    environment/variables.txt 
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}  
 Resource    VnfLcmMntOperationKeywords.robot
@@ -18,7 +18,7 @@ Post Individual VNFInstance - Method not implemented
     ...    Test title: Post Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: section 5.4.3.3.1 - SOL002 v2.4.1
+    ...    Reference: section 5.4.3.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -30,7 +30,7 @@ Get Information about an individual VNF Instance
     ...    Test title: Get Information about an individual VNF Instance
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: section 5.4.3.3.2 - SOL002 v2.4.1
+    ...    Reference: section 5.4.3.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -44,7 +44,7 @@ PUT Individual VNFInstance - Method not implemented
     ...    Test title: PUT Individual VNFInstance - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: section 5.4.3.3.3 - SOL002 v2.4.1
+    ...    Reference: section 5.4.3.3.3 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -55,8 +55,8 @@ PATCH Individual VNFInstance
      [Documentation]    Test ID: 7.3.1.2.4
     ...    Test title: PATCH Individual VNFInstance
     ...    Test objective: This method modifies an individual VNF instance resource
-    ...    Pre-conditions: none
-    ...    Reference: section 5.4.3.3.4 - SOL002 v2.4.1
+    ...    Pre-conditions: the VNF instance resource is existing
+    ...    Reference: section 5.4.3.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -69,7 +69,7 @@ PATCH Individual VNFInstance Precondition failed
     ...    Test title: PATCH Individual VNFInstance Precondition failed
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions:  A precondition given in an HTTP request header is not fulfilled. Typically, this is due to an ETag mismatch, indicating that the resource was modified by another entity
-    ...    Reference: section 5.4.3.3.4 - SOL002 v2.4.1
+    ...    Reference: section 5.4.3.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -82,7 +82,7 @@ PATCH Individual VNFInstance Conflict
     ...    Test title: PATCH Individual VNFInstance Precondition failed
     ...    Test objective: The objective is to create a new VNF instance resource
     ...    Pre-conditions: none
-    ...    Reference: section 5.4.3.3.4 - SOL002 v2.4.1
+    ...    Reference: section 5.4.3.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -95,8 +95,8 @@ DELETE Individual VNFInstance
      [Documentation]    Test ID: 7.3.1.2.7
     ...    Test title: DELETE Individual VNFInstance
     ...    Test objective: The objective is to delete a VNF instance
-    ...    Pre-conditions: none
-    ...    Reference: section 5.4.3.3.5 - SOL002 v2.4.1
+    ...    Pre-conditions: the VNF instance resource is existing
+    ...    Reference: section 5.4.3.3.5 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
@@ -108,7 +108,7 @@ DELETE Individual VNFInstance Conflict
     ...    Test title: DELETE Individual VNFInstance
     ...    Test objective: The objective is to verify that The operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
     ...    Pre-conditions: VNF instance resource is in INSTANTIATED state
-    ...    Reference: section 5.4.3.3.5 - SOL002 v2.4.1
+    ...    Reference: section 5.4.3.3.5 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
     ...    Post-Conditions: 
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index d0e79a45..bfc28443 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -7,16 +7,16 @@ Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
 
 *** Test Cases ***
-Post Individual VNF LCM OP occurences - Method not implemented
+Post Individual VNF LCM Operation occurences - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.1
-    ...    Test title: Post Individual VNF LCM OP occurences - Method not implemented
+    ...    Test title: Post Individual VNF LCM Operation occurences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.13.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post Individual VNF LCM OP occurences
+    Post Individual VNF LCM Operation occurences
     Check HTTP Response Status Code Is    405
     
 Get status information about multiple VNF instances 
@@ -34,7 +34,7 @@ Get status information about multiple VNF instances
 
 PUT status information about multiple VNF instances - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.3
-    ...    Test title: Put Individual VNF LCM OP occurences - Method not implemented
+    ...    Test title: Put Individual VNF LCM Operation occurences - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.13.3.3 - SOL003 v2.4.1
@@ -44,9 +44,9 @@ PUT status information about multiple VNF instances - Method not implemented
     Put multiple VNF instances
     Check HTTP Response Status Code Is    405
 
-PATCH status information about multiple VNF instances - Method not implemented 
+PATCH status information about VNF instances - Method not implemented 
     [Documentation]    Test ID: 7.3.1.12.4
-    ...    Test title: Patch Individual VNF LCM OP occurences - Method not implemented
+    ...    Test title: Patch Individual VNF LCM Operation occurences - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.13.3.4 - SOL003 v2.4.1
@@ -58,7 +58,7 @@ PATCH status information about multiple VNF instances - Method not implemented
     
 DELETE status information about multiple VNF instances - Method not implemented 
     [Documentation]    Test ID: 7.3.1.12.5
-    ...    Test title: Delete Individual VNF LCM OP occurences - Method not implemented
+    ...    Test title: Delete Individual VNF LCM Operation occurences - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.13.3.5 - SOL003 v2.4.1
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 4b504e38..1093c5bf 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -14,7 +14,7 @@ Instantiate a vnfInstance
     [Documentation]    Test ID: 7.3.1.3.1
     ...    Test title: Post Instantiate Individual VNFInstance 
     ...    Test objective: The objective is to instantiate a VNF instance
-    ...    Pre-conditions: none
+    ...    Pre-conditions: an existing VNF 
     ...    Reference: section 5.4.4.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: 
diff --git a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
index 1f97c4bb..bc60a181 100644
--- a/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ModifyVNFInformationWorkflow.robot
@@ -16,10 +16,10 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Modify info of a VNF Instance
-    [Documentation]    Test ID: 5.x.y.x
+    [Documentation]    Test ID: 7.3.1.24
     ...    Test title: Update information about a VNF instance
     ...    Test objective: The objective is to update information about a VNF instance.
-    ...    Pre-conditions: VNF instance is created (Test ID: 5.a.b.c)
+    ...    Pre-conditions: VNF instance is created 
     ...    Reference: section 5.3.6 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: NFVO is able to receive notifications from VNFM. Update information of a VNF instance is supported for the VNF (as capability in the VNFD)
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
index 06c8c486..e3b3ac9c 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -27,7 +27,7 @@ Deliver a notification - Operation Occurence
 Deliver a notification - Id Creation
      [Documentation]    Test ID: 7.3.1.19.2
     ...    Test title: Deliver a notification - Id Creation
-    ...    Test objective: The objective is to test that POST method trigger a notification about the creation of a VNF identifier and the related to a VNF instance resource.
+    ...    Test objective: The objective is to test that POST method trigger a notification about the creation a VNF instance resource.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.20.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
index ce64b4f3..76d8ac0d 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFWorkflow.robot
@@ -19,7 +19,7 @@ Operate a VNF Instance
     [Documentation]    Test ID: 7.3.1.27
     ...    Test title: Operate a VNF Instance
     ...    Test objective: The objective is to change the operational state of a VNF instance.
-    ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.a.b.c)
+    ...    Pre-conditions: VNF instance in INSTANTIATED state 
     ...    Reference: section 5.3.3 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: change the operational state of a VNF instance is supported for the VNF (as capability in the VNFD)
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index c49d5c1b..37738232 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -14,8 +14,8 @@ Suite Setup    Check resource existance
 Post Retry operation task  
     [Documentation]    Test ID: 7.3.1.13.1
     ...    Test title: Post Retry operation task
-    ...    Test objective: The objective is to test that POST method The POST method initiates retrying a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
+    ...    Test objective: The objective is to test that POST method The POST method initiates retrying a VNF lifecycle operation if the operation has experienced a temporary failure
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.14.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -29,7 +29,7 @@ Post Retry operation task Conflict (Not-FAILED_TEMP)
     [Documentation]    Test ID: 7.3.1.13.2
     ...    Test title: Post Retry operation task
     ...    Test objective: The objective is to test that the retry operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (i.e. the VNF instance resource is not in FAILED_TEMP state)
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.14.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -57,7 +57,7 @@ GET Retry operation task - Method not implemented
     ...    Test title: GET Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference:  section 5.4.9.14.2 - SOL003 v2.4.1
+    ...    Reference:  section 5.4.14.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -69,7 +69,7 @@ PUT Retry operation task - Method not implemented
     ...    Test title: PUT Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference:  section 5.4.9.14.3 - SOL003 v2.4.1
+    ...    Reference:  section 5.4.14.3.3 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -81,7 +81,7 @@ PATCH Retry operation task - Method not implemented
     ...    Test title: PATCH Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference:  section 5.4.9.14.4 - SOL003 v2.4.1
+    ...    Reference:  section 5.4.14.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
@@ -93,7 +93,7 @@ DELETE Retry operation task - Method not implemented
     ...    Test title: DELETE Retry operation task- Method not implemented
     ...    Test objective: The objective is to verify that the method is not implemented 
     ...    Pre-conditions: none
-    ...    Reference:  section 5.4.9.14.5 - SOL003 v2.4.1
+    ...    Reference:  section 5.4.14.3.5 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: 
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
index e2dabd1f..cfd724a0 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationWorkflow.robot
@@ -14,7 +14,7 @@ Library    Process
 
 *** Test Cases ***
 Retry VNF LCM Operation - Successful
-    [Documentation]    Test ID: 7.3.1.28
+    [Documentation]    Test ID: 7.3.1.29
     ...    Test title: Retry VNF LCM Operation - Successful
     ...    Test objective: The objective is to test the workflow for a Retry VNF LCM Operation and the operation is successful
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
@@ -31,7 +31,7 @@ Retry VNF LCM Operation - Successful
     Check Postcondition VNF Retry Successful
 
 Retry VNF LCM Operation - Unsuccessful
-    [Documentation]    Test ID: 5.x.x.x
+    [Documentation]    Test ID: 7.3.1.30
     ...    Test title: Retry VNF LCM Operation - Unsuccessful
     ...    Test objective: The objective is to test the workflow for a Retry VNF LCM Operation and the operation is not successful
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
index d1ba66d3..768847e3 100644
--- a/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollBackOperationWorkflow.robot
@@ -16,7 +16,7 @@ Suite Teardown    Terminate All Processes    kill=true
 
 *** Test Cases ***
 Roll back a VNF LCM Operation - Successful
-    [Documentation]    Test ID: 7.3.1.29
+    [Documentation]    Test ID: 7.3.1.31
     ...    Test title: Roll back VNF LCM Operation - Successful
     ...    Test objective: The objective is to test the workflow for a Rolling Back a VNF LCM Operation and the operation is successful
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
@@ -33,7 +33,7 @@ Roll back a VNF LCM Operation - Successful
     Check Postcondition VNF Roll Back Successful
 
 Retry VNF LCM Operation - Unsuccessful
-    [Documentation]    Test ID: 7.3.1.30
+    [Documentation]    Test ID: 7.3.1.32
     ...    Test title: Retry VNF LCM Operation - Unsuccessful
     ...    Test objective: The objective is to test the workflow for a Retry VNF LCM Operation and the operation is not successful
     ...    Pre-conditions: The VNF lifecycle management operation occurrence is in FAILED_TEMP state. NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 404a34a5..8c978527 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -14,7 +14,7 @@ Post Rollback operation task
     [Documentation]    Test ID: 7.3.1.14.1
     ...    Test title: Post Rollback operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.15.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
@@ -28,7 +28,7 @@ Post Rollback operation task Conflict (Not-FAILED_TEMP)
     [Documentation]    Test ID: 7.3.1.14.2
     ...    Test title: Post Rollback operation task
     ...    Test objective: The objective is to test that POST method The POST method initiates rollback a VNF lifecycle operation if that operation has experienced a temporary failure
-    ...    Pre-conditions: the related "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
+    ...    Pre-conditions: the "VNF LCM operation occurrence" resource is not in "FAILED_TEMP" state.
     ...    Reference:  section 5.4.15.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index e8e23884..d16d84e2 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -26,7 +26,7 @@ POST Scale a vnfInstance Conflict (Not-Instantiated)
     # TODO: Need to set the pre-condition of the test. VNF instance shall be in INSTANTIATED state
     [Documentation]    Test ID: 7.3.1.4.2
     ...    Test title: POST Scale a vnfInstance Conflict (Not-Instantiated)
-    ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
+    ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. (VNF instance resource is in NOT-INSTANTIATED state.) 
     ...    Pre-conditions:  VNF instance resource is in NOT-INSTANTIATED state
     ...    Reference: section 5.4.5.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
@@ -40,7 +40,7 @@ POST Scale a vnfInstance Not Found
     # TODO: Need to create a vnfInstance which's instantiatedVnfInfo.scaleStatus is absent
      [Documentation]    Test ID: 7.3.1.4.3
     ...    Test title: POST Scale a vnfInstance Not Found
-    ...    Test objective: The objective is to verify that the operation cannot be executed currently, due to a conflict with the state of the VNF instance resource. 
+    ...    Test objective: The objective is to verify that the operation cannot be executed currently, because the VNF instance resource is not found. 
     ...    Pre-conditions:  
     ...    Reference: section 5.4.5.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
index 40a71265..7a54ca1d 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelWorkflow.robot
@@ -14,7 +14,7 @@ Library    Process
 
 *** Test Cases ***
 VNF Instance Scale To Level
-   [Documentation]    Test ID: 7.3.1.31
+   [Documentation]    Test ID: 7.3.1.33
     ...    Test title: VNF Instance Scale To Level worflow
     ...    Test objective: The objective is to test the workflow for the scale to level of a VNF instance
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.4.4.1). NFVO is subscribed to VNF LCM Operation Occurrence notifications (Test ID: 5.4.20.1)
diff --git a/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot b/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
index 65c811cb..93f5f462 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminatelVNFWorkflow.robot
@@ -14,7 +14,7 @@ Library    Process
 
 *** Test Cases ***
 Terminate a VNF Instance
-    [Documentation]    Test ID: 7.3.1.33
+    [Documentation]    Test ID: 7.3.1.34
     ...    Test title: Terminate a VNF Instance
     ...    Test objective: The objective is to terminate a VNF instance.
     ...    Pre-conditions: VNF instance in INSTANTIATED state (Test ID: 5.a.b.c)
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 1b1adcee..2efc5fef 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -693,14 +693,14 @@ DELETE Operate VNF
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}		
 	
-Post VNF LCM OP occurences
+Post VNF LCM Operation occurrences
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs  	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}		
-GET VNF LCM OP occurences
+GET VNF LCM Operation occurrences
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -708,42 +708,42 @@ GET VNF LCM OP occurences
     Get    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}	
-GET VNF LCM OP occurences invalid attribute
+GET VNF LCM Operation occurrences invalid attribute
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?attribute_not_exist=some_value	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}	
-GET VNF LCM OP occurences invalid filter
+GET VNF LCM Operation occurrences invalid filter
     Log    Query status information about multiple VNF lifecycle management operation occurrences.
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"} 
     GET    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs?fields=wrong_field	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}	
-PUT VNF LCM OP occurences	
+PUT VNF LCM Operation occurences	
     log    Trying to perform a PUT. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
-PATCH VNF LCM OP occurences	
+PATCH VNF LCM Operation occurrences	
     log    Trying to perform a PATCH. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}			
-DELETE VNF LCM OP occurences	
+DELETE VNF LCM Operation occurrences	
     log    Trying to perform a DELETE. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/${apiVersion}/vnf_lcm_op_occs	
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}	
-Post Individual VNF LCM OP occurences
+Post Individual VNF LCM Operation occurrences 
     log    Trying to perform a POST. This method should not be implemented
     Set Headers  {"Accept":"${ACCEPT}"}  
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 9595cfe7..ab51026b 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -7,89 +7,89 @@ Library    JSONSchemaLibrary    schemas/
 Resource    VnfLcmMntOperationKeywords.robot
 
 *** Test Cases ***
-Post VNF LCM OP occurences - Method not implemented
+Post VNF LCM Operation occurences - Method not implemented
     [Documentation]    Test ID: 7.3.1.11.1
-    ...    Test title: Post VNF LCM OP occurences - Method not implemented
+    ...    Test title: Post VNF LCM Operation occurences - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.1 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    Post VNF LCM OP occurences
+    Post VNF LCM Operation occurences
     Check HTTP Response Status Code Is    405
 
-Get status information about multiple VNF LCM OP OCC 
+Get status information about multiple VNF LCM Operation OCC 
     [Documentation]    Test ID: 7.3.1.11.2
-    ...    Test title: Get status information about multiple VNF LCM OP OCC
+    ...    Test title: Get status information about multiple VNF LCM Operation OCC
     ...    Test objective: The objective is to test that GET method retrieve Query status information about multiple VNF lifecycle management operation occurrences.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
-    GET VNF LCM OP occurences
+    GET VNF LCM Operation occurences
     Check HTTP Response Status Code Is    202
     Check HTTP Response Body Json Schema Is    VnfLcmOpOccs 
 
-Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribute-based filtering parameters
+Get status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 7.3.1.11.3
-    ...    Test title: Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribute-based filtering parameters
+    ...    Test title: Get status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
-    GET VNF LCM OP occurences invalid attribute
+    GET VNF LCM Operation occurences invalid attribute
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
 
-Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribute selector
+Get status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute selector
     [Documentation]    Test ID: 7.3.1.11.4
-    ...    Test title: Get status information about multiple VNF LCM OP OCC Bad Request Invalid attribute selector
+    ...    Test title: Get status information about multiple VNF LCM Operation OCC Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail retrieving status information about multiple VNF lifecycle management operation occurrences because attribute is invalid.
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.2 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    GET VNF LCM OP occurences invalid filter
+    GET VNF LCM Operation occurences invalid filter
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is    ProblemDetails
     
-PUT status information about multiple VNF LCM OP OCC - Method not implemented
+PUT status information about multiple VNF LCM Operation OCC - Method not implemented
      [Documentation]    Test ID: 7.3.1.11.5
-    ...    Test title: PUT status information about multiple VNF LCM OP OCC - Method not implemented
+    ...    Test title: PUT status information about multiple VNF LCM Operation OCC - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.3 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
-    PUT VNF LCM OP occurences
+    PUT VNF LCM Operation occurences
     Check HTTP Response Status Code Is    405
 
-PATCH status information about multiple VNF LCM OP OCC - Method not implemented
+PATCH status information about multiple VNF LCM Operation OCC - Method not implemented
     [Documentation]    Test ID: 7.3.1.11.6
-    ...    Test title: PATCH status information about multiple VNF LCM OP OCC - Method not implemented
+    ...    Test title: PATCH status information about multiple VNF LCM Operation OCC - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.4 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    PUT VNF LCM OP occurences
+    PUT VNF LCM Operation occurences
     Check HTTP Response Status Code Is    405
 
-DELETE status information about multiple VNF LCM OP OCC - Method not implemented
+DELETE status information about multiple VNF LCM Operation OCC - Method not implemented
     [Documentation]    Test ID: 7.3.1.11.7
-    ...    Test title: DELETE status information about multiple VNF LCM OP OCC - Method not implemented
+    ...    Test title: DELETE status information about multiple VNF LCM Operation OCC - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 5.4.12.3.5 - SOL003 v2.4.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
-    DELETE VNF LCM OP occurences
+    DELETE VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    405
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index 305f1c6f..9dce720e 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -11,7 +11,7 @@ Library    JSONSchemaLibrary    schemas/
 Post Fail operation task
     [Documentation]    Test ID: 5.3.2.13.1
     ...    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 LCM operation
+    ...    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:  section 6.4.14.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -25,7 +25,7 @@ Post Fail operation task
 Post Fail operation task Not Found
     [Documentation]    Test ID: 5.3.2.13.2
     ...    Test title: Post Fail operation task Not Found
-    ...    Test objective: The objective is to test that POST method fail if the LCM NS resource is not found
+    ...    Test objective: The objective is to test that POST method fail if the LCM resource is not found
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.14.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -38,7 +38,7 @@ Post Fail operation task Not Found
 Post Fail operation task Conflict
     [Documentation]    Test ID: 5.3.2.13.3
     ...    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 LCM NS operation (i.e NS instance status not equal to FAILED_TEMP)
+    ...    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:  section 6.4.14.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTask.robot b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
index d09fe9ae..aef24836 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
@@ -11,8 +11,8 @@ Suite Setup    Check resource existance
 POST Heal a NSInstance
     [Documentation]    Test ID: 5.3.2.6.1
     ...    Test title: POST Heal a NSInstance
-    ...    Test objective: The objective is to test that POST method allow to create a Heal NS instance
-    ...    Pre-conditions: resource status have to be NOT_INSTANTIATED
+    ...    Test objective: The objective is to test that POST method allow to trigger a Heal NS instance
+    ...    Pre-conditions: resource status is not in NOT_INSTANTIATED state
     ...    Reference:  section 6.4.7.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
@@ -25,7 +25,7 @@ POST Heal a NSInstance Conflict
     [Documentation]    Test ID: 5.3.2.6.2
     ...    Test title: POST Heal a NSInstance Conflict
     ...    Test objective: The objective is to test that POST method fail if NS instance is not in NOT_INSTANTIATE state 
-    ...    Pre-conditions: resource status have not to be NOT_INSTANTIATED
+    ...    Pre-conditions: resource status is in NOT_INSTANTIATED state
     ...    Reference:  section 6.4.7.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index 7c1c8e00..1eea0792 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -11,7 +11,7 @@ Suite Setup    Check resource existance
 Post Individual NSInstance - Method not implemented
     [Documentation]    Test ID: 5.3.2.2.1
     ...    Test title: Post Individual NSInstance - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new NS instance
+    ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -37,7 +37,7 @@ Get Information about an individual NS Instance
 PUT Individual NSInstance - Method not implemented 
     [Documentation]    Test ID: 5.3.2.2.3
     ...    Test title: PUT Individual NSInstance - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to create a new NS instance
+    ...    Test objective: TThe objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.3 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -49,7 +49,7 @@ PUT Individual NSInstance - Method not implemented
 PATCH Individual NSInstance - Method not implemented 
     [Documentation]    Test ID: 5.3.2.2.4
     ...    Test title: PATCH Individual NSInstance - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to create a new NS instance
+    ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.3.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -61,7 +61,7 @@ PATCH Individual NSInstance - Method not implemented
 DELETE Individual NSInstance
      [Documentation]    Test ID: 5.3.2.2.5
     ...    Test title: DELETE Individual NSInstance
-    ...    Test objective: The objective is to test that DELETE method is allowed to delete a NS instance
+    ...    Test objective: The objective is to test that DELETE method delete a not INSTANTIATED NS instance
     ...    Pre-conditions: none.
     ...    Reference:  section 6.4.3.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -71,15 +71,14 @@ DELETE Individual NSInstance
     Check HTTP Response Status Code Is    204
 
 DELETE Individual NSInstance Conflict
-    [Documentation]    Test ID: 5.3.2.2.5
+    [Documentation]    Test ID: 5.3.2.2.6
     ...    Test title: DELETE Individual NSInstance Conflict
-    ...    Test objective: The objective is to test that DELETE method is allowed to delete a NS instance
-    ...    Pre-conditions: At least one instantiated instance of a NS
+    ...    Test objective: The objective is to test that DELETE method can't delete an INSTANTIATED NS instance
+    ...    Pre-conditions: At least one instance of a NS in INSTANTIATED state
     ...    Reference:  section 6.4.3.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is deleted from the NFVO
+    ...    Post-Conditions: The NS instance is not deleted from the NFVO
     DELETE IndividualNSInstance
     Check HTTP Response Status Code Is    409
-    Check HTTP Response Header ContentType is    ${CONTENT_TYPE}
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index 33661f45..03654fea 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -15,13 +15,13 @@ Post Individual NS LCM occurences - Method not implemented
     ...    Reference:  section 6.4.10.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: The NS instance is not created in the NFVO
 	POST Individual NS LCM OP Occurence
 	Check HTTP Response Status Code Is    405
 
-Get status information about Individual NS LCM OP OCC   
+Get status information about Individual NS LCM OCC   
     [Documentation]    Test ID: 5.3.2.9.2
-    ...    Test title: Get status information about Individual NS LCM OP OCC
+    ...    Test title: Get status information about Individual NS LCM OCC
     ...    Test objective: The objective is to test that GET method return the LCM occurrence of the NS
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.2 - SOL005 v2.4.1
@@ -32,39 +32,39 @@ Get status information about Individual NS LCM OP OCC
 	Check HTTP Response Status Code Is    200
 	Check HTTP Response Body Json Schema Is    NsLcmOpOcc
 	
-PUT status information about Individual NS LCM OP OCC - Method not implemented
+PUT status information about Individual NS LCM OCC - Method not implemented
      [Documentation]    Test ID: 5.3.2.9.3
-    ...    Test title: PUT status information about Individual NS LCM OP OCC - Method not implemented
+    ...    Test title: PUT status information about Individual NS LCM OCC - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.3 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: The NS instance is not modified from the NFVO
     PUT Individual NS LCM OP Occurence
     Check HTTP Response Status Code Is    405
 
-PATCH status information about Individual NS LCM OP OCC - Method not implemented
+PATCH status information about Individual NS LCM OCC - Method not implemented
      [Documentation]    Test ID: 5.3.2.9.4
-    ...    Test title: PATCH status information about Individual NS LCM OP OCC - Method not implemented
+    ...    Test title: PATCH status information about Individual NS LCM OCC - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: The NS instance is not modified from the NFVO
     PATCH Individual NS LCM OP Occurence
     Check HTTP Response Status Code Is    405
 
-DELETE status information about Individual NS LCM OP OCC - Method not implemented
+DELETE status information about Individual NS LCM OCC - Method not implemented
          [Documentation]    Test ID: 5.3.2.9.5
-    ...    Test title: DELETE status information about Individual NS LCM OP OCC - Method not implemented
+    ...    Test title: DELETE status information about Individual NS LCM OCC - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.10.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: The NS instance is not deleted from the NFVO
     DELETE Individual NS LCM OP Occurence
     Check HTTP Response Status Code Is    405
     
diff --git a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
index 063e1506..eec57a38 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
@@ -12,7 +12,7 @@ Suite Setup    Check subscription existance
 Post Individual Subscription - Method not implemented
     [Documentation]    Test ID: 5.3.2.16.1
     ...    Test title: Post Individual Subscription - Method not implemented
-    ...    Test objective: The objective is to test that POST method is not allowed to create a new NS lifecycle management subscription
+    ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.17.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -37,7 +37,7 @@ Get Information about an individual subscription
 PUT an individual subscription - Method not implemented
      [Documentation]    Test ID: 5.3.2.16.3
     ...    Test title: PUT an individual subscription - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify a NS lifecycle management subscription
+    ...    Test objective: TThe objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.17.3.3 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -49,7 +49,7 @@ PUT an individual subscription - Method not implemented
 PATCH an individual subscription - Method not implemented
      [Documentation]    Test ID: 5.3.2.16.4
     ...    Test title: PATCH an individual subscription - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify a new NS lifecycle management subscription
+    ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.17.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -61,7 +61,7 @@ PATCH an individual subscription - Method not implemented
 DELETE an individual subscription
      [Documentation]    Test ID: 5.3.2.16.5
     ...    Test title: DELETE an individual subscription
-    ...    Test objective: The objective is to test the deletion of an individual NS lifecycle management 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:  section 6.4.17.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index 19e842bb..13467618 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -11,7 +11,7 @@ POST Create a new NsInstance
     [Documentation]    Test ID: 5.3.2.1.1
     ...    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.
+    ...    Pre-conditions: an NSD onboarded.
     ...    Reference:  section 6.4.2.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
@@ -25,11 +25,11 @@ Get information about multiple NS instances
     [Documentation]    Test ID: 5.3.2.1.2
     ...    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: A Ns instance is instantiated.
+    ...    Pre-conditions: An existing Ns instance.
     ...    Reference:  section 6.4.2.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
-    ...    Post-Conditions: A Ns instance is instantiated.
+    ...    Post-Conditions: none.
     GET NsInstances
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    NsInstances  
@@ -38,7 +38,7 @@ 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.
+    ...    Pre-conditions: A Ns instance is instantiated, a bad filter parameter.
     ...    Reference:  section 6.4.2.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
@@ -51,7 +51,7 @@ 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.
+    ...    Pre-conditions: A Ns instance is instantiated,  a bad attribute selector.
     ...    Reference:  section 6.4.2.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none.
@@ -63,7 +63,7 @@ Get information about multiple NS instances Bad Request Invalid attribute select
 PUT NSInstances - Method not implemented
     [Documentation]    Test ID: 5.3.2.1.5
     ...    Test title: PUT Individual NS instance - Method not implemented
-    ...    Test objective: The objective is to test that PUT method is not allowed to modify a NS instance
+    ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.2.3.3 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -75,7 +75,7 @@ PUT NSInstances - Method not implemented
 PATCH NSInstances - Method not implemented
      [Documentation]    Test ID: 5.3.2.1.6
     ...    Test title: PUT NSInstances - Method not implemented
-    ...    Test objective: The objective is to test that PATCH method is not allowed to modify a NS instance
+    ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.2.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -87,11 +87,11 @@ PATCH NSInstances - Method not implemented
 DELETE NSInstances - Method not implemented
      [Documentation]    Test ID: 5.3.2.1.7
     ...    Test title: DELETE NSInstances - Method not implemented
-    ...    Test objective: The objective is to test that DELETE method is not allowed to modify a list of NS instance
+    ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.2.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The NS instance is not modified by the operation
+    ...    Post-Conditions: The NS instance is not deleted by the operation
     DELETE NSInstances
     Check HTTP Response Status Code Is    405
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
index 250ac9bf..db0dd77b 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
@@ -22,11 +22,11 @@ Post NS LCM occurences - Method not implemented
 	POST NS LCM OP Occurences
 	Check HTTP Response Status Code Is    405
 
-Get status information about multiple NS LCM OP OCC   
+Get status information about multiple NS LCM OCC   
      [Documentation]    Test ID: 5.3.2.8.2
-    ...    Test title: Get status information about multiple NS LCM OP OCC
+    ...    Test title: Get status information about multiple NS LCM OCC
     ...    Test objective: The objective is to test that GET method return a list of LCM occurrences of the NS
-    ...    Pre-conditions: none
+    ...    Pre-conditions: At least one LCM OCC available in the NFVO
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
@@ -35,11 +35,11 @@ Get status information about multiple NS LCM OP OCC
 	Check HTTP Response Status Code Is    200
 	Check HTTP Response Body Json Schema Is    NsLcmOpOccs
 
-Get status information about multiple NS LCM OP OCC Bad Request Invalid attribute-based filtering parameters
+Get status information about multiple NS LCM OCC Bad Request Invalid attribute-based filtering parameters
     [Documentation]    Test ID: 5.3.2.8.3
-    ...    Test title: Get status information about multiple NS LCM OP OCC Bad Request Invalid attribute-based filtering parameters
+    ...    Test title: Get status information about multiple NS LCM OCC Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to test that GET method fail because the query parameter is not existing
-    ...    Pre-conditions: none
+    ...    Pre-conditions: At least one LCM OCC available in the NFVO, Invalid filter parameter
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
@@ -48,11 +48,11 @@ Get status information about multiple NS LCM OP OCC Bad Request Invalid attribut
 	Check HTTP Response Status Code Is    400
 	Check HTTP Response Body Json Schema Is    ProblemDetails
 
-Get status information about multiple NS LCM OP OCC Bad Request Invalid attribute selector
+Get status information about multiple NS LCM OCC Bad Request Invalid attribute selector
     [Documentation]    Test ID: 5.3.2.8.4
-    ...    Test title: Get status information about multiple NS LCM OP OCC Bad Request Invalid attribute selector
+    ...    Test title: Get status information about multiple NS LCM OCC Bad Request Invalid attribute selector
     ...    Test objective: The objective is to test that GET method fail because the attributes selector is not existing
-    ...    Pre-conditions: none
+    ...    Pre-conditions: At least one LCM OCC available in the NFVO, Invalid attribute selector
     ...    Reference:  section 6.4.9.3.2 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
@@ -62,9 +62,9 @@ Get status information about multiple NS LCM OP OCC Bad Request Invalid attribut
 	Check HTTP Response Body Json Schema Is    ProblemDetails
 	
 
-PUT status information about multiple NS LCM OP OCC - Method not implemented
+PUT status information about multiple NS LCM OCC - Method not implemented
     [Documentation]    Test ID: 5.3.2.8.5
-    ...    Test title: PUT status information about multiple NS LCM OP OCC - Method not implemented
+    ...    Test title: PUT status information about multiple NS LCM OCC - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.3 - SOL005 v2.4.1
@@ -74,9 +74,9 @@ PUT status information about multiple NS LCM OP OCC - Method not implemented
     PUT NS LCM OP Occurences
     Check HTTP Response Status Code Is    405
 
-PATCH status information about multiple NS LCM OP OCC - Method not implemented
+PATCH status information about multiple NS LCM OCC - Method not implemented
     [Documentation]    Test ID: 5.3.2.8.6
-    ...    Test title: PATCH status information about multiple NS LCM OP OCC - Method not implemented
+    ...    Test title: PATCH status information about multiple NS LCM OCC - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.4 - SOL005 v2.4.1
@@ -86,9 +86,9 @@ PATCH status information about multiple NS LCM OP OCC - Method not implemented
     PATCH NS LCM OP Occurences
     Check HTTP Response Status Code Is    405
 
-DELETE status information about multiple NS LCM OP OCC - Method not implemented
+DELETE status information about multiple NS LCM OCC - Method not implemented
     [Documentation]    Test ID: 5.3.2.8.7
-    ...    Test title: DELETE status information about multiple NS LCM OP OCC - Method not implemented
+    ...    Test title: DELETE status information about multiple NS LCM OCC - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.9.3.5 - SOL005 v2.4.1
diff --git a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
index 4dbcfca9..96c0c0be 100644
--- a/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL005/NSLifecycleManagement-API/NotificationEndpoint.robot
@@ -22,7 +22,7 @@ POST Deliver a notification - Operation Occurence
 POST Deliver a notification - Id Creation
     [Documentation]    Test ID: 5.3.2.17.2
     ...    Test title: POST Deliver a notification - Id Creation
-    ...    Test objective: The objective is to test that POST method trigger a notification about the creation of a NS identifier and the related NS instance resource
+    ...    Test objective: The objective is to test that POST method trigger a notification about the creation of a NS instance resource
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.18.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -32,7 +32,7 @@ POST Deliver a notification - Id Creation
 POST Deliver a notification - Id deletion
     [Documentation]    Test ID: 5.3.2.17.3
     ...    Test title: POST Deliver a notification - Id deletion
-    ...    Test objective: The objective is to test that POST method trigger a notification about the deletion of a NS identifier and the related NS instance resource
+    ...    Test objective: The objective is to test that POST method trigger a notification about the deletion of a NS instance resource
     ...    Pre-conditions: none
     ...    Reference:  section 6.4.18.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
index edb5c645..6572d920 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
@@ -11,12 +11,12 @@ Suite Setup    Check resource existance
 POST Scale a nsInstance
     [Documentation]    Test ID: 5.3.2.4.1
     ...    Test title: POST Scale a nsInstance
-    ...    Test objective: The objective is to test that POST method allow to create a Scale NS instance
+    ...    Test objective: The objective is to test that POST method create a Scale NS instance
     ...    Pre-conditions: the resource is in NOT_INSTANTIATED state
     ...    Reference:  section 6.4.5.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The Scale NS instance is created on the NFVO
+    ...    Post-Conditions: The Scale NS is not triggered on the NFVO
     POST scale nsInstance
     Check HTTP Response Status Code Is    202
     Check HTTP Response Header Contains    Location
@@ -30,7 +30,7 @@ POST Instantiate a nsInstance Conflict
     ...    Reference:  section 6.4.5.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: The Scale NS instance is not created on the NFVO
+    ...    Post-Conditions: The Scale NS is not triggered on the NFVO
     POST scale nsInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index 8a8d3c56..ce28f55b 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -15,7 +15,7 @@ POST Create a new subscription
     ...    Reference:  section 6.4.16.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none     
+    ...    Post-Conditions: subscription is created in the NFVO     
     POST subscriptions
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
@@ -30,7 +30,7 @@ POST Create a new Subscription - DUPLICATION
     ...    Reference:  section 6.4.16.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: duplicate subscription is created in the NFVO     
     POST subscriptions DUPLICATION
     Check HTTP Response Status Code Is    201
     Check HTTP Response Header Contains    Location
@@ -40,11 +40,11 @@ POST Create a new Subscription - NO-DUPLICATION
     [Documentation]    Test ID: 5.3.2.15.3
     ...    Test title: POST Create a new subscription - NO-DUPLICATION
     ...    Test objective: The objective is to test that POST method can't create a duplicate subscription if  NFVO is not permitting duplication
-    ...    Pre-conditions: none
+    ...    Pre-conditions: a subscription have already to exist
     ...    Reference:  section 6.4.16.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: duplicate subscription is not created in the NFVO     
     POST subscriptions NO DUPLICATION
     Check HTTP Response Status Code Is    303
     Check HTTP Response Header Contains    Location
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 3c86f346..9c972f66 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -10,7 +10,7 @@ Library    JSONSchemaLibrary    schemas/
 POST Terminate a NSInstance
     [Documentation]    Test ID: 5.3.2.7.1
     ...    Test title: POST Terminate a NSInstance
-    ...    Test objective: The objective is to test that POST method allow to terminate the NS
+    ...    Test objective: The objective is to test that POST method terminate the NS
     ...    Pre-conditions: NS instance in INSTANTIATED state
     ...    Reference:  section 6.4.8.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -29,7 +29,7 @@ POST Terminate a NSInstance Conflict
     ...    Reference:  section 6.4.8.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: NS instance is in NOT_INSTANTIATED state
     POST Terminate NSInstance
     Check HTTP Response Status Code Is    409
     Check HTTP Response Body Json Schema Is    ProblemDetails
@@ -54,7 +54,7 @@ PUT Terminate NSInstance - Method not implemented
     ...    Reference:  section 6.4.8.3.3 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: resurce state not modified
     PUT Terminate NSInstance
     Check HTTP Response Status Code Is    405
     
@@ -66,7 +66,7 @@ PATCH Terminate NSInstance - Method not implemented
     ...    Reference:  section 6.4.8.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: resurce state not modified
     PATCH Terminate NSInstance
     Check HTTP Response Status Code Is    405
 
@@ -78,7 +78,7 @@ DELETE Terminate NSInstance - Method not implemented
     ...    Reference:  section 6.4.8.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: resurce state not modified
     DELETE Terminate NSInstance
     Check HTTP Response Status Code Is    405
     
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
index 51762166..fddb0fec 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
@@ -11,7 +11,7 @@ Suite Setup    Check resource existance
 POST Update a NSInstance
     [Documentation]    Test ID: 5.3.2.5.1
     ...    Test title: POST Update a NSInstance
-    ...    Test objective: The objective is to test that POST method allow to update a Scale NS instance
+    ...    Test objective: The objective is to test that POST method update a Scale NS instance
     ...    Pre-conditions: an existing Scale Instance 
     ...    Reference:  section 6.4.6.3.1 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
@@ -54,7 +54,7 @@ PUT Update NSInstance - Method not implemented
     ...    Reference:  section 6.4.6.3.3 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: The Scale NS instance is not updated on the NFVO
     PUT Update NSInstance
     Check HTTP Response Status Code Is    405
     
@@ -66,7 +66,7 @@ PATCH Update NSInstance - Method not implemented
     ...    Reference:  section 6.4.6.3.4 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: The Scale NS instance is not updated on the NFVO
     PATCH Update NSInstance
     Check HTTP Response Status Code Is    405
 
@@ -78,7 +78,7 @@ DELETE Update NSInstance - Method not implemented
     ...    Reference:  section 6.4.6.3.5 - SOL005 v2.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
-    ...    Post-Conditions: none
+    ...    Post-Conditions: The Scale NS instance is not deleted on the NFVO
     DELETE Update NSInstance
     Check HTTP Response Status Code Is    405
     
-- 
GitLab