From: aguilarherna <daguilarh@indra.es>
Date: Wed, 12 May 2021 08:56:23 +0000 (+0000)
Subject: Revert "Modified testsuites to remove resource files"
X-Git-Tag: release-v10.0-start~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F10792%2F2;p=osm%2Ftests.git

Revert "Modified testsuites to remove resource files"

This reverts commit f0c88cd2aa142fd84650435fbbbec68e32503766.

Change-Id: I7827a31b0e3489a985e7f66e94074cc57a48fc9b
Signed-off-by: aguilarherna <daguilarh@indra.es>
---

diff --git a/robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py b/robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py
new file mode 100644
index 0000000..4505d7e
--- /dev/null
+++ b/robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py
@@ -0,0 +1,22 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# NS and VNF descriptor package folder
+vnfd_pkg = 'ubuntu_cloudinit_vnf'
+nsd_pkg = 'ubuntu_cloudinit_ns'
+# NS and VNF descriptor id
+vnfd_name = 'ubuntu_cloudinit-vnf'
+nsd_name = 'ubuntu_cloudinit-ns'
+# NS instance name
+ns_name = 'basic_05_instantiation_params_cloud_init'
diff --git a/robot-systest/resources/basic_06-vnf_with_charm_data.py b/robot-systest/resources/basic_06-vnf_with_charm_data.py
new file mode 100644
index 0000000..e8f756f
--- /dev/null
+++ b/robot-systest/resources/basic_06-vnf_with_charm_data.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'charm-packages/ha_proxy_charm_vnf'
+nsd_pkg = 'charm-packages/ha_proxy_charm_ns'
+# NS and VNF descriptor id
+vnfd_name = 'ha_proxy_charm-vnf'
+nsd_name = 'ha_proxy_charm-ns'
+# NS instance name
+ns_name = 'basic_06_charm_test'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/basic_07-secure_key_management_data.py b/robot-systest/resources/basic_07-secure_key_management_data.py
new file mode 100644
index 0000000..bc1ee4d
--- /dev/null
+++ b/robot-systest/resources/basic_07-secure_key_management_data.py
@@ -0,0 +1,22 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# NS and VNF descriptor package folder
+vnfd_pkg = 'charm-packages/nopasswd_proxy_charm_vnf'
+nsd_pkg = 'charm-packages/nopasswd_proxy_charm_ns'
+# NS and VNF descriptor id
+vnfd_name = 'nopasswd_proxy_charm-vnf'
+nsd_name = 'nopasswd_proxy_charm-ns'
+# NS instance name
+ns_name = 'basic_07_secure_key_management'
diff --git a/robot-systest/resources/basic_09-manual_vdu_scaling_data.py b/robot-systest/resources/basic_09-manual_vdu_scaling_data.py
new file mode 100644
index 0000000..31b45a2
--- /dev/null
+++ b/robot-systest/resources/basic_09-manual_vdu_scaling_data.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_basic_metrics_vnf'
+nsd_pkg = 'hackfest_basic_metrics_ns'
+# NS and VNF descriptor id
+vnfd_name = 'hackfest_basic_metrics-vnf'
+nsd_name = 'hackfest_basic-ns-metrics'
+# NS instance name
+ns_name = 'basic_09_manual_scaling_test'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/basic_11-native_charms.py b/robot-systest/resources/basic_11-native_charms.py
new file mode 100644
index 0000000..a82e9de
--- /dev/null
+++ b/robot-systest/resources/basic_11-native_charms.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'charm-packages/native_charm_vnf'
+nsd_pkg = 'charm-packages/native_charm_ns'
+# NS and VNF descriptor id
+vnfd_name = 'native_charm-vnf'
+nsd_name = 'native_charm-ns'
+# NS instance name
+ns_name = 'basic_11_native_charms'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/basic_12-ns_primitives_data.py b/robot-systest/resources/basic_12-ns_primitives_data.py
new file mode 100644
index 0000000..1b92b5a
--- /dev/null
+++ b/robot-systest/resources/basic_12-ns_primitives_data.py
@@ -0,0 +1,36 @@
+# Copyright 2020 Canonical Ltd.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package files
+vnfd_pkg1 = 'nscharm_policy_vnf'
+vnfd_pkg2 = 'nscharm_user_vnf'
+nsd_pkg = 'nscharm_ns'
+new_nsd_pkg = 'new_nscharm_ns'
+# NSD and VNFD names in OSM
+vnfd_name1 = 'nscharm-policy-vnf'
+vnfd_name2 = 'nscharm-user-vnf'
+nsd_name = 'nscharm-ns'
+# NS Descriptor file
+nsd_file = 'nscharm_nsd.yaml'
+# NS instance name
+ns_name = 'test_nscharm'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
+# Juju variables
+old_juju_password = 'a5611fc6452349cc6e45705d34c501d4'
diff --git a/robot-systest/resources/basic_13-ns_relations.py b/robot-systest/resources/basic_13-ns_relations.py
new file mode 100644
index 0000000..ef77561
--- /dev/null
+++ b/robot-systest/resources/basic_13-ns_relations.py
@@ -0,0 +1,29 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg1 = 'charm-packages/ns_relations_provides_vnf'
+vnfd_pkg2 = 'charm-packages/ns_relations_requires_vnf'
+nsd_pkg = 'charm-packages/ns_relations_ns'
+# NS and VNF descriptor id
+vnfd_name1 = 'ns_relations_provides-vnf'
+vnfd_name2 = 'ns_relations_requires-vnf'
+nsd_name = 'ns_relations-ns'
+# NS instance name
+ns_name = 'basic_13_ns_relations_test'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/basic_14-vnf_relations.py b/robot-systest/resources/basic_14-vnf_relations.py
new file mode 100644
index 0000000..36deb48
--- /dev/null
+++ b/robot-systest/resources/basic_14-vnf_relations.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'charm-packages/vnf_relations_vnf'
+nsd_pkg = 'charm-packages/vnf_relations_ns'
+# NS and VNF descriptor id
+vnfd_name = 'vnf_relations-vnf'
+nsd_name = 'vnf_relations-ns'
+# NS instance name
+ns_name = 'basic_14_vnf_relations_test'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/basic_15-rbac_configurations_data.py b/robot-systest/resources/basic_15-rbac_configurations_data.py
new file mode 100644
index 0000000..094ba20
--- /dev/null
+++ b/robot-systest/resources/basic_15-rbac_configurations_data.py
@@ -0,0 +1,22 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# User, project and roles to use
+user_name = 'basic_15_test_user'
+user_password = 'basic_15_user_pass'
+user_role = 'project_user'
+user_project = 'admin'
+project_name = 'basic_15_test_project'
+new_project_name = 'basic_15_project_test'
+role_name = 'test_role'
diff --git a/robot-systest/resources/basic_16-advanced_onboarding_and_scaling_data.py b/robot-systest/resources/basic_16-advanced_onboarding_and_scaling_data.py
new file mode 100644
index 0000000..03dbe46
--- /dev/null
+++ b/robot-systest/resources/basic_16-advanced_onboarding_and_scaling_data.py
@@ -0,0 +1,33 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_basic_metrics_vnf'
+nsd_pkg = 'hackfest_basic_metrics_ns'
+# NS and VNF descriptor id
+vnfd_name = 'hackfest_basic_metrics-vnf'
+nsd_name = 'hackfest_basic-ns-metrics'
+# NS instance name
+ns_name = 'basic_16'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
+# Initial, delta, min and max number of VDU instances
+init_instances = 3
+min_instances = 3
+max_instances = 5
+delta_instances = 2
+
diff --git a/robot-systest/resources/basic_17-delete_vnf_package_data.py b/robot-systest/resources/basic_17-delete_vnf_package_data.py
new file mode 100644
index 0000000..76f003e
--- /dev/null
+++ b/robot-systest/resources/basic_17-delete_vnf_package_data.py
@@ -0,0 +1,21 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_basic_vnf'
+nsd_pkg = 'hackfest_basic_ns'
+# NS and VNF descriptor package id
+vnfd_name = 'hackfest_basic-vnf'
+nsd_name = 'hackfest_basic-ns'
+
diff --git a/robot-systest/resources/epa_01-epa_sriov_data.py b/robot-systest/resources/epa_01-epa_sriov_data.py
new file mode 100644
index 0000000..d3cb38c
--- /dev/null
+++ b/robot-systest/resources/epa_01-epa_sriov_data.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_basic_sriov_vnf'
+nsd_pkg = 'hackfest_basic_sriov_ns'
+# NS and VNF descriptor id
+vnfd_name = 'hackfest_basic_sriov-vnf'
+nsd_name = 'hackfest_basic_sriov-ns'
+# NS instance name
+ns_name = 'epa_01-epa_sriov_test'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/epa_02-additional_capabilities_data.py b/robot-systest/resources/epa_02-additional_capabilities_data.py
new file mode 100644
index 0000000..5318420
--- /dev/null
+++ b/robot-systest/resources/epa_02-additional_capabilities_data.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'epa_quota_vnf'
+nsd_pkg = 'epa_quota_ns'
+# NS and VNF descriptor id
+vnfd_name = 'epa_quota-vnf'
+nsd_name = 'epa_quota-ns'
+# NS instance name
+ns_name = 'epa_02-epa_quota_test'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/epa_04-epa_underlay_sriov.py b/robot-systest/resources/epa_04-epa_underlay_sriov.py
new file mode 100644
index 0000000..b031512
--- /dev/null
+++ b/robot-systest/resources/epa_04-epa_underlay_sriov.py
@@ -0,0 +1,31 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'epa_1vm_sriov_vnf'
+nsd_pkg = 'epa_1vm_sriov_ns'
+# NS and VNF descriptor id
+vnfd_name = 'epa_1vm_sriov-vnf'
+nsd_name = 'epa_1vm_sriov-ns'
+# NS instance name
+ns_name = 'epa_04'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
+# Fixed IPs and subnet for datanet VL
+datanet_subnet = '192.168.100.0/24'
+datanet_ip1 = '192.168.100.11'
+datanet_ip2 = '192.168.100.22'
diff --git a/robot-systest/resources/epa_05-epa_underlay_passthrough.py b/robot-systest/resources/epa_05-epa_underlay_passthrough.py
new file mode 100644
index 0000000..4e8cc82
--- /dev/null
+++ b/robot-systest/resources/epa_05-epa_underlay_passthrough.py
@@ -0,0 +1,32 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'epa_1vm_passthrough_vnf'
+nsd_pkg = 'epa_1vm_passthrough_ns'
+# NS and VNF descriptor id
+vnfd_name = 'epa_1vm_passthrough-vnf'
+nsd_name = 'epa_1vm_passthrough-ns'
+# NS instance name
+ns_name = 'epa_05'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
+# Fixed IPs and subnet for datanet VL
+datanet_subnet = '192.168.110.0/24'
+datanet_ip1 = '192.168.110.11'
+datanet_ip2 = '192.168.110.22'
+
diff --git a/robot-systest/resources/hackfest_basic_ns_data.py b/robot-systest/resources/hackfest_basic_ns_data.py
new file mode 100644
index 0000000..0f927ed
--- /dev/null
+++ b/robot-systest/resources/hackfest_basic_ns_data.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_basic_vnf'
+nsd_pkg = 'hackfest_basic_ns'
+# NS and VNF descriptor package id
+vnfd_name = 'hackfest_basic-vnf'
+nsd_name = 'hackfest_basic-ns'
+# NS instance name
+ns_name = 'hfbasic'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/hackfest_cloudinit_ns_data.py b/robot-systest/resources/hackfest_cloudinit_ns_data.py
new file mode 100644
index 0000000..d914c49
--- /dev/null
+++ b/robot-systest/resources/hackfest_cloudinit_ns_data.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_cloudinit_vnf'
+nsd_pkg = 'hackfest_cloudinit_ns'
+# NS and VNF descriptor package id
+vnfd_name = 'hackfest_cloudinit-vnf'
+nsd_name = 'hackfest_cloudinit-ns'
+# NS instance name
+ns_name = 'hfcloudinit'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/hackfest_multivdu_ns_data.py b/robot-systest/resources/hackfest_multivdu_ns_data.py
new file mode 100644
index 0000000..7c75b67
--- /dev/null
+++ b/robot-systest/resources/hackfest_multivdu_ns_data.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_multivdu_vnf'
+nsd_pkg = 'hackfest_multivdu_ns'
+# NS and VNF descriptor package id
+vnfd_name = 'hackfest_multivdu-vnf'
+nsd_name = 'hackfest_multivdu-ns'
+# NS instance name
+ns_name = 'hfmultivdu'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/k8s_01-create_k8s_cluster_data.py b/robot-systest/resources/k8s_01-create_k8s_cluster_data.py
new file mode 100644
index 0000000..c5a8aa9
--- /dev/null
+++ b/robot-systest/resources/k8s_01-create_k8s_cluster_data.py
@@ -0,0 +1,43 @@
+#   Copyright 2020 Canonical Ltd.
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package files
+vnfd_pkg1 = 'k8s_jujucontroller_vnf.tar.gz'
+vnfd_pkg2 = 'k8s_jujumachine_vnf.tar.gz'
+nsd_pkg = 'k8s_juju_ns.tar.gz'
+# NS and VNF descriptor package files
+vnfd_name1 = 'k8s_jujucontroller_vnf'
+vnfd_name2 = 'k8s_jujumachine_vnf'
+nsd_name = 'k8s_juju'
+# VNF Member indexes
+vnf_member_index_1 = 'k8s_vnf1'
+vnf_member_index_2 = 'k8s_vnf2'
+vnf_member_index_3 = 'k8s_vnf3'
+vnf_member_index_4 = 'k8s_vnf4'
+vnf_member_index_5 = 'k8s_juju'
+# Username
+username = 'ubuntu'
+# Kubeconfig file
+kubeconfig_file = '/home/ubuntu/.kube/config'
+# NS instance name
+ns_name = 'k8s-cluster'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
+# Template and config file to use
+template = 'k8s_juju_template.yaml'
+config_file = 'config.yaml'
diff --git a/robot-systest/resources/k8s_02-k8scluster_creation_data.py b/robot-systest/resources/k8s_02-k8scluster_creation_data.py
new file mode 100644
index 0000000..8a816ab
--- /dev/null
+++ b/robot-systest/resources/k8s_02-k8scluster_creation_data.py
@@ -0,0 +1,24 @@
+# Copyright 2020 Canonical Ltd.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# K8s cluster name
+k8scluster_name = 'k8s-test'
+k8scluster_version = 'v1'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/k8s_03-simple_k8s_data.py b/robot-systest/resources/k8s_03-simple_k8s_data.py
new file mode 100644
index 0000000..b544eef
--- /dev/null
+++ b/robot-systest/resources/k8s_03-simple_k8s_data.py
@@ -0,0 +1,30 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# K8s cluster name
+k8scluster_name = 'k8s-test'
+k8scluster_version = 'v1'
+# NS and VNF descriptor package files
+vnfd_pkg = 'charm-packages/native_k8s_charm_vnf'
+nsd_pkg = 'charm-packages/native_k8s_charm_ns'
+# NS and VNF descriptor package files
+vnfd_name = 'native_k8s_charm-vnf'
+nsd_name = 'native_k8s_charm-ns'
+# NS instance name
+ns_name = 'native-k8s'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/k8s_04-openldap_helm_data.py b/robot-systest/resources/k8s_04-openldap_helm_data.py
new file mode 100644
index 0000000..e8c7a69
--- /dev/null
+++ b/robot-systest/resources/k8s_04-openldap_helm_data.py
@@ -0,0 +1,30 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# K8s cluster name
+k8scluster_name = 'k8s-test'
+k8scluster_version = 'v1'
+# NS and VNF descriptor package files
+vnfd_pkg = 'openldap_knf'
+nsd_pkg = 'openldap_ns'
+# NS and VNF descriptor package files
+vnfd_name = 'openldap_knf'
+nsd_name = 'openldap_ns'
+# NS instance name
+ns_name = 'ldap'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/k8s_05-k8s_proxy_charms.py b/robot-systest/resources/k8s_05-k8s_proxy_charms.py
new file mode 100644
index 0000000..f2abc7e
--- /dev/null
+++ b/robot-systest/resources/k8s_05-k8s_proxy_charms.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'charm-packages/k8s_proxy_charm_vnf'
+nsd_pkg = 'charm-packages/k8s_proxy_charm_ns'
+# NS and VNF descriptor id
+vnfd_name = 'k8s_proxy_charm-vnf'
+nsd_name = 'k8s_proxy_charm-ns'
+# NS instance name
+ns_name = 'k8s_05-k8s_proxy_charm'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/k8s_06-k8s_secure_key_management_data.py b/robot-systest/resources/k8s_06-k8s_secure_key_management_data.py
new file mode 100644
index 0000000..404c508
--- /dev/null
+++ b/robot-systest/resources/k8s_06-k8s_secure_key_management_data.py
@@ -0,0 +1,27 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package folder
+vnfd_pkg = 'charm-packages/nopasswd_k8s_proxy_charm_vnf'
+nsd_pkg = 'charm-packages/nopasswd_k8s_proxy_charm_ns'
+# NS and VNF descriptor id
+vnfd_name = 'nopasswd_k8s_proxy_charm-vnf'
+nsd_name = 'nopasswd_k8s_proxy_charm-ns'
+# NS instance name
+ns_name = 'k8s_06-nopasswd_k8s_proxy_charm'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/k8s_07-dummy_helm_data.py b/robot-systest/resources/k8s_07-dummy_helm_data.py
new file mode 100644
index 0000000..e8326ad
--- /dev/null
+++ b/robot-systest/resources/k8s_07-dummy_helm_data.py
@@ -0,0 +1,42 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+
+# VIM Configuration
+vim_name = 'k8s07_dummy'
+vim_user = 'user'
+vim_password = 'pass'
+vim_auth_url = 'http://localhost/dummy'
+vim_tenant = 'tenant'
+vim_account_type = 'dummy'
+
+# K8s cluster name
+k8scluster_name = 'k8s07'
+k8scluster_version = 'v1'
+k8scluster_net = 'null'
+
+# NS and VNF descriptor package files
+vnfd_pkg = 'openldap_knf'
+nsd_pkg = 'openldap_ns'
+vnfd_name = 'openldap_knf'
+nsd_name = 'openldap_ns'
+
+# NS instance name
+ns_name = 'ldap'
+
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/resources/quotas_01-quota_enforcement_data.py b/robot-systest/resources/quotas_01-quota_enforcement_data.py
new file mode 100644
index 0000000..abf6a13
--- /dev/null
+++ b/robot-systest/resources/quotas_01-quota_enforcement_data.py
@@ -0,0 +1,23 @@
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# VNFD package to use during test
+vnfd_name = 'hackfest_basic_vnf'
+# Project names to use
+project_1_name = 'quotas_01_proj_1'
+project_2_name = 'quotas_01_proj_2'
+project_3_name = 'quotas_01_proj_3'
+# User name and password for project
+user_name = 'quotas_01_user'
+user_password = 'quotas_01_pass'
diff --git a/robot-systest/resources/slice_01-network_slicing_data.py b/robot-systest/resources/slice_01-network_slicing_data.py
new file mode 100644
index 0000000..cc64eed
--- /dev/null
+++ b/robot-systest/resources/slice_01-network_slicing_data.py
@@ -0,0 +1,37 @@
+#   Copyright 2020 Atos
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package files
+vnfd1_pkg = 'slice_basic_vnf'
+vnfd2_pkg = 'slice_basic_middle_vnf'
+nsd1_pkg = 'slice_basic_ns'
+nsd2_pkg = 'slice_basic_middle_ns'
+nst = 'slice_basic_nst/slice_basic_nst.yaml'
+# Instance names
+slice_name = 'slicebasic'
+middle_ns_name = 'slicebasic.slice_basic_nsd_2'
+# Descriptor names
+nst_name = 'slice_basic_nst'
+vnfd1_name = 'slice_basic_vnf'
+vnfd2_name = 'slice_basic_middle_vnf'
+nsd1_name = 'slice_basic_ns'
+nsd2_name = 'slice_basic_middle_ns'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
+
diff --git a/robot-systest/resources/slice_02-shared_network_slicing_data.py b/robot-systest/resources/slice_02-shared_network_slicing_data.py
new file mode 100644
index 0000000..d6358a2
--- /dev/null
+++ b/robot-systest/resources/slice_02-shared_network_slicing_data.py
@@ -0,0 +1,40 @@
+#   Copyright 2020 Atos
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package files
+vnfd1_pkg = 'slice_basic_vnf'
+vnfd2_pkg = 'slice_basic_middle_vnf'
+nsd1_pkg = 'slice_basic_ns'
+nsd2_pkg = 'slice_basic_middle_ns'
+nst = 'slice_basic_nst/slice_basic_nst.yaml'
+nst2 = 'slice_basic_nst/slice_basic_2nd_nst.yaml'
+# Instance names
+slice_name = 'slicebasic'
+slice2_name = 'sliceshared'
+middle_ns_name = 'slicebasic.slice_basic_nsd_2'
+# Descriptor names
+nst_name = 'slice_basic_nst'
+nst2_name = 'slice_basic_nst2'
+vnfd1_name = 'slice_basic_vnf'
+vnfd2_name = 'slice_basic_middle_vnf'
+nsd1_name = 'slice_basic_ns'
+nsd2_name = 'slice_basic_middle_ns'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
+
diff --git a/robot-systest/resources/slice_02-shared_ns_data.py b/robot-systest/resources/slice_02-shared_ns_data.py
new file mode 100644
index 0000000..2170b57
--- /dev/null
+++ b/robot-systest/resources/slice_02-shared_ns_data.py
@@ -0,0 +1,39 @@
+#   Copyright 2020 Atos
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+from pathlib import Path
+
+# Get ${HOME} from local machine
+home = str(Path.home())
+# NS and VNF descriptor package files
+vnfd1_pkg = 'slice_hackfest_vnf.tar.gz'
+vnfd2_pkg = 'slice_hackfest_middle_vnfd.tar.gz'
+nsd1_pkg = 'slice_hackfest_ns.tar.gz'
+nsd2_pkg = 'slice_hackfest_middle_nsd.tar.gz'
+nst = 'slice_hackfest_nst.yaml'
+nst2 = 'slice_hackfest2_nst.yaml'
+# Instance names
+slice_name = 'slicehfbasic'
+slice2_name = 'sliceshared'
+middle_ns_name = 'slicehfbasic.slice_hackfest_nsd_2'
+# Descriptor names
+nst_name = 'slice_hackfest_nst'
+nst2_name = 'slice_hackfest2_nst'
+vnfd1_name = 'slice_hackfest_vnf'
+vnfd2_name = 'slice_hackfest_middle_vnf'
+nsd1_name = 'slice_hackfest_ns'
+nsd2_name = 'slice_hackfest_middle_ns'
+# SSH keys to be used
+publickey = home + '/.ssh/id_rsa.pub'
+privatekey = home + '/.ssh/id_rsa'
diff --git a/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot b/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
index 75c911c..b0d66d8 100644
--- a/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
+++ b/robot-systest/testsuite/basic_05-instantiation_parameters_in_cloud_init.robot
@@ -21,26 +21,18 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_05-instantiation_parameters_in_cloud_init_data.py
+
 Force Tags   basic_05   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   ubuntu_cloudinit_vnf
-${vnfd_name}   ubuntu_cloudinit-vnf
-${nsd_pkg}   ubuntu_cloudinit_ns
-${nsd_name}   ubuntu_cloudinit-ns
-
-# NS instance name and configuration
-${ns_name}   basic_05_instantiation_params_cloud_init
-${vnf_member_index}   1
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ], additionalParamsForVnf: [ { member-vnf-index: "${vnf_member_index}", additionalParams: { password: "${new_password}" } } ] }
-
-# SSH user and password
 ${username}   ubuntu
 ${new_password}   newpassword
+${vnf_member_index}   1
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ], additionalParamsForVnf: [ { member-vnf-index: "${vnf_member_index}", additionalParams: { password: "${new_password}" } } ] }
 
 
 *** Test Cases ***
diff --git a/robot-systest/testsuite/basic_06-vnf_with_charm.robot b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
index 704f04f..e455e08 100644
--- a/robot-systest/testsuite/basic_06-vnf_with_charm.robot
+++ b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
@@ -21,28 +21,17 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_06-vnf_with_charm_data.py
+
 Force Tags   basic_06   cluster_ee_config   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/ha_proxy_charm_vnf
-${vnfd_name}   ha_proxy_charm-vnf
-${nsd_pkg}   charm-packages/ha_proxy_charm_ns
-${nsd_name}   ha_proxy_charm-ns
-
-# NS instance name and configuration
-${ns_name}   basic_06_charm_test
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   ${EMPTY}
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${action_name}   touch
 ${vnf_member_index_1}   1
 ${vnf_member_index_2}   2
diff --git a/robot-systest/testsuite/basic_07-secure_key_management.robot b/robot-systest/testsuite/basic_07-secure_key_management.robot
index 8d57bb6..081dc3c 100644
--- a/robot-systest/testsuite/basic_07-secure_key_management.robot
+++ b/robot-systest/testsuite/basic_07-secure_key_management.robot
@@ -21,31 +21,22 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_07-secure_key_management_data.py
+
 Force Tags   basic_07   cluster_ee_config   daily   regression   sanity
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/nopasswd_proxy_charm_vnf
-${vnfd_name}   nopasswd_proxy_charm-vnf
-${nsd_pkg}   charm-packages/nopasswd_proxy_charm_ns
-${nsd_name}   nopasswd_proxy_charm-ns
-
-# NS instance name and configuration
-${ns_name}   basic_07_secure_key_management
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${ns_timeout}   15min
-
-# SSH username and passwod
 ${username}   ubuntu
 ${password}   osm4u
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${action_name}   touch
 ${vnf_member_index}   1
 ${day_1_file_name}   /home/ubuntu/first-touch
 ${day_2_file_name}   /home/ubuntu/mytouch1
+${ns_timeout}   15min
 
 
 *** Test Cases ***
diff --git a/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot b/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot
index 7989d98..9b0138b 100644
--- a/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot
+++ b/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot
@@ -22,27 +22,18 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_09-manual_vdu_scaling_data.py
+
 Force Tags   basic_09   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   hackfest_basic_metrics_vnf
-${vnfd_name}   hackfest_basic_metrics-vnf
-${nsd_pkg}   hackfest_basic_metrics_ns
-${nsd_name}   hackfest_basic-ns-metrics
-
-# NS instance name and configuration
-${ns_name}   basic_09_manual_scaling_test
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${scaling_group}   vdu_autoscale
 ${vnf_member_index}  1
 
-# SSH public key file
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-
 
 *** Test Cases ***
 Create Scaling VNF Descriptor
diff --git a/robot-systest/testsuite/basic_11-native_charms.robot b/robot-systest/testsuite/basic_11-native_charms.robot
index be3af67..89f5e63 100644
--- a/robot-systest/testsuite/basic_11-native_charms.robot
+++ b/robot-systest/testsuite/basic_11-native_charms.robot
@@ -21,35 +21,24 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_11-native_charms.py
+
 Force Tags   basic_11   cluster_ee_config   cluster_relations   daily   regression   sanity
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/native_charm_vnf
-${vnfd_name}   native_charm-vnf
-${nsd_pkg}   charm-packages/native_charm_ns
-${nsd_name}   native_charm-ns
-
-# NS instance name and configuration
-${ns_name}   basic_11_native_charms
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${ns_timeout}   15min
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   ${EMPTY}
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${action_name}   touch
 ${vnf_member_index_1}   1
 ${vnf_member_index_2}   2
 ${day_1_file_name}   /home/ubuntu/first-touch
 ${day_2_file_name_1}   /home/ubuntu/mytouch1
 ${day_2_file_name_2}   /home/ubuntu/mytouch2
+${ns_timeout}   15min
 
 
 *** Test Cases ***
diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot
index d1a0ebd..6b94d3a 100644
--- a/robot-systest/testsuite/basic_12-ns_primitives.robot
+++ b/robot-systest/testsuite/basic_12-ns_primitives.robot
@@ -24,28 +24,15 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/packages_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_12-ns_primitives_data.py
+
 Force Tags   basic_12   cluster_ee_config   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg1}   nscharm_policy_vnf
-${vnfd_pkg2}   nscharm_user_vnf
-${vnfd_name1}   nscharm-policy-vnf
-${vnfd_name2}   nscharm-user-vnf
-${nsd_pkg}   nscharm_ns
-${new_nsd_pkg}   new_nscharm_ns
-${nsd_name}   nscharm-ns
-${nsd_file}   nscharm_nsd.yaml
-
-# NS instance name and configuration
-${ns_name}   test_nscharm
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${ns_timeout}   40min
-
-${old_juju_password}   a5611fc6452349cc6e45705d34c501d4
 ${publickey}   ${EMPTY}
 ${success_return_code}   0
 
@@ -71,7 +58,7 @@ Upload Nsd
 
 Instantiate NS
 
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}  ns_launch_max_wait_time=${ns_timeout}
+    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}  ns_launch_max_wait_time=40min
     Set Suite Variable  ${ns_id}  ${id}
 
 # TODO: Check Initial Config Primitives Status
diff --git a/robot-systest/testsuite/basic_13-ns_relations.robot b/robot-systest/testsuite/basic_13-ns_relations.robot
index fe0fe97..50f0851 100644
--- a/robot-systest/testsuite/basic_13-ns_relations.robot
+++ b/robot-systest/testsuite/basic_13-ns_relations.robot
@@ -21,37 +21,24 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_13-ns_relations.py
+
 Force Tags   basic_13    cluster_ee_config   cluster_relations   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg1}   charm-packages/ns_relations_provides_vnf
-${vnfd_pkg2}   charm-packages/ns_relations_requires_vnf
-${vnfd_name1}   ns_relations_provides-vnf
-${vnfd_name2}   ns_relations_requires-vnf
-${nsd_pkg}   charm-packages/ns_relations_ns
-${nsd_name}   ns_relations-ns
-
-# NS instance name and configuration
-${ns_name}   basic_13_ns_relations_test
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${ns_timeout}   15min
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   ${EMPTY}
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${action_name}   touch
 ${vnf_member_index_1}   1
 ${vnf_member_index_2}   2
 ${day_1_file_name}   /home/ubuntu/first-touch
 ${day_2_file_name_1}   /home/ubuntu/mytouch1
 ${day_2_file_name_2}   /home/ubuntu/mytouch2
+${ns_timeout}   15min
 
 
 *** Test Cases ***
diff --git a/robot-systest/testsuite/basic_14-vnf_relations.robot b/robot-systest/testsuite/basic_14-vnf_relations.robot
index 91f4a4d..035612b 100644
--- a/robot-systest/testsuite/basic_14-vnf_relations.robot
+++ b/robot-systest/testsuite/basic_14-vnf_relations.robot
@@ -21,26 +21,25 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_14-vnf_relations.py
+
 Force Tags   basic_14   cluster_ee_config   cluster_relations   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/vnf_relations_vnf
-${vnfd_name}   vnf_relations-vnf
-${nsd_pkg}   charm-packages/vnf_relations_ns
-${nsd_name}   vnf_relations-ns
-
-# NS instance name and configuration
-${ns_name}   basic_14_vnf_relations_test
+${username}   ubuntu
+${password}   ${EMPTY}
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${action_name}   touch
+${vnf_member_index_1}   1
+${vnf_member_index_2}   2
+${day_1_file_name}   /home/ubuntu/first-touch
+${day_2_file_name_1}   /home/ubuntu/mytouch1
+${day_2_file_name_2}   /home/ubuntu/mytouch2
 ${ns_timeout}   15min
 
-# SSH public keys file
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-
 
 *** Test Cases ***
 Create Charm VNF Descriptor
diff --git a/robot-systest/testsuite/basic_15-rbac_configurations.robot b/robot-systest/testsuite/basic_15-rbac_configurations.robot
index 6cc62cc..55e0113 100644
--- a/robot-systest/testsuite/basic_15-rbac_configurations.robot
+++ b/robot-systest/testsuite/basic_15-rbac_configurations.robot
@@ -21,23 +21,16 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/user_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/project_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/role_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_15-rbac_configurations_data.py
+
 Force Tags   basic_15   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# User, project and roles to use
-${user_name}   basic_15_test_user
-${user_password}   basic_15_user_pass
-${user_role}   project_user
-${user_project}   admin
-${project_name}   basic_15_test_project
-${new_project_name}   basic_15_project_test
-${role_name}   test_role
 ${success_return_code}   0
 
-
 *** Test Cases ***
 Create And Validate User
 
diff --git a/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot b/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
index 52d8069..04e9b31 100644
--- a/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
+++ b/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot
@@ -22,30 +22,15 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_16-advanced_onboarding_and_scaling_data.py
+
 Force Tags   basic_16   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   hackfest_basic_metrics_vnf
-${vnfd_name}   hackfest_basic_metrics-vnf
-${nsd_pkg}   hackfest_basic_metrics_ns
-${nsd_name}   hackfest_basic-ns-metrics
-
-# NS instance name and configuration
-${ns_name}   basic_16
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-
-# SSH public keys file
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-
-# Initial, delta, min and max number of VDU instances
-${init_instances}   3
-${min_instances}   3
-${max_instances}   5
-${delta_instances}   2
 ${scaling_group}   vdu_autoscale
 ${vnf_member_index}  1
 
diff --git a/robot-systest/testsuite/basic_17-delete_vnf_package.robot b/robot-systest/testsuite/basic_17-delete_vnf_package.robot
index b6ce774..d61e682 100644
--- a/robot-systest/testsuite/basic_17-delete_vnf_package.robot
+++ b/robot-systest/testsuite/basic_17-delete_vnf_package.robot
@@ -22,19 +22,13 @@ Library   SSHLibrary
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_17-delete_vnf_package_data.py
+
 Force Tags   basic_17   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
-*** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   hackfest_basic_vnf
-${vnfd_name}   hackfest_basic-vnf
-${nsd_pkg}   hackfest_basic_ns
-${nsd_name}   hackfest_basic-ns
-
-
 *** Test Cases ***
 Create VNF Package
 
diff --git a/robot-systest/testsuite/epa_01-epa_sriov.robot b/robot-systest/testsuite/epa_01-epa_sriov.robot
index 8e89641..dec84fa 100644
--- a/robot-systest/testsuite/epa_01-epa_sriov.robot
+++ b/robot-systest/testsuite/epa_01-epa_sriov.robot
@@ -23,31 +23,20 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_01-epa_sriov_data.py
+
 Force Tags   epa_01   cluster_epa   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   hackfest_basic_sriov_vnf
-${vnfd_name}   hackfest_basic_sriov-vnf
-${nsd_pkg}   hackfest_basic_sriov_ns
-${nsd_name}   hackfest_basic_sriov-ns
-
-# NS instance name and configuration
-${ns_name}   epa_01-epa_sriov_test
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${ns_id}   ${EMPTY}
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   osm4u
 ${vnf_member_index}   1
 ${vnf_ip_addr}   ${EMPTY}
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 
 *** Test Cases ***
diff --git a/robot-systest/testsuite/epa_02-additional_capabilities.robot b/robot-systest/testsuite/epa_02-additional_capabilities.robot
index 6a108b3..91b3500 100644
--- a/robot-systest/testsuite/epa_02-additional_capabilities.robot
+++ b/robot-systest/testsuite/epa_02-additional_capabilities.robot
@@ -24,28 +24,18 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_02-additional_capabilities_data.py
+
 Force Tags   epa_02   cluster_epa   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   epa_quota_vnf
-${vnfd_name}   epa_quota-vnf
-${nsd_pkg}   epa_quota_ns
-${nsd_name}   epa_quota-ns
-
-# NS instance name and configuration
-${ns_name}   epa_02-epa_quota_test
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-
-# SSH public keys file
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-
 ${ns_id}   ${EMPTY}
 ${vnf_server_id}   ${EMPTY}
 ${flavor_properties}   ${EMPTY}
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${success_return_code}   0
 
 
diff --git a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
index f88c1c6..3efeb03 100644
--- a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
+++ b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
@@ -25,24 +25,14 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_04-epa_underlay_sriov.py
+
 Force Tags   epa_04   cluster_epa   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   epa_1vm_sriov_vnf
-${vnfd_name}   epa_1vm_sriov-vnf
-${nsd_pkg}   epa_1vm_sriov_ns
-${nsd_name}   epa_1vm_sriov-ns
-${ns_name}   epa_04
-
-# Fixed IPs and subnet for datanet VL
-${datanet_subnet}   192.168.100.0/24
-${datanet_ip1}   192.168.100.11
-${datanet_ip2}   192.168.100.22
-
 ${vnf_member_index_1}   1
 ${vnf_member_index_2}   2
 ${username}   ubuntu
@@ -65,7 +55,7 @@ Create NS Descriptor
 
 Instantiate Network Service
 
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${EMPTY}
+    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
     Set Suite Variable  ${ns_id}  ${id}
 
 
diff --git a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
index ddd4f82..7f0f5c4 100644
--- a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
+++ b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
@@ -33,18 +33,6 @@ Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   epa_1vm_passthrough_vnf
-${vnfd_name}   epa_1vm_passthrough-vnf
-${nsd_pkg}   epa_1vm_passthrough_ns
-${nsd_name}   epa_1vm_passthrough-ns
-${ns_name}   epa_05
-
-# Fixed IPs and subnet for datanet VL
-${datanet_subnet}   192.168.110.0/24
-${datanet_ip1}   192.168.110.11
-${datanet_ip2}   192.168.110.22
-
 ${vnf_member_index_1}   1
 ${vnf_member_index_2}   2
 ${username}   ubuntu
@@ -67,7 +55,7 @@ Create NS Descriptor
 
 Instantiate Network Service
 
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${EMPTY}
+    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
     Set Suite Variable  ${ns_id}  ${id}
 
 
diff --git a/robot-systest/testsuite/hackfest_basic.robot b/robot-systest/testsuite/hackfest_basic.robot
index 5dfacae..41a9d5f 100644
--- a/robot-systest/testsuite/hackfest_basic.robot
+++ b/robot-systest/testsuite/hackfest_basic.robot
@@ -25,32 +25,21 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_basic_ns_data.py
+
 Force Tags   hackfest_basic   cluster_main   daily   regression   sanity
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   hackfest_basic_vnf
-${vnfd_name}   hackfest_basic-vnf
-${nsd_pkg}   hackfest_basic_ns
-${nsd_name}   hackfest_basic-ns
-
-# NS instance name and configuration
-${ns_name}   hfbasic
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
+${ns_id}   ${EMPTY}
 ${username}   ubuntu
 ${password}   ${EMPTY}
-
-${ns_id}   ${EMPTY}
 ${vnf_member_index}   1
 ${vnf_ip_addr}   ${EMPTY}
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+# ${ns_config}   ${EMPTY}
 
 *** Test Cases ***
 Create Hackfest Basic VNF Descriptor
diff --git a/robot-systest/testsuite/hackfest_cloudinit.robot b/robot-systest/testsuite/hackfest_cloudinit.robot
index 389dea7..0836006 100644
--- a/robot-systest/testsuite/hackfest_cloudinit.robot
+++ b/robot-systest/testsuite/hackfest_cloudinit.robot
@@ -25,30 +25,21 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_cloudinit_ns_data.py
+
 Force Tags   hackfest_cloudinit   cluster_main   daily   regression   sanity
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   hackfest_cloudinit_vnf
-${vnfd_name}   hackfest_cloudinit-vnf
-${nsd_pkg}   hackfest_cloudinit_ns
-${nsd_name}   hackfest_cloudinit-ns
-
-# NS instance name and configuration
-${ns_name}   hfcloudinit
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-
-# SSH user and password
+${ns_id}   ${EMPTY}
 ${username}   ubuntu
 ${password}   osm4u
-
-${ns_id}   ${EMPTY}
 ${vnf_member_index}   1
 ${vnf_ip_addr}   ${EMPTY}
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+# ${ns_config}   ${EMPTY}
 
 *** Test Cases ***
 Create Hackfest Cloudinit VNF Descriptor
@@ -77,12 +68,12 @@ Get Vnf Ip Address
 Test SSH Access
 
     Sleep   30s   Waiting ssh daemon to be up
-    Test SSH Connection   ${vnf_ip_addr}   ${username}   ${password}   ${EMPTY}
+    Test SSH Connection   ${vnf_ip_addr}   ${username}   ${password}   ${privatekey}
 
 
 Check Remote File Injected Via Cloud-init
 
-    ${stdout}=   Execute Remote Command Check Rc Return Output   ${vnf_ip_addr}   ${username}   ${password}   ${EMPTY}   sudo cat /root/helloworld.txt
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${vnf_ip_addr}   ${username}   ${password}   ${privatekey}   sudo cat /root/helloworld.txt
     log   ${stdout}
 
 
diff --git a/robot-systest/testsuite/hackfest_multivdu.robot b/robot-systest/testsuite/hackfest_multivdu.robot
index c6bc06a..131c5ac 100644
--- a/robot-systest/testsuite/hackfest_multivdu.robot
+++ b/robot-systest/testsuite/hackfest_multivdu.robot
@@ -25,33 +25,22 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/hackfest_multivdu_ns_data.py
+
 Force Tags   hackfest_multivdu   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   hackfest_multivdu_vnf
-${vnfd_name}   hackfest_multivdu-vnf
-${nsd_pkg}   hackfest_multivdu_ns
-${nsd_name}   hackfest_multivdu-ns
-
-# NS instance name and configuration
-${ns_name}   hfmultivdu
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
+${ns_id}   ${EMPTY}
 ${username}   ubuntu
 ${password}   ${EMPTY}
-
-${ns_id}   ${EMPTY}
 ${vnf_member_index}   1
 ${vnf_ip_addr}   ${EMPTY}
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${wait_guard_for_vm_boot}   50s
-
+# ${ns_config}   ${EMPTY}
 
 *** Test Cases ***
 Create Hackfest multivdu VNF Descriptor
diff --git a/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot b/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot
index 6733c6c..a49bbd3 100644
--- a/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot
+++ b/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot
@@ -27,75 +27,41 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_01-create_k8s_cluster_data.py
+
 Force Tags   k8s_01   cluster_k8s   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package files
-${vnfd_pkg1}   k8s_jujucontroller_vnf.tar.gz
-${vnfd_pkg2}   k8s_jujumachine_vnf.tar.gz
-${nsd_pkg}   k8s_juju_ns.tar.gz
-${vnfd_name1}   k8s_jujucontroller_vnf
-${vnfd_name2}   k8s_jujumachine_vnf
-${nsd_name}   k8s_juju
-
-# VNF Member indexes
-${vnf_member_index_1}   k8s_vnf1
-${vnf_member_index_2}   k8s_vnf2
-${vnf_member_index_3}   k8s_vnf3
-${vnf_member_index_4}   k8s_vnf4
-${vnf_member_index_5}   k8s_juju
-
-# Username
-${username}   ubuntu
-
-# Kubeconfig file
-${kubeconfig_file}   /home/ubuntu/.kube/config
-
-# NS instance name
-${ns_name}   k8s-cluster
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   ${EMPTY}
 
-# Template and config file to use
-${template}   k8s_juju_template.yaml
-${config_file}   config.yaml
-
 
 *** Test Cases ***
 Render a template
 
-    ${stdout}=   Render template   %{ROBOT_DEVOPS_FOLDER}/resources/${template}  %{ROBOT_DEVOPS_FOLDER}/resources/${config_file}  IP_VM1=%{IP_VM1}  IP_VM2=%{IP_VM2}  IP_VM3=%{IP_VM3}  IP_VM4=%{IP_VM4}  IP_JUJU=%{IP_JUJU}  NETWORK=%{VIM_MGMT_NET}
+    ${stdout}=    Render template   %{ROBOT_DEVOPS_FOLDER}/resources/${template}  %{ROBOT_DEVOPS_FOLDER}/resources/${config_file}  IP_VM1=%{IP_VM1}  IP_VM2=%{IP_VM2}  IP_VM3=%{IP_VM3}  IP_VM4=%{IP_VM4}  IP_JUJU=%{IP_JUJU}  NETWORK=%{VIM_MGMT_NET}
     Log To Console  \n${stdout}
 
-
 Create Controller VNF Descriptor
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg1}'
 
-
 Create Machines VNF Descriptor
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg2}'
 
-
 Create K8s Cluster NS Descriptor
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
-
 Instantiate K8s Cluster Network Service
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ns_config=${EMPTY}  publickey=${publickey}  ns_launch_max_wait_time=70min  config_file=%{ROBOT_DEVOPS_FOLDER}/resources/${config_file}  
     Set Suite Variable  ${ns_id}  ${id}
 
-
 Get Management Ip Addresses
 
     ${ip_addr_1}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index_1}
@@ -114,7 +80,6 @@ Get Management Ip Addresses
     log  ${ip_addr_5}
     Set Suite Variable  ${vnf_5_ip_addr}  ${ip_addr_5}
 
-
 Test SSH Access
 
     Variable Should Exist  ${vnf_1_ip_addr}  msg=IP address of the management VNF '${vnf_member_index_1}' is not available
@@ -129,12 +94,10 @@ Test SSH Access
     Test SSH Connection  ${vnf_4_ip_addr}  ${username}  ${password}  ${privatekey}
     Test SSH Connection  ${vnf_5_ip_addr}  ${username}  ${password}  ${privatekey}
 
-
 Check kubeconfig file
 
     Check If remote File Exists  ${vnf_5_ip_addr}  ${username}  ${password}  ${privatekey}  ${kubeconfig_file}
 
-
 Delete NS Instance
     [Tags]   cleanup
 
diff --git a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
index f399835..f0b5eae 100644
--- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
+++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot
@@ -22,28 +22,22 @@ Library   Process
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_02-k8scluster_creation_data.py
+
 Force Tags   k8s_02   cluster_k8s   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
-*** Variables ***
-# K8s cluster name and version
-${k8scluster_name}   k8s-test
-${k8scluster_version}   v1
-
 *** Test Cases ***
 Add K8s Cluster To OSM
-
     Create K8s Cluster  %{K8S_CREDENTIALS}  ${k8scluster_version}  %{VIM_TARGET}  %{VIM_MGMT_NET}  ${k8scluster_name}
 
 Remove K8s Cluster from OSM
     [Tags]   cleanup
-
     Delete K8s Cluster  ${k8scluster_name}
 
 *** Keywords ***
 Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting K8s Cluster
-
     Run Keyword If Any Tests Failed  Delete K8s Cluster  ${k8scluster_name}
diff --git a/robot-systest/testsuite/k8s_03-simple_k8s.robot b/robot-systest/testsuite/k8s_03-simple_k8s.robot
index e308d16..d235f7e 100644
--- a/robot-systest/testsuite/k8s_03-simple_k8s.robot
+++ b/robot-systest/testsuite/k8s_03-simple_k8s.robot
@@ -28,27 +28,16 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_03-simple_k8s_data.py
+
 Force Tags   k8s_03   cluster_k8s   daily   regression   sanity
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# K8s cluster name and version
-${k8scluster_name}   k8s-test
-${k8scluster_version}   v1
-
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/native_k8s_charm_vnf
-${vnfd_name}   native_k8s_charm-vnf
-${nsd_pkg}   charm-packages/native_k8s_charm_ns
-${nsd_name}   native_k8s_charm-ns
-
-# NS instance name and configuration
-${ns_name}   native-k8s
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-
 ${ns_id}   ${EMPTY}
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${publickey}   ${EMPTY}
 ${vnf_member_index}   native_k8s_charm-vnf
 ${action_name}   changecontent
diff --git a/robot-systest/testsuite/k8s_04-openldap_helm.robot b/robot-systest/testsuite/k8s_04-openldap_helm.robot
index efc9928..d5bac76 100644
--- a/robot-systest/testsuite/k8s_04-openldap_helm.robot
+++ b/robot-systest/testsuite/k8s_04-openldap_helm.robot
@@ -25,27 +25,16 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_04-openldap_helm_data.py
+
 Force Tags   k8s_04   cluster_k8s   daily   regression   sanity
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# K8s cluster name and version
-${k8scluster_name}   k8s-test
-${k8scluster_version}   v1
-
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   openldap_knf
-${vnfd_name}   openldap_knf
-${nsd_pkg}   openldap_ns
-${nsd_name}   openldap_ns
-
-# NS instance name and configuration
-${ns_name}   ldap
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-
 ${ns_id}   ${EMPTY}
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${publickey}   ${EMPTY}
 ${vnf_member_index}   openldap
 ${kdu_name}   ldap
diff --git a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
index 5ea838a..a32ad66 100644
--- a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
+++ b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot
@@ -21,35 +21,24 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_05-k8s_proxy_charms.py
+
 Force Tags   k8s_05   cluster_ee_config   cluster_k8s_charms   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/k8s_proxy_charm_vnf
-${vnfd_name}   k8s_proxy_charm-vnf
-${nsd_pkg}   charm-packages/k8s_proxy_charm_ns
-${nsd_name}   k8s_proxy_charm-ns
-
-# NS instance name and configuration
-${ns_name}   k8s_05-k8s_proxy_charm
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${ns_timeout}   15min
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   ${EMPTY}
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${action_name}   touch
 ${vnf_member_index_1}   1
 ${vnf_member_index_2}   2
 ${day_1_file_name}   /home/ubuntu/first-touch
 ${day_2_file_name_1}   /home/ubuntu/mytouch1
 ${day_2_file_name_2}   /home/ubuntu/mytouch2
+${ns_timeout}   15min
 
 
 *** Test Cases ***
diff --git a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
index 3bbe5b0..d12153d 100644
--- a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
+++ b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot
@@ -21,29 +21,17 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_06-k8s_secure_key_management_data.py
+
 Force Tags   k8s_06   cluster_ee_config   cluster_k8s_charms   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/nopasswd_k8s_proxy_charm_vnf
-${vnfd_name}   nopasswd_k8s_proxy_charm-vnf
-${nsd_pkg}   charm-packages/nopasswd_k8s_proxy_charm_ns
-${nsd_name}   nopasswd_k8s_proxy_charm-ns
-
-# NS instance name and configuration
-${ns_name}   k8s_06-nopasswd_k8s_proxy_charm
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${ns_timeout}   15min
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   ${EMPTY}
-
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${action_name}   touch
 ${vnf_member_index_1}   1
 ${vnf_member_index_2}   2
diff --git a/robot-systest/testsuite/k8s_07-dummy_helm.robot b/robot-systest/testsuite/k8s_07-dummy_helm.robot
index 8669f07..811d14d 100644
--- a/robot-systest/testsuite/k8s_07-dummy_helm.robot
+++ b/robot-systest/testsuite/k8s_07-dummy_helm.robot
@@ -26,39 +26,18 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_07-dummy_helm_data.py
+
 Force Tags   k8s_07   cluster_k8s   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# VIM Configuration
-${vim_name}   k8s07_dummy
-${vim_user}   user
-${vim_password}   pass
-${vim_auth_url}   http://localhost/dummy
-${vim_tenant}   tenant
-${vim_account_type}   dummy
-
-# K8s cluster data
-${k8scluster_name}   k8s07
-${k8scluster_version}   v1
-${k8scluster_net}   null
-
-# NS and VNF descriptor package files
-${vnfd_pkg}   openldap_knf
-${nsd_pkg}   openldap_ns
-${vnfd_name}   openldap_knf
-${nsd_name}   openldap_ns
-
-# NS instance name
-${ns_name}   ldap
-
 ${ns_id}   ${EMPTY}
 ${ns_config}   ${EMPTY}
 ${publickey}   ${EMPTY}
 
-
 *** Test Cases ***
 Create Package For OpenLDAP CNF
     Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
diff --git a/robot-systest/testsuite/quotas_01-quota_enforcement.robot b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
index c0a5043..339607d 100644
--- a/robot-systest/testsuite/quotas_01-quota_enforcement.robot
+++ b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
@@ -19,30 +19,19 @@ Library   Collections
 
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/project_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/quotas_01-quota_enforcement_data.py
+
 Force Tags   quotas_01   cluster_main   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# VNFD package to use during test
-${vnfd_name}   hackfest_basic_vnf
-${vnfd_pkg}   %{PACKAGES_FOLDER}/${vnfd_name}
-
-# Project names and quotas to use
-${project_1_name}   quotas_01_proj_1
-${project_2_name}   quotas_01_proj_2
-${project_3_name}   quotas_01_proj_3
+${success_return_code}   0
 ${project_1_quotas}   vnfds=1,nsds=2,ns_instances=3
 ${project_2_quotas}   vnfds=1,nsds=1,ns_instances=1
 ${project_3_quotas}   vnfds=5,nsds=,ns_instances=
-
-# User name and password for project
-${user_name}   quotas_01_user
-${user_password}   quotas_01_pass
-
-${success_return_code}   0
-
+${vnfd_pkg}   %{PACKAGES_FOLDER}/${vnfd_name}
 
 *** Test Cases ***
 Create First Project With Quotas
diff --git a/robot-systest/testsuite/slice_01-network_slicing.robot b/robot-systest/testsuite/slice_01-network_slicing.robot
index d9c8d59..5831e36 100644
--- a/robot-systest/testsuite/slice_01-network_slicing.robot
+++ b/robot-systest/testsuite/slice_01-network_slicing.robot
@@ -30,44 +30,25 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/slice_01-network_slicing_data.py
+
 Force Tags   slice_01   cluster_slices   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
-# NS and VNF descriptor package files
-${vnfd1_pkg}   slice_basic_vnf
-${vnfd2_pkg}   slice_basic_middle_vnf
-${nsd1_pkg}   slice_basic_ns
-${nsd2_pkg}   slice_basic_middle_ns
-${nst}   slice_basic_nst/slice_basic_nst.yaml
-
-# Descriptor names
-${nst_name}   slice_basic_nst
-${vnfd1_name}   slice_basic_vnf
-${vnfd2_name}   slice_basic_middle_vnf
-${nsd1_name}   slice_basic_ns
-${nsd2_name}   slice_basic_middle_ns
-
-# Instance names
-${slice_name}   slicebasic
-${middle_ns_name}   slicebasic.slice_basic_nsd_2
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
-${username}   ubuntu
-${password}   ${EMPTY}
 
 ${ns_id}   ${EMPTY}
+${username}   ubuntu
+${password}   ${EMPTY}
 ${vnf_member_index}   middle
 ${vnf_ip_addr}   ${EMPTY}
 ${mgmt_vnf_ip}   ${EMPTY}
 ${nst_config}   {netslice-vld: [ {name: slice_vld_mgmt, vim-network-name: %{VIM_MGMT_NET}} ] }
 
-
 *** Test Cases ***
+
 Create Slice VNF Descriptors
     [Documentation]   Onboards all the VNFDs required for the test: vnfd1_pkg and vnfd2_pkg (in the variables file)
 
diff --git a/robot-systest/testsuite/slice_02-shared_network_slicing.robot b/robot-systest/testsuite/slice_02-shared_network_slicing.robot
index 0595480..7b9408c 100644
--- a/robot-systest/testsuite/slice_02-shared_network_slicing.robot
+++ b/robot-systest/testsuite/slice_02-shared_network_slicing.robot
@@ -29,6 +29,8 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/connectivity_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
+Variables   %{ROBOT_DEVOPS_FOLDER}/resources/slice_02-shared_network_slicing_data.py
+
 Force Tags   slice_02   cluster_slices   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
@@ -36,40 +38,16 @@ Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 *** Variables ***
 
-# NS and VNF descriptor package files
-${vnfd1_pkg}   slice_basic_vnf
-${vnfd2_pkg}   slice_basic_middle_vnf
-${nsd1_pkg}   slice_basic_ns
-${nsd2_pkg}   slice_basic_middle_ns
-${nst}   slice_basic_nst/slice_basic_nst.yaml
-${nst2}   slice_basic_nst/slice_basic_2nd_nst.yaml
-
-# Instance names
-${slice_name}   slicebasic
-${slice2_name}   sliceshared
-${middle_ns_name}   slicebasic.slice_basic_nsd_2
-
-# Descriptor names
-${nst_name}   slice_basic_nst
-${nst2_name}   slice_basic_nst2
-${vnfd1_name}   slice_basic_vnf
-${vnfd2_name}   slice_basic_middle_vnf
-${nsd1_name}   slice_basic_ns
-${nsd2_name}   slice_basic_middle_ns
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
+${ns_id}   ${EMPTY}
 ${username}   ubuntu
 ${password}   ${EMPTY}
-
-${ns_id}   ${EMPTY}
 ${vnf_member_index}   middle
 ${vnf_ip_addr}   ${EMPTY}
 ${nst_config}   {netslice-vld: [ {name: slice_vld_mgmt, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 
 *** Test Cases ***
+
 Create Slice VNF Descriptors
     [Documentation]   Onboards all the VNFDs required for the test: vnfd1_pkg and vnfd2_pkg (in the variables file)