diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index 05af12fefe9a3f7fb2a15f6bfdb363cc18af4220..c0bb4e90de3aa90ef7f70cde8bd65a7fa42e9156 100644
--- a/SOL002/VNFConfiguration-API/Configuration.robot
+++ b/SOL002/VNFConfiguration-API/Configuration.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environments/variables.txt
Library REST ${VNF_SCHEMA}://${VNF_HOST}:${VNF_PORT}
... spec=SOL002-VNFConfiguration-API.yaml
Library JSONLibrary
diff --git a/SOL002/VNFConfiguration-API/variables.txt b/SOL002/VNFConfiguration-API/environment/variables.txt
similarity index 100%
rename from SOL002/VNFConfiguration-API/variables.txt
rename to SOL002/VNFConfiguration-API/environment/variables.txt
diff --git a/SOL002/VNFFaultManagement-API/Alarms.robot b/SOL002/VNFFaultManagement-API/Alarms.robot
index b5a02f9e36e649f56deae764f5e322037d48b853..61ea4463279a52df75e9b31c99db7ccba8bfb264 100644
--- a/SOL002/VNFFaultManagement-API/Alarms.robot
+++ b/SOL002/VNFFaultManagement-API/Alarms.robot
@@ -1,6 +1,6 @@
*** Settings ***
# Suite setup Expect spec SOL003-VNFLifecycleManagement-API.yaml
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFFaultManagement-API.yaml
Library JSONLibrary
diff --git a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
index 5e0459d51090afd0019d1d43cacdd1510c1116d6..6a85191ae9c4fbfe29e9f31a8c31ca4068160d95 100644
--- a/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
+++ b/SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFFaultManagement-API.yaml
Suite setup Check resource existance
diff --git a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
index fe7b7a6cfc0369883f60e5e55f13f1e6b8f0f767..3742cd802e01e6449f4d31b7224e53a1ca711eab 100644
--- a/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualAlarm.robot
@@ -1,6 +1,6 @@
*** Settings ***
# Suite setup Expect spec SOL003-VNFLifecycleManagement-API.yaml
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFFaultManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
index e07c7f6648561fe37281e568beedc4eadc25377c..0a01891b18fbce5d2f3195dadf4e4fb9d1bf034e 100644
--- a/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFFaultManagement-API/IndividualSubscription.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library JSONLibrary
Library JSONSchemaLibrary schemas/
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
diff --git a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
index bb12c9d1fdd9a8f4cd5bb22567f47937fde0f461..1d5a78aaf8ab78ea6c02932e13b9c166d1798ec8 100644
--- a/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFFaultManagement-API/NotificationEndpoint.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
Library MockServerLibrary
diff --git a/SOL002/VNFFaultManagement-API/Subscriptions.robot b/SOL002/VNFFaultManagement-API/Subscriptions.robot
index 6e5932f90c1c2768557a406fdb6316e57f68683f..36783dd37d0b82da0825b07a8068e70330bd5b55 100644
--- a/SOL002/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL002/VNFFaultManagement-API/Subscriptions.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFFaultManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFFaultManagement-API/variables.txt b/SOL002/VNFFaultManagement-API/environment/variables.txt
similarity index 100%
rename from SOL002/VNFFaultManagement-API/variables.txt
rename to SOL002/VNFFaultManagement-API/environment/variables.txt
diff --git a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index 2964461ca5fb16f64a6bd9d8ee7ad36084cadbf2..02f5c707d4421caf1db6d1bb11a64bb501e9fa86 100644
--- a/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL002/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -1,4 +1,5 @@
*** Setting ***
+Resource environment/variables.txt
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
Library MockServerLibrary
@@ -8,12 +9,6 @@ Library BuiltIn
Library Collections
Library String
-*** Variable ***
-${callback_uri} http://localhost
-${callback_port} 9091
-${callback_endpoint} /endpoint
-${callback_endpoint_error} /endpoint_404
-${sleep_interval} 20s
*** Test Cases ***
Check Notification Endpoint
diff --git a/SOL002/VNFIndicatorNotification-API/environment/variables.txt b/SOL002/VNFIndicatorNotification-API/environment/variables.txt
new file mode 100644
index 0000000000000000000000000000000000000000..df8e5c4ac9e7d10e0e244af7d362ed1d44707262
--- /dev/null
+++ b/SOL002/VNFIndicatorNotification-API/environment/variables.txt
@@ -0,0 +1,6 @@
+*** Variables ***
+${callback_uri} http://localhost
+${callback_port} 9091
+${callback_endpoint} /endpoint
+${callback_endpoint_error} /endpoint_404
+${sleep_interval} 20s
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
index 0f557c963d35c950a1ac6169d237e967d4889a17..3475ece010d6f1790a0e5aaca2b9cf7d34baec4e 100644
--- a/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 16d4801b17e2c8f793a3ca753fb9dc7ec4aa085c..3cd41f9942eaae6a70ba2da893d1ef88773acbcb 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index ff237c0638be39467db71e0486b6afc8442ae072..4a2ebaedb474eb2713b22dd2e8c89adba9a30dc6 100644
--- a/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
index 7a3e757414e09fb1ff81169740ec594134bcf05a..2b9b6f3b112b5ae2ab0cfc096230b90f25d504b4 100644
--- a/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
diff --git a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
index c8ee5bc50ff16b4a1150d64b3bdc1741b85ab5c8..a1fa4cb8a57dedf81fa529a360274c96e8a7b01e 100644
--- a/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
index 2d2c0b7955b34a3aaf73015b961c506a863fa2bb..ea5d2776cdde0d6472b797cd3110eb3dc5f3a190 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library JSONLibrary
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index 22b2c181ab70becb8de3cdbae848b62c3597bf12..f805d32dd0c5a28c8940bf190384f696d38e844e 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -1,6 +1,6 @@
*** Settings ***
# Suite setup Expect spec SOL003-VNFLifecycleManagement-API.yaml
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index de9168d5c8361d5f0cc25e83500917441f1fda76..97b748e41ff989b6f4697af6d9fd8804bff38eea 100644
--- a/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL002/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library JSONLibrary
diff --git a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index df787395ae8372462f657548bc62ea472b5f6bef..df669342472a56ce8da62db8bee6f7c68bc7e6b9 100644
--- a/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
diff --git a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
index ec474bc8573d59767f3e925a7edc6b6fb3031d34..662897f492b332a6f58c4a8cbc9f922392675b4c 100644
--- a/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -1,7 +1,7 @@
*** Settings ***
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
-Resource variables.txt
+Resource environment/variables.txt
Library MockServerLibrary
Library Process
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
index ba563c03512c8d4d5c9f962e026074353f0adcbe..46d7093ce4f35e7179e082c1b0a25cfdd6821f7d 100644
--- a/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
index f5e72145befebf7958de2053a8d2f732ddd8a73d..998f5c780f8dd8d2f20e630543645cdb2e10ceea 100644
--- a/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
diff --git a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 5cc1d7e669ddb8282b748b82deb88592ffbb6100..9dab30f9b2c1aa311886eb639dff34c683395bb4 100644
--- a/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
index a929054284c20828137e5a40dc2716dd4f1d66dd..20ed3720d03591c46d49150e52622b379c4a0fb3 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index 4d0a46abb67a6cfbb30d3922518b866283909cb4..a5c2fe642adb134bc8d574ea6d5f59a91a5f16cd 100644
--- a/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
index b1e636b28755cb0c25b16db2b489c66c4da2bd6f..ab8ff7d5ba9621a4f326a1691edb710291a2c1ed 100644
--- a/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL002/VNFLifecycleManagement-API/Subscriptions.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
index e34651a95f7cf4327be12c3929611a259e816d1f..e9a52027150e45436bbef67ecc526f262b9cb1a1 100644
--- a/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL002/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
index 17e836e86c8fa0290f31543733bad1d23fb955a5..08e8e2a5faa6752814a0bddc19e68b8894347d0d 100644
--- a/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL002/VNFLifecycleManagement-API/VNFInstances.robot
@@ -1,6 +1,6 @@
*** Settings ***
# Suite setup Expect spec SOL003-VNFLifecycleManagement-API.yaml
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 6f8e13a4eb4ca4649adcf1b96a4cd1a63d27bed3..e612c79ba9c88da15f1d84054841f8aa6876d314 100644
--- a/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL002/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL002-VNFLifecycleManagement-API.yaml
Library JSONLibrary
diff --git a/SOL002/VNFLifecycleManagement-API/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
similarity index 100%
rename from SOL002/VNFLifecycleManagement-API/variables.txt
rename to SOL002/VNFLifecycleManagement-API/environment/variables.txt
diff --git a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index 95f7613f125c16f2b1ba73108c644ed56f4dcb04..8662ae0063c0032c7dafdc15ca1931888148cacb 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL002/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -1,4 +1,5 @@
*** Setting ***
+Resource environment/generic.txt
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
Library MockServerLibrary
@@ -8,13 +9,6 @@ Library BuiltIn
Library Collections
Library String
-*** Variable ***
-${callback_uri} http://localhost
-${callback_port} 9091
-${callback_endpoint} /endpoint
-${callback_endpoint_error} /endpoint_404
-${sleep_interval} 20s
-
*** Test Cases ***
Check Notification Endpoint
&{req}= Create Mock Request Matcher Schema GET ${callback_endpoint}
diff --git a/SOL002/VNFPerformanceManagementNotification-API/environment/generic.txt b/SOL002/VNFPerformanceManagementNotification-API/environment/generic.txt
index 4f4b01943e95cea8574fb7e33af3b9690858ab30..12a19817c09edfcaefe04a105a62e1a95995bd3a 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/environment/generic.txt
+++ b/SOL002/VNFPerformanceManagementNotification-API/environment/generic.txt
@@ -1,19 +1,6 @@
*** Variables ***
-${VNFM_HOST} localhost # Hostname of the VNFM
-${VNFM_PORT} 8080 # Listening port of the VNFM
-${NFVO_HOST} localhost # Hostname of the NFVO
-${NFVO_PORT} 8081 # Listening port of the NFVO
-${VNFM_SCHEMA} https
-${NFVO_SCHEMA} https
-${AUTHORIZATION} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
-${CONTENT_TYPE_JSON} application/json
-${ACCEPT_JSON} application/json
-${apiRoot} /
-${AUTH_USAGE} 1
-${NEG_AUTHORIZATION} Bearer negativetoken
-${apiVersion} v1
-${apiName} vnfpm
-${FIELD_USAGE} 1
-${VNFM_AUTHENTICATION} Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
-${VNFM_AUTH_USAGE} 1
-${VNFM_DUPLICATION} 1
+${callback_uri} http://localhost
+${callback_port} 9091
+${callback_endpoint} /endpoint
+${callback_endpoint_error} /endpoint_404
+${sleep_interval} 20s
diff --git a/SOL002/variables.txt b/SOL002/variables.txt
deleted file mode 100644
index f5f3573a7c108109e76f44031b11fdef0380f7b7..0000000000000000000000000000000000000000
--- a/SOL002/variables.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-*** Variables ***
-${VNFM_HOST} localhost # Hostname of the VNFM
-${VNFM_PORT} 8080 # Listening port of the VNFM
-${EM-VNF_HOST} localhost # Hostname of the NFVO
-${EM-VNF_PORT} 8081 # Listening port of the NFVO
-${VNFM_SCHEMA} https
-${EM-VNF_SCHEMA} https
-${AUTHORIZATION} Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ==
-${CONTENT_TYPE} application/json
-${ACCEPT} application/json
-${apiRoot} /
-${AUTH_USAGE} 1
-${WRONG_AUTHORIZATION} Bearer XXXXXWRONGXXXXX
-${vnfPkgId} 6fc3539c-e602-4afa-8e13-962fb5a7d81f
-${SINGLE_FILE_VNFD} 1 # If VNFD is PLAIN TEXT
-${ACCEPT_PLAIN} text/plain
-${ACCEPT_ZIP} application/zip
-${vnfPkgId_processing} 007c111c-38a1-42c0-a666-7475ecb1567c
-${ARTIFACT_TYPE} application/octet-stream
-${ARTIFACT_ID} artifactId
-${WRONG_ACCEPT} application/json
diff --git a/SOL003/VNFFaultManagement-API/Alarms.robot b/SOL003/VNFFaultManagement-API/Alarms.robot
index b8f5418b351c1f1faed2ea8f562905d851a9f0dd..403c96ee9ff37ba667d161ed4e8755dfdc7e96bf 100644
--- a/SOL003/VNFFaultManagement-API/Alarms.robot
+++ b/SOL003/VNFFaultManagement-API/Alarms.robot
@@ -1,6 +1,6 @@
*** Settings ***
# Suite setup Expect spec SOL003-VNFLifecycleManagement-API.yaml
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFFaultManagement-API.yaml
Library JSONLibrary
diff --git a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
index 26425b119398d7e3b93883121ac73ab774a658db..0e397e9d9f16c20db0078022ff8d342122f9a75a 100644
--- a/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
+++ b/SOL003/VNFFaultManagement-API/IndividualAlarm.robot
@@ -1,6 +1,6 @@
*** Settings ***
# Suite setup Expect spec SOL003-VNFLifecycleManagement-API.yaml
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFFaultManagement-API.yaml
Library OperatingSystem
diff --git a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot b/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
index 21ead1219b818e053223ba24be1b3198f6d193ca..4bd82475ad35f22c263360a33740ec2f84bbba2b 100644
--- a/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFFaultManagement-API/IndividualSubscription.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library JSONLibrary
Library JSONSchemaLibrary schemas/
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
@@ -60,7 +60,7 @@ DELETE an individual subscription
Output response
Integer response status 204
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
diff --git a/SOL003/VNFFaultManagement-API/Subscriptions.robot b/SOL003/VNFFaultManagement-API/Subscriptions.robot
index 36f498eb86bac4cf994cb7b4344e008763e0b823..e155a92cfb69153f1139bccb8b308a2929fbeabb 100644
--- a/SOL003/VNFFaultManagement-API/Subscriptions.robot
+++ b/SOL003/VNFFaultManagement-API/Subscriptions.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFFaultManagement-API.yaml
Library OperatingSystem
diff --git a/SOL003/VNFFaultManagement-API/variables.txt b/SOL003/VNFFaultManagement-API/environment/variables.txt
similarity index 100%
rename from SOL003/VNFFaultManagement-API/variables.txt
rename to SOL003/VNFFaultManagement-API/environment/variables.txt
diff --git a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
index ec0211e73166bbb05805df2d27d3f59dd1ce5850..191e26438cf2181b2fe0ae0e86d7cec4ed1fc6e4 100644
--- a/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VNFFaultManagementNotification-API/NotificationEndpoint.robot
@@ -7,8 +7,6 @@ Library Process
Library OperatingSystem
Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${notification_port}
-*** Variables ***
-${sleep_interval} 20s
*** Test Cases ***
Deliver a notification - Alarm
diff --git a/SOL003/VNFLifecycleManagement-API/variables.txt b/SOL003/VNFFaultManagementNotification-API/environment/variables.txt
similarity index 98%
rename from SOL003/VNFLifecycleManagement-API/variables.txt
rename to SOL003/VNFFaultManagementNotification-API/environment/variables.txt
index f28f6d382e2321f98e36a6770c63380dab54e006..9a53f6494e8bfc6adccc83cdb1362f9fece26883 100644
--- a/SOL003/VNFLifecycleManagement-API/variables.txt
+++ b/SOL003/VNFFaultManagementNotification-API/environment/variables.txt
@@ -36,4 +36,4 @@ ${notification_port} 9091
${VnfLcmOperationOccurrenceNotification} {}
${VnfIdentifierCreationNotification} {}
${VnfIdentifierDeletionNotification} {}
-${SYNC_MODE} 0
\ No newline at end of file
+${sleep_interval} 20s
\ No newline at end of file
diff --git a/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot b/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
index b839e3d54b4aac4ea57a0074a2f505041e5c834a..b0189c7ffffb0352badd0d3f2fe2e587f7c942c4 100644
--- a/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
+++ b/SOL003/VNFIndicatorNotification-API/VnfIndicatorNotification.robot
@@ -1,4 +1,5 @@
*** Setting ***
+Resource environment/variables.txt
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
Library MockServerLibrary
@@ -8,12 +9,6 @@ Library BuiltIn
Library Collections
Library String
-*** Variable ***
-${callback_uri} http://localhost
-${callback_port} 9091
-${callback_endpoint} /endpoint
-${callback_endpoint_error} /endpoint_404
-${sleep_interval} 20s
*** Test Cases ***
Check Notification Endpoint
diff --git a/SOL003/VNFIndicatorNotification-API/environment/variables.txt b/SOL003/VNFIndicatorNotification-API/environment/variables.txt
new file mode 100644
index 0000000000000000000000000000000000000000..df8e5c4ac9e7d10e0e244af7d362ed1d44707262
--- /dev/null
+++ b/SOL003/VNFIndicatorNotification-API/environment/variables.txt
@@ -0,0 +1,6 @@
+*** Variables ***
+${callback_uri} http://localhost
+${callback_port} 9091
+${callback_endpoint} /endpoint
+${callback_endpoint_error} /endpoint_404
+${sleep_interval} 20s
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
index 660fb194f42e44e92a026181616c4f48386e3cca..9cfdaf58aca465264a8d1f773137109b6de871f8 100644
--- a/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/CancelOperationTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
@@ -106,7 +106,7 @@ DELETE Fail operation task - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
index 16d4801b17e2c8f793a3ca753fb9dc7ec4aa085c..bb83d1ebb7075634a194e545886bc582afa79ad9 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeExternalVNFConnectivityTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
@@ -72,7 +72,7 @@ DELETE Change external VNF connectivity - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
diff --git a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
index 2af7226a3bdecae7eb14a6208f60ab824be58929..64cf8c63f069b74a3b03486bfdbce30738c3cdf1 100644
--- a/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ChangeVNFFlavourTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
@@ -114,7 +114,7 @@ DELETE Change deployment flavour VNFInstance - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
diff --git a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
index 971786670e76f9e8b0956f3c24b46ecd61880a6b..4a5e1583232ced0acd01e515914f10800f788d7b 100644
--- a/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/FailOperationTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
@@ -109,7 +109,7 @@ DELETE Fail operation task - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
diff --git a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
index aa72c864dda6218eb3351feaf996633b0b42c9fd..ddbbb3dc5e2137b281948966617d1f9eee6f455d 100644
--- a/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/HealVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
@@ -113,7 +113,7 @@ DELETE Heal VNFInstance - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
index 2d2c0b7955b34a3aaf73015b961c506a863fa2bb..b658ebc4788b49036136d5bbe9e6439f0dce0e11 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualSubscription.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library JSONLibrary
@@ -56,7 +56,7 @@ DELETE an individual subscription
Log Validate Status code
Integer response status 204
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
index e59ecc011cae9fc63b5810b242baa75e998e4592..20061b7a04c5650dc2b152f68fab6eadffcbf633 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot
@@ -1,6 +1,6 @@
*** Settings ***
# Suite setup Expect spec SOL003-VNFLifecycleManagement-API.yaml
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
@@ -134,7 +134,7 @@ DELETE Individual VNFInstance Conflict
Validate Json ProblemDetails.schema.json ${json}
Log Validation OK
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
diff --git a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
index 923a57088689c0078117c680a0c34ab9fe45c672..8ba4255f500bc3e9cb6c2c14d46357cee062b7e5 100644
--- a/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
+++ b/SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library JSONLibrary
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
index 589246c788f1dfed97b01c2563c381aeee4011b7..f640af660e24da5cdc0df42a4ffdc16ec2212529 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
@@ -72,7 +72,7 @@ DELETE Instantiate VNFInstance - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
diff --git a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWithCheckAndNotifications.robot b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWithCheckAndNotifications.robot
index bf3f31e125d4e2da618d629d708502e66da5917c..b755559c63b32c6199aca92d2b0e6c213a3761bb 100644
--- a/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWithCheckAndNotifications.robot
+++ b/SOL003/VNFLifecycleManagement-API/InstantiateVNFTaskWithCheckAndNotifications.robot
@@ -1,7 +1,7 @@
*** Setting ***
Suite Setup Initialize System
Suite Teardown Terminate All Processes kill=true
-Resource variables.txt
+Resource environment/variables.txt
Library OperatingSystem
Library MockServerLibrary
Library Process
diff --git a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
index ec474bc8573d59767f3e925a7edc6b6fb3031d34..662897f492b332a6f58c4a8cbc9f922392675b4c 100644
--- a/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
+++ b/SOL003/VNFLifecycleManagement-API/NotificationEndpoint.robot
@@ -1,7 +1,7 @@
*** Settings ***
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
-Resource variables.txt
+Resource environment/variables.txt
Library MockServerLibrary
Library Process
Library OperatingSystem
diff --git a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
index df2dabb4245b00ed52604d0ff29e13213f1c40c0..dca37b19ad252c4bb736fd98052f26e19647122f 100644
--- a/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/OperateVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
@@ -114,7 +114,7 @@ DELETE Operate VNFInstance - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
diff --git a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
index 6d3d65d6e938a4d45424e764ba77694410f78bdc..357555567d1fef18ea7d1e8ca94f4c6d551f0584 100644
--- a/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RetryOperationTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
@@ -109,7 +109,7 @@ DELETE Retry operation task - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
diff --git a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
index 768fcf4ddce6c66d73acad03083d7d7a38ccdd59..be34ff1e7f83bc1baa6fa5c0ed3955f23f87faef 100644
--- a/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/RollbackOperationTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library DependencyLibrary
@@ -109,7 +109,7 @@ DELETE Rollback operation task - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
index 5b6347137f4eabf5ece34cbd41060c693e857842..e2d9b2abe56a5cd210a8415f1245ce8e77fff426 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
@@ -111,7 +111,7 @@ DELETE Scale VNFInstance - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskHighLevel.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskHighLevel.robot
index f240641cee7334dbfe2c9d501fec9d4978c784d5..5dcaec9603df9a116d8dac0644f01f5454db6f7e 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskHighLevel.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskHighLevel.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT} spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
Library BuiltIn
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot
index 58fd69d13657d0cd6aaef35b7fcae7ebfa98557f..a1127bcbb97372b13e9110bfe67e3d6a933db7a2 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFTaskWorkflow.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Resource VnfLcmMntOperationKeywords.robot
Resource SubscriptionKeywords.robot
Library REST http://${VNFM_HOST}:${VNFM_PORT} spec=SOL003-VNFLifecycleManagement-API.yaml
diff --git a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
index ed1a4cb0127f1c95e53d94374b6bd5bba6c8255c..ed76b660972738c80099d6c2fec20b86ff5c3e7c 100644
--- a/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/ScaleVNFToLevelTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
@@ -115,7 +115,7 @@ DELETE Scale to level VNFInstance - Method not implemented
Output response
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
diff --git a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
index 860107dc652fac1e80566123f457b9928d907882..708c03f572e54b4d839a8e1d4eb653524aae16f9 100644
--- a/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot
@@ -1,13 +1,11 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT} spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
Library BuiltIn
Library JSONLibrary
Library MockServerLibrary
-*** Variables ***
-${sleep_interval} 20s
*** Keywords ***
Check subscriptions about one VNFInstance and operation type
diff --git a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
index 5c06ac1f4018f763d12fab473cd3e2fa36c307e3..9d8ce914f1734a1d61d19ccb1086a99e40be5aa9 100644
--- a/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
+++ b/SOL003/VNFLifecycleManagement-API/Subscriptions.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
index f9ca35fae1a20ebc6038398e33b081241d150869..6ded762f0ee9a13f8275a7727303a509901811c9 100644
--- a/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
+++ b/SOL003/VNFLifecycleManagement-API/TerminateVNFTask.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
@@ -93,7 +93,7 @@ DELETE Terminate VNFInstance - Method not implemented
Log Validate Status code
Integer response status 405
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Set Headers {"Content-Type": "${CONTENT_TYPE}"}
diff --git a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
index 8fc57bc260d6588b4511776a2d073bd570b14b30..dbd05a1c20d21536735421231916c83fa062c2ba 100644
--- a/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
+++ b/SOL003/VNFLifecycleManagement-API/VNFInstances.robot
@@ -1,6 +1,6 @@
*** Settings ***
# Suite setup Expect spec SOL003-VNFLifecycleManagement-API.yaml
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
diff --git a/SOL003/VNFLifecycleManagement-API/VnfInstancesWithChecks.robot b/SOL003/VNFLifecycleManagement-API/VnfInstancesWithChecks.robot
index eed857b64b471ce0c615af12eceb8d568863a42e..17579cfcacc80ce339d91b7c7763bd69552387d4 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfInstancesWithChecks.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfInstancesWithChecks.robot
@@ -1,5 +1,5 @@
*** Setting ***
-Resource variables.txt
+Resource environment/variables.txt
Library OperatingSystem
Library BuiltIn
Library Collections
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
index 8dd620282e26112e3e0c0ad7b3e75f544a67097e..1b3df8fb7d4e3d2d8ed543513f2a4eab723cd561 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot
@@ -1,16 +1,10 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST http://${VNFM_HOST}:${VNFM_PORT} spec=SOL003-VNFLifecycleManagement-API.yaml
Library OperatingSystem
Library BuiltIn
Library JSONLibrary
Library JSONSchemaLibrary schemas/
-
-*** Variables ***
-${GRANT_POLLING_TOT} 2
-${GRANT_POLLING_INTERVAL} 5s
-${SCALE_POLLING_TOT} 10
-${SCALE_POLLING_INTERVAL} 15s
*** Keywords ***
diff --git a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
index 1a33cc93eaa6e5e73230c378451ca3a15a726cc7..30752f2ea8c6f4b09607b0d83d6b4affec8ecfde 100644
--- a/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
+++ b/SOL003/VNFLifecycleManagement-API/VnfLcmOperationOccurences.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}
... spec=SOL003-VNFLifecycleManagement-API.yaml
Library JSONLibrary
diff --git a/SOL003/VNFFaultManagementNotification-API/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
similarity index 88%
rename from SOL003/VNFFaultManagementNotification-API/variables.txt
rename to SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 8ff721abee4a6a6e7a489007ffa090ce229602e9..cbcd2e9fca14a61a27e4b31519306580c6772281 100644
--- a/SOL003/VNFFaultManagementNotification-API/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -35,4 +35,10 @@ ${notification_ep} /notification
${notification_port} 9091
${VnfLcmOperationOccurrenceNotification} {}
${VnfIdentifierCreationNotification} {}
-${VnfIdentifierDeletionNotification} {}
\ No newline at end of file
+${VnfIdentifierDeletionNotification} {}
+${SYNC_MODE} 0
+${sleep_interval} 20s
+${GRANT_POLLING_TOT} 2
+${GRANT_POLLING_INTERVAL} 5s
+${SCALE_POLLING_TOT} 10
+${SCALE_POLLING_INTERVAL} 15s
\ No newline at end of file
diff --git a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
index 21b317412f2c89b1c1d3fef880a0691fd124ee24..2d45b8dbba3b730ed14106d4c77d4dc240530ced 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/Grants.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environmentvariables.txt
Library REST http://${NFVO_HOST}:${NFVO_PORT}
... spec=SOL003-VNFLifecycleOperationGranting-API.yaml
Library OperatingSystem
diff --git a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
index 7ea69f97c2ba237f1c5f4450694b6dc955466cff..454ecc22b122205fa8ec585a6941b571f6c19a6d 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
+++ b/SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library OperatingSystem
Library JSONLibrary
Library JSONSchemaLibrary schemas/
@@ -81,7 +81,7 @@ DELETE an individual grant - Method not implemented
Log Validate Status code
Integer response status 204
-*** Key words ***
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
diff --git a/SOL003/VNFLifecycleOperationGranting-API/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
similarity index 100%
rename from SOL003/VNFLifecycleOperationGranting-API/variables.txt
rename to SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
diff --git a/SOL003/VNFPackageManagementNotification-API_nxw/PackageManagementNotification.robot b/SOL003/VNFPackageManagementNotification-API_nxw/PackageManagementNotification.robot
index 335519a2a46aaadd0a117f6dadf583c628fd9cc2..10320e42a177295462faf38c6b461d47645e713e 100644
--- a/SOL003/VNFPackageManagementNotification-API_nxw/PackageManagementNotification.robot
+++ b/SOL003/VNFPackageManagementNotification-API_nxw/PackageManagementNotification.robot
@@ -1,4 +1,5 @@
*** Setting ***
+Resource environment/variables.txt
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
Library MockServerLibrary
@@ -8,12 +9,6 @@ Library BuiltIn
Library Collections
Library String
-*** Variable ***
-${callback_uri} http://localhost
-${callback_port} 9091
-${callback_endpoint} /endpoint
-${callback_endpoint_error} /endpoint_404
-${sleep_interval} 20s
*** Test Cases ***
Check Notification Endpoint
diff --git a/SOL003/VNFPackageManagementNotification-API_nxw/environment/variables.txt b/SOL003/VNFPackageManagementNotification-API_nxw/environment/variables.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c758145e5c52572eed2049b66bc603171bce9385
--- /dev/null
+++ b/SOL003/VNFPackageManagementNotification-API_nxw/environment/variables.txt
@@ -0,0 +1,7 @@
+
+*** Variables ***
+${callback_uri} http://localhost
+${callback_port} 9091
+${callback_endpoint} /endpoint
+${callback_endpoint_error} /endpoint_404
+${sleep_interval} 20s
\ No newline at end of file
diff --git a/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot b/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
index ef55850f928eaf9c26fdca33fb01bb0fce873611..f4e2b487e2833c9efea7bcaaf1a78f07d29a0241 100644
--- a/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
+++ b/SOL003/VNFPerformanceManagementNotification-API/PerformanceManagementNotification.robot
@@ -1,4 +1,5 @@
*** Setting ***
+Resource environment/generic.txt
Suite Setup Create Sessions
Suite Teardown Terminate All Processes kill=true
Library MockServerLibrary
@@ -8,12 +9,6 @@ Library BuiltIn
Library Collections
Library String
-*** Variable ***
-${callback_uri} http://localhost
-${callback_port} 9091
-${callback_endpoint} /endpoint
-${callback_endpoint_error} /endpoint_404
-${sleep_interval} 20s
*** Test Cases ***
Check Notification Endpoint
diff --git a/SOL003/VNFPerformanceManagementNotification-API/environment/generic.txt b/SOL003/VNFPerformanceManagementNotification-API/environment/generic.txt
index 4f4b01943e95cea8574fb7e33af3b9690858ab30..12a19817c09edfcaefe04a105a62e1a95995bd3a 100644
--- a/SOL003/VNFPerformanceManagementNotification-API/environment/generic.txt
+++ b/SOL003/VNFPerformanceManagementNotification-API/environment/generic.txt
@@ -1,19 +1,6 @@
*** Variables ***
-${VNFM_HOST} localhost # Hostname of the VNFM
-${VNFM_PORT} 8080 # Listening port of the VNFM
-${NFVO_HOST} localhost # Hostname of the NFVO
-${NFVO_PORT} 8081 # Listening port of the NFVO
-${VNFM_SCHEMA} https
-${NFVO_SCHEMA} https
-${AUTHORIZATION} Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
-${CONTENT_TYPE_JSON} application/json
-${ACCEPT_JSON} application/json
-${apiRoot} /
-${AUTH_USAGE} 1
-${NEG_AUTHORIZATION} Bearer negativetoken
-${apiVersion} v1
-${apiName} vnfpm
-${FIELD_USAGE} 1
-${VNFM_AUTHENTICATION} Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
-${VNFM_AUTH_USAGE} 1
-${VNFM_DUPLICATION} 1
+${callback_uri} http://localhost
+${callback_port} 9091
+${callback_endpoint} /endpoint
+${callback_endpoint_error} /endpoint_404
+${sleep_interval} 20s
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
index 3c858cb3920617d320313eda92067dd98ea30a6d..c63b04b24013a47b7a2040bb25d0af94a0ae77f5 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/IndividualSubscription.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library OperatingSystem
Library JSONLibrary
Library JSONSchemaLibrary schemas/
@@ -55,8 +55,7 @@ DELETE an individual subscription
Log Validate Status code
Integer response status 204
-*** Key words ***
-
+*** Keywords ***
Check resource existance
Set Headers {"Accept":"${ACCEPT}"}
Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
index 0a45786456f4b2dbe460ebb29e25e27bfb13bfa9..5704ad479c41976dc6254ff6b15c439ea7eb880a 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${VNFM_SCHEMA}://${VNFM_HOST}:${notification_port}
Library MockServerLibrary
Library Process
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
index f46a040dc23f59d027002a739830fe6f2b86358b..04d6776d39cd69f921fce1d3ab0db23326e4146b 100644
--- a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
+++ b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/Subscriptions.robot
@@ -1,5 +1,5 @@
*** Settings ***
-Resource variables.txt
+Resource environment/variables.txt
Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}
... spec=SOL003-VirtualisedResourcesQuotaAvailableNotification-API.yaml
Library OperatingSystem
diff --git a/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/variables.txt b/SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
similarity index 100%
rename from SOL003/VirtualisedResourcesQuotaAvailableNotification-API/variables.txt
rename to SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt
diff --git a/SOL003/variables.txt b/SOL003/variables.txt
deleted file mode 100644
index 9fceaabb9c94566c552f32575d3cee77d22725ed..0000000000000000000000000000000000000000
--- a/SOL003/variables.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-*** Variables ***
-${VNFM_HOST} localhost # Hostname of the VNFM
-${VNFM_PORT} 8080 # Listening port of the VNFM
-${NFVO_HOST} localhost # Hostname of the NFVO
-${NFVO_PORT} 8081 # Listening port of the NFVO
-${VNFM_SCHEMA} https
-${NFVO_SCHEMA} https
-${AUTHORIZATION} Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ==
-${CONTENT_TYPE} application/json
-${ACCEPT} application/json
-${apiRoot} /
-${AUTH_USAGE} 1
-${WRONG_AUTHORIZATION} Bearer XXXXXWRONGXXXXX
-${vnfPkgId} 6fc3539c-e602-4afa-8e13-962fb5a7d81f
-${SINGLE_FILE_VNFD} 1 # If VNFD is PLAIN TEXT
-${ACCEPT_PLAIN} text/plain
-${ACCEPT_ZIP} application/zip
-${vnfPkgId_processing} 007c111c-38a1-42c0-a666-7475ecb1567c
-${ARTIFACT_TYPE} application/octet-stream
-${ARTIFACT_ID} artifactId
-${WRONG_ACCEPT} application/json