From 36f70db57229d750ede4d3383df2031680d6822d Mon Sep 17 00:00:00 2001
From: Elian Kraja <e.kraja@nextworks.it>
Date: Thu, 13 Dec 2018 12:27:39 +0100
Subject: [PATCH] Refactoring directories. Fix on the robot files
---
.../VNFConfiguration-API/Configuration.robot | 2 +-
.../{ => environment}/variables.txt | 0
SOL002/VNFFaultManagement-API/Alarms.robot | 2 +-
.../EscalatePerceivedSeverityTask.robot | 2 +-
.../IndividualAlarm.robot | 2 +-
.../IndividualSubscription.robot | 2 +-
.../NotificationEndpoint.robot | 2 +-
.../Subscriptions.robot | 2 +-
.../{ => environment}/variables.txt | 0
.../VnfIndicatorNotification.robot | 7 +-----
.../environment/variables.txt | 6 +++++
.../CancelOperationTask.robot | 2 +-
.../ChangeExternalVNFConnectivityTask.robot | 2 +-
.../ChangeVNFFlavourTask.robot | 2 +-
.../FailOperationTask.robot | 2 +-
.../HealVNFTask.robot | 2 +-
.../IndividualSubscription.robot | 2 +-
.../IndividualVNFInstance.robot | 2 +-
.../IndividualVnfLcmOperationOccurence.robot | 2 +-
.../InstantiateVNFTask.robot | 2 +-
.../NotificationEndpoint.robot | 2 +-
.../OperateVNFTask.robot | 2 +-
.../RetryOperationTask.robot | 2 +-
.../RollbackOperationTask.robot | 2 +-
.../ScaleVNFTask.robot | 2 +-
.../ScaleVNFToLevelTask.robot | 2 +-
.../Subscriptions.robot | 2 +-
.../TerminateVNFTask.robot | 2 +-
.../VNFInstances.robot | 2 +-
.../VnfLcmOperationOccurences.robot | 2 +-
.../{ => environment}/variables.txt | 0
.../PerformanceManagementNotification.robot | 8 +------
.../environment/generic.txt | 23 ++++---------------
SOL002/variables.txt | 21 -----------------
SOL003/VNFFaultManagement-API/Alarms.robot | 2 +-
.../IndividualAlarm.robot | 2 +-
.../IndividualSubscription.robot | 4 ++--
.../Subscriptions.robot | 2 +-
.../{ => environment}/variables.txt | 0
.../NotificationEndpoint.robot | 2 --
.../environment}/variables.txt | 2 +-
.../VnfIndicatorNotification.robot | 7 +-----
.../environment/variables.txt | 6 +++++
.../CancelOperationTask.robot | 4 ++--
.../ChangeExternalVNFConnectivityTask.robot | 4 ++--
.../ChangeVNFFlavourTask.robot | 4 ++--
.../FailOperationTask.robot | 4 ++--
.../HealVNFTask.robot | 4 ++--
.../IndividualSubscription.robot | 4 ++--
.../IndividualVNFInstance.robot | 4 ++--
.../IndividualVnfLcmOperationOccurence.robot | 2 +-
.../InstantiateVNFTask.robot | 4 ++--
...iateVNFTaskWithCheckAndNotifications.robot | 2 +-
.../NotificationEndpoint.robot | 2 +-
.../OperateVNFTask.robot | 4 ++--
.../RetryOperationTask.robot | 4 ++--
.../RollbackOperationTask.robot | 4 ++--
.../ScaleVNFTask.robot | 4 ++--
.../ScaleVNFTaskHighLevel.robot | 2 +-
.../ScaleVNFTaskWorkflow.robot | 2 +-
.../ScaleVNFToLevelTask.robot | 4 ++--
.../SubscriptionKeywords.robot | 4 +---
.../Subscriptions.robot | 2 +-
.../TerminateVNFTask.robot | 4 ++--
.../VNFInstances.robot | 2 +-
.../VnfInstancesWithChecks.robot | 2 +-
.../VnfLcmMntOperationKeywords.robot | 8 +------
.../VnfLcmOperationOccurences.robot | 2 +-
.../environment}/variables.txt | 8 ++++++-
.../Grants.robot | 2 +-
.../IndividualGrant.robot | 4 ++--
.../{ => environment}/variables.txt | 0
.../PackageManagementNotification.robot | 7 +-----
.../environment/variables.txt | 7 ++++++
.../PerformanceManagementNotification.robot | 7 +-----
.../environment/generic.txt | 23 ++++---------------
.../IndividualSubscription.robot | 5 ++--
.../NotificationEndpoint.robot | 2 +-
.../Subscriptions.robot | 2 +-
.../{ => environment}/variables.txt | 0
SOL003/variables.txt | 21 -----------------
81 files changed, 119 insertions(+), 199 deletions(-)
rename SOL002/VNFConfiguration-API/{ => environment}/variables.txt (100%)
rename SOL002/VNFFaultManagement-API/{ => environment}/variables.txt (100%)
create mode 100644 SOL002/VNFIndicatorNotification-API/environment/variables.txt
rename SOL002/VNFLifecycleManagement-API/{ => environment}/variables.txt (100%)
delete mode 100644 SOL002/variables.txt
rename SOL003/VNFFaultManagement-API/{ => environment}/variables.txt (100%)
rename SOL003/{VNFLifecycleManagement-API => VNFFaultManagementNotification-API/environment}/variables.txt (98%)
create mode 100644 SOL003/VNFIndicatorNotification-API/environment/variables.txt
rename SOL003/{VNFFaultManagementNotification-API => VNFLifecycleManagement-API/environment}/variables.txt (88%)
rename SOL003/VNFLifecycleOperationGranting-API/{ => environment}/variables.txt (100%)
create mode 100644 SOL003/VNFPackageManagementNotification-API_nxw/environment/variables.txt
rename SOL003/VirtualisedResourcesQuotaAvailableNotification-API/{ => environment}/variables.txt (100%)
delete mode 100644 SOL003/variables.txt
diff --git a/SOL002/VNFConfiguration-API/Configuration.robot b/SOL002/VNFConfiguration-API/Configuration.robot
index 05af12fe..c0bb4e90 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 b5a02f9e..61ea4463 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 5e0459d5..6a85191a 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 fe7b7a6c..3742cd80 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 e07c7f66..0a01891b 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 bb12c9d1..1d5a78aa 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 6e5932f9..36783dd3 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 2964461c..02f5c707 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 00000000..df8e5c4a
--- /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 0f557c96..3475ece0 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 16d4801b..3cd41f99 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 ff237c06..4a2ebaed 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 7a3e7574..2b9b6f3b 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 c8ee5bc5..a1fa4cb8 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 2d2c0b79..ea5d2776 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 22b2c181..f805d32d 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 de9168d5..97b748e4 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 df787395..df669342 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 ec474bc8..662897f4 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 ba563c03..46d7093c 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 f5e72145..998f5c78 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 5cc1d7e6..9dab30f9 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 a9290542..20ed3720 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 4d0a46ab..a5c2fe64 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 b1e636b2..ab8ff7d5 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 e34651a9..e9a52027 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 17e836e8..08e8e2a5 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 6f8e13a4..e612c79b 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 95f7613f..8662ae00 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 4f4b0194..12a19817 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 f5f3573a..00000000
--- 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 b8f5418b..403c96ee 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 26425b11..0e397e9d 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 21ead121..4bd82475 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 36f498eb..e155a92c 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 ec0211e7..191e2643 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 f28f6d38..9a53f649 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 b839e3d5..b0189c7f 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 00000000..df8e5c4a
--- /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 660fb194..9cfdaf58 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 16d4801b..bb83d1eb 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 2af7226a..64cf8c63 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 97178667..4a5e1583 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 aa72c864..ddbbb3dc 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 2d2c0b79..b658ebc4 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 e59ecc01..20061b7a 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 923a5708..8ba4255f 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 589246c7..f640af66 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 bf3f31e1..b755559c 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 ec474bc8..662897f4 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 df2dabb4..dca37b19 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 6d3d65d6..35755556 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 768fcf4d..be34ff1e 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 5b634713..e2d9b2ab 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 f240641c..5dcaec96 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 58fd69d1..a1127bcb 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 ed1a4cb0..ed76b660 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 860107dc..708c03f5 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 5c06ac1f..9d8ce914 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 f9ca35fa..6ded762f 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 8fc57bc2..dbd05a1c 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 eed857b6..17579cfc 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 8dd62028..1b3df8fb 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 1a33cc93..30752f2e 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 8ff721ab..cbcd2e9f 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 21b31741..2d45b8db 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 7ea69f97..454ecc22 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 335519a2..10320e42 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 00000000..c758145e
--- /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 ef55850f..f4e2b487 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 4f4b0194..12a19817 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 3c858cb3..c63b04b2 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 0a457864..5704ad47 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 f46a040d..04d6776d 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 9fceaabb..00000000
--- 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
--
GitLab