From ae08f5b745b7a708883e7f9c550ffcf70128603b Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 8 Apr 2021 21:29:13 +0200 Subject: [PATCH 01/16] Remove home variable in all test resources where not used Change-Id: Ic2cf0de85bcead71c81bc878a09b6c58a04c597b Signed-off-by: garciadeblas --- .../basic_05-instantiation_parameters_in_cloud_init_data.py | 2 -- robot-systest/resources/basic_07-secure_key_management_data.py | 2 -- robot-systest/resources/basic_15-rbac_configurations_data.py | 2 -- robot-systest/resources/quotas_01-quota_enforcement_data.py | 2 -- .../resources/sa_08-vnf_with_vnf_indicators_snmp_data.py | 2 -- 5 files changed, 10 deletions(-) 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 index d4e5312..4505d7e 100644 --- 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 @@ -12,8 +12,6 @@ from pathlib import Path -# Get ${HOME} from local machine -home = str(Path.home()) # NS and VNF descriptor package folder vnfd_pkg = 'ubuntu_cloudinit_vnf' nsd_pkg = 'ubuntu_cloudinit_ns' diff --git a/robot-systest/resources/basic_07-secure_key_management_data.py b/robot-systest/resources/basic_07-secure_key_management_data.py index c1621fd..bc1ee4d 100644 --- a/robot-systest/resources/basic_07-secure_key_management_data.py +++ b/robot-systest/resources/basic_07-secure_key_management_data.py @@ -12,8 +12,6 @@ from pathlib import Path -# Get ${HOME} from local machine -home = str(Path.home()) # NS and VNF descriptor package folder vnfd_pkg = 'charm-packages/nopasswd_proxy_charm_vnf' nsd_pkg = 'charm-packages/nopasswd_proxy_charm_ns' diff --git a/robot-systest/resources/basic_15-rbac_configurations_data.py b/robot-systest/resources/basic_15-rbac_configurations_data.py index 684ac24..094ba20 100644 --- a/robot-systest/resources/basic_15-rbac_configurations_data.py +++ b/robot-systest/resources/basic_15-rbac_configurations_data.py @@ -12,8 +12,6 @@ from pathlib import Path -# Get ${HOME} from local machine -home = str(Path.home()) # User, project and roles to use user_name = 'basic_15_test_user' user_password = 'basic_15_user_pass' diff --git a/robot-systest/resources/quotas_01-quota_enforcement_data.py b/robot-systest/resources/quotas_01-quota_enforcement_data.py index 90bf709..abf6a13 100644 --- a/robot-systest/resources/quotas_01-quota_enforcement_data.py +++ b/robot-systest/resources/quotas_01-quota_enforcement_data.py @@ -12,8 +12,6 @@ from pathlib import Path -# Get ${HOME} from local machine -home = str(Path.home()) # VNFD package to use during test vnfd_name = 'hackfest_basic_vnf' # Project names to use diff --git a/robot-systest/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py b/robot-systest/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py index d9e6d1e..36dabdb 100644 --- a/robot-systest/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py +++ b/robot-systest/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py @@ -23,8 +23,6 @@ metric_1_name = 'ifInOctets' metric_1_filter = 'ifIndex=1' metric_2_name = 'ifMtu' metric_2_filter = 'ifIndex=2' -# Get ${HOME} from local machine -home = str(Path.home()) # NS and VNF descriptor package folder vnfd_pkg = 'snmp_ee_vnf' nsd_pkg = 'snmp_ee_ns' -- 2.25.1 From 0022d243adb7675d0c1a6511c59ff867f61d7a2a Mon Sep 17 00:00:00 2001 From: beierlm Date: Tue, 13 Apr 2021 17:01:09 -0400 Subject: [PATCH 02/16] Strip quotes Strips quotes from output Change-Id: I19e2e9e5b5ab13d2c2e4c48f4e88b1921464051c Signed-off-by: beierlm --- robot-systest/lib/ns_lib.robot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot index 8cb6098..b926f84 100644 --- a/robot-systest/lib/ns_lib.robot +++ b/robot-systest/lib/ns_lib.robot @@ -232,7 +232,7 @@ Check For NS Operation Completed [Arguments] ${ns_operation_id} - ${rc} ${stdout}= Run and Return RC and Output osm ns-op-show ${ns_operation_id} --literal | yq .operationState + ${rc} ${stdout}= Run and Return RC and Output osm ns-op-show ${ns_operation_id} --literal | yq .operationState | tr -d \" log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} Should Contain ${stdout} COMPLETED msg=Timeout waiting for ns-action with id ${ns_operation_id} values=False @@ -254,7 +254,7 @@ Get Vnf Vdur Names [Arguments] ${vnf_id} - ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq .vdur[].name + ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq .vdur[].name | tr -d \" Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False @{vdur} = Split String ${stdout} [Return] @{vdur} @@ -265,7 +265,7 @@ Get Vnf Kdu Replica Count [Arguments] ${vnf_id} ${kdu_name} - ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --kdu ${kdu_name} | yq .config.replicaCount + ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --kdu ${kdu_name} | yq .config.replicaCount | tr -d \" Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False [Return] ${stdout} -- 2.25.1 From dcd7307b844743f304bcf8720406ea740a66fd2a Mon Sep 17 00:00:00 2001 From: beierlm Date: Wed, 14 Apr 2021 05:38:04 -0400 Subject: [PATCH 03/16] Fixing typo in tr command Need to double the backslash in Robot Change-Id: Ib2719a2f76f469162c1a6a7fabe86fbe5e973348 Signed-off-by: beierlm --- robot-systest/lib/ns_lib.robot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot index b926f84..bc92910 100644 --- a/robot-systest/lib/ns_lib.robot +++ b/robot-systest/lib/ns_lib.robot @@ -232,7 +232,7 @@ Check For NS Operation Completed [Arguments] ${ns_operation_id} - ${rc} ${stdout}= Run and Return RC and Output osm ns-op-show ${ns_operation_id} --literal | yq .operationState | tr -d \" + ${rc} ${stdout}= Run and Return RC and Output osm ns-op-show ${ns_operation_id} --literal | yq .operationState | tr -d \\" log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} Should Contain ${stdout} COMPLETED msg=Timeout waiting for ns-action with id ${ns_operation_id} values=False @@ -254,7 +254,7 @@ Get Vnf Vdur Names [Arguments] ${vnf_id} - ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq .vdur[].name | tr -d \" + ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --literal | yq .vdur[].name | tr -d \\" Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False @{vdur} = Split String ${stdout} [Return] @{vdur} @@ -265,7 +265,7 @@ Get Vnf Kdu Replica Count [Arguments] ${vnf_id} ${kdu_name} - ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --kdu ${kdu_name} | yq .config.replicaCount | tr -d \" + ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --kdu ${kdu_name} | yq .config.replicaCount | tr -d \\" Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False [Return] ${stdout} -- 2.25.1 From 316f7ef1fee3eda5ee8c39c8d63232e562f32421 Mon Sep 17 00:00:00 2001 From: aguilarherna Date: Thu, 15 Apr 2021 15:42:44 +0000 Subject: [PATCH 04/16] Fixes bug related to new version of yq Change-Id: Ia4d7cad2dea93ad61dab6893342a885140138c8e Signed-off-by: aguilarherna --- robot-systest/lib/ns_lib.robot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot index bc92910..ed6e699 100644 --- a/robot-systest/lib/ns_lib.robot +++ b/robot-systest/lib/ns_lib.robot @@ -267,5 +267,6 @@ Get Vnf Kdu Replica Count ${rc} ${stdout}= Run and Return RC and Output osm vnf-show ${vnf_id} --kdu ${kdu_name} | yq .config.replicaCount | tr -d \\" Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False - [Return] ${stdout} + ${return} = Set Variable If '${stdout}' == 'null' ${EMPTY} ${stdout} + [Return] ${return} -- 2.25.1 From 8a4366fcf7e6a449f7612591cd5707211db2bc34 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 15 Apr 2021 15:27:40 +0200 Subject: [PATCH 05/16] Update wrong tags in basic_07 k8s_01 and epa_05 All the testsuites were updated to follow an agreed schema. However, there were errors in that process, and basic_07, k8s_01 and epa_05 were wrongly tagged. This change updates the wrong tags: - The tags on each test of testsuite basic_07 have been removed. Only the general testsuite param "Force Tags" has been kept, and the cleanup tag. - The tag daily has been removed in testsuite k8s_01 - A typo in epa_05 has been fixed Change-Id: I9a444ceaf60ccb6fb6c9031a2a135ec29e35af4f Signed-off-by: garciadeblas --- .../testsuite/basic_07-secure_key_management.robot | 14 +++----------- .../epa_05-epa_underlay_passthrough.robot | 2 +- .../testsuite/k8s_01-create_k8s_cluster.robot | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/robot-systest/testsuite/basic_07-secure_key_management.robot b/robot-systest/testsuite/basic_07-secure_key_management.robot index 9ef5da3..081dc3c 100644 --- a/robot-systest/testsuite/basic_07-secure_key_management.robot +++ b/robot-systest/testsuite/basic_07-secure_key_management.robot @@ -41,26 +41,22 @@ ${ns_timeout} 15min *** Test Cases *** Create Nopasswd Charm VNF Descriptor - [Tags] nopasswd charm sanity regression Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg}' Create Nopasswd Charm NS Descriptor - [Tags] nopasswd charm sanity regression Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}' Instantiate Nopasswd Charm Network Service - [Tags] nopasswd charm sanity regression ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${EMPTY} ${ns_timeout} Set Suite Variable ${ns_id} ${id} Get Management Ip Addresses - [Tags] nopasswd charm sanity regression ${ip_addr} Get Vnf Management Ip Address ${ns_id} ${vnf_member_index} log ${ip_addr} @@ -68,7 +64,6 @@ Get Management Ip Addresses Test SSH Access - [Tags] nopasswd charm sanity regression Variable Should Exist ${vnf_ip_addr} msg=IP address of the management VNF is not available Sleep 30s Waiting ssh daemon to be up @@ -78,14 +73,12 @@ Test SSH Access Check Remote Files Created Via Day 1 Operations [Documentation] The Nopasswd VNF has a Day 1 operation that creates a file named ${day_1_file_name} and performs it without password. ... This test checks whether that files have been created or not. - [Tags] nopasswd charm sanity regression Check If remote File Exists ${vnf_ip_addr} ${username} ${password} ${EMPTY} ${day_1_file_name} Execute Day 2 Operations [Documentation] Performs one Day 2 operation that creates a new file, this action is executed without password too. - [Tags] nopasswd charm sanity regression Variable Should Exist ${ns_id} msg=Network service instance is not available ${ns_op_id}= Execute NS Action ${ns_name} ${action_name} ${vnf_member_index} filename=${day_2_file_name} @@ -93,25 +86,24 @@ Execute Day 2 Operations Check Remote Files Created Via Day 2 Operations [Documentation] Check whether the file created in the previous test via Day 2 operation exists or not. - [Tags] nopasswd charm sanity regression Check If remote File Exists ${vnf_ip_addr} ${username} ${password} ${EMPTY} ${day_2_file_name} Delete NS Instance - [Tags] nopasswd charm sanity regression cleanup + [Tags] cleanup Delete NS ${ns_name} Delete NS Descriptor - [Tags] nopasswd charm sanity regression cleanup + [Tags] cleanup Delete NSD ${nsd_name} Delete VNF Descriptor - [Tags] nopasswd charm sanity regression cleanup + [Tags] cleanup Delete VNFD ${vnfd_name} diff --git a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot index 7a579bf..8ee32e8 100644 --- a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot +++ b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot @@ -27,7 +27,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/epa_05-epa_underlay_passthrough.py -Force Tags epa_05 cluster_epa daily regresssion +Force Tags epa_05 cluster_epa daily regression Suite Teardown Run Keyword And Ignore Error Suite Cleanup diff --git a/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot b/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot index ade1d70..a49bbd3 100644 --- a/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot +++ b/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot @@ -29,7 +29,7 @@ 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 daily regression +Force Tags k8s_01 cluster_k8s regression Suite Teardown Run Keyword And Ignore Error Suite Cleanup -- 2.25.1 From f8ea4a6f300025c5f99503f517b12b0a498c67f2 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Sun, 18 Apr 2021 23:08:17 +0200 Subject: [PATCH 06/16] Fix failure return code when deleting VNFD fails Change-Id: I8ad00b2ae34248dd2649d0fbc66f9af3b004eea4 Signed-off-by: garciadeblas --- robot-systest/lib/vnfd_lib.robot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/robot-systest/lib/vnfd_lib.robot b/robot-systest/lib/vnfd_lib.robot index 1d57598..f1cc95e 100644 --- a/robot-systest/lib/vnfd_lib.robot +++ b/robot-systest/lib/vnfd_lib.robot @@ -28,7 +28,7 @@ Library String *** Variables *** ${success_return_code} 0 -${failure_return_code} 0 +${failure_return_code} 1 ${delete_max_wait_time} 1min ${delete_pol_time} 15sec @@ -118,7 +118,7 @@ Assert Failure Delete VNFD ${rc} ${stdout}= Run and Return RC and Output osm vnfpkg-delete ${vnfd_id} log ${stdout} Should Be Equal As Integers ${rc} ${failure_return_code} - Should Contain ${stdout} 409 msg=Expected Conflict values=False + Should Contain ${stdout} 409 msg=Expected Conflict values=False WAIT UNTIL KEYWORD SUCCEEDS ${delete_max_wait_time} ${delete_pol_time} Check For VNFD ${vnfd_id} True -- 2.25.1 From 23a917accb8877bd12d18fc9e24d02545c461064 Mon Sep 17 00:00:00 2001 From: beierlm Date: Thu, 22 Apr 2021 13:01:21 -0400 Subject: [PATCH 07/16] Including upstream requirements Now that internal OSM software does not specify python modules in setup.py, we need to include the requirements.txt from the module in the requirements-dev.in to generate the full list properly. Change-Id: I1b9660bb3e6d22eb199757f6c90e4fdeef0c707c Signed-off-by: beierlm --- requirements-dev.in | 3 ++ requirements-dev.txt | 75 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/requirements-dev.in b/requirements-dev.in index 794b302..dc09a5e 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -14,4 +14,7 @@ # limitations under the License. git+https://osm.etsi.org/gerrit/osm/IM.git@master#egg=osm-im +-r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + git+https://osm.etsi.org/gerrit/osm/osmclient.git@master#egg=osm-osmclient +-r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master diff --git a/requirements-dev.txt b/requirements-dev.txt index 40609b1..a16fb90 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,82 @@ +bitarray==1.8.1 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +certifi==2020.12.5 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # requests +chardet==4.0.0 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # requests +click==7.1.2 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +enum34==1.1.10 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +idna==2.10 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # requests +jinja2==2.11.3 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +lxml==4.6.3 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyang + # pyangbind +markupsafe==1.1.1 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # jinja2 git+https://osm.etsi.org/gerrit/osm/IM.git@master#egg=osm-im # via -r requirements-dev.in git+https://osm.etsi.org/gerrit/osm/osmclient.git@master#egg=osm-osmclient # via -r requirements-dev.in +packaging==20.9 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +prettytable==2.1.0 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +pyang==2.4.0 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +pyangbind==0.8.1 + # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master +pycurl==7.43.0.6 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +pyparsing==2.4.7 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # packaging +python-magic==0.4.22 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +pyyaml==5.4.1 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +regex==2021.3.17 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +requests==2.25.1 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +six==1.15.0 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # pyangbind +urllib3==1.26.4 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # requests +verboselogs==1.7 + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +wcwidth==0.2.5 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # prettytable ####################################################################################### # Copyright ETSI Contributors and Others. # -- 2.25.1 From 4de90962337dd5cfdec6735e6a568c6ebc5fa646 Mon Sep 17 00:00:00 2001 From: aguilarherna Date: Tue, 27 Apr 2021 09:44:27 +0000 Subject: [PATCH 08/16] Fix bug 1478: JUJU password is replaced in a copy of the NS package Change-Id: Ic8e75d661a8377db8f7e7cf0519fcac95b62739f Signed-off-by: aguilarherna --- .../resources/basic_12-ns_primitives_data.py | 1 + .../testsuite/basic_12-ns_primitives.robot | 26 ++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/robot-systest/resources/basic_12-ns_primitives_data.py b/robot-systest/resources/basic_12-ns_primitives_data.py index 7a91f2e..1b92b5a 100644 --- a/robot-systest/resources/basic_12-ns_primitives_data.py +++ b/robot-systest/resources/basic_12-ns_primitives_data.py @@ -20,6 +20,7 @@ home = str(Path.home()) 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' diff --git a/robot-systest/testsuite/basic_12-ns_primitives.robot b/robot-systest/testsuite/basic_12-ns_primitives.robot index e4113e7..6b94d3a 100644 --- a/robot-systest/testsuite/basic_12-ns_primitives.robot +++ b/robot-systest/testsuite/basic_12-ns_primitives.robot @@ -34,15 +34,18 @@ Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** ${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] } ${publickey} ${EMPTY} +${success_return_code} 0 + *** Test Cases *** Change Juju Password - [Documentation] NS package needs to be updated with the Juju credentials for your OSM installation - ${nsd_yaml}= Get File %{PACKAGES_FOLDER}/${nsd_pkg}/${nsd_file} + ${rc} ${stdout}= Run and Return RC and Output cp -r '%{PACKAGES_FOLDER}/${nsd_pkg}' '%{PACKAGES_FOLDER}/${new_nsd_pkg}' + Should Be Equal As Integers ${rc} ${success_return_code} + ${nsd_yaml}= Get File %{PACKAGES_FOLDER}/${new_nsd_pkg}/${nsd_file} ${changed_nsd_yaml}= Replace String ${nsd_yaml} ${old_juju_password} %{JUJU_PASSWORD} - Create File %{PACKAGES_FOLDER}/${nsd_pkg}/${nsd_file} ${changed_nsd_yaml} + Create File %{PACKAGES_FOLDER}/${new_nsd_pkg}/${nsd_file} ${changed_nsd_yaml} Upload Vnfds @@ -51,7 +54,7 @@ Upload Vnfds Upload Nsd - Create NSD %{PACKAGES_FOLDER}/${nsd_pkg}/ + Create NSD %{PACKAGES_FOLDER}/${new_nsd_pkg}/ Instantiate NS @@ -61,19 +64,17 @@ Instantiate NS # TODO: Check Initial Config Primitives Status Delete NS - [Tags] cleanup Delete NS ${ns_name} Delete NS Descriptor - [Tags] cleanup Delete NSD ${nsd_name} + Delete Temporary Descriptor Folder '%{PACKAGES_FOLDER}/${new_nsd_pkg}' Delete VNF Descriptors - [Tags] cleanup Delete VNFD ${vnfd_name1} @@ -88,3 +89,14 @@ Suite Cleanup Run Keyword If Any Tests Failed Delete NSD ${nsd_name} Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name1} Run Keyword If Any Tests Failed Delete VNFD ${vnfd_name2} + Delete Temporary Descriptor Folder '%{PACKAGES_FOLDER}/${new_nsd_pkg}' + + +Delete Temporary Descriptor Folder + [Documentation] Removes the temporary package folder created for the test + [Arguments] ${folder_name} + + ${rc} ${stdout}= Run and Return RC and Output rm -rf '${folder_name}' + log ${stdout} + + -- 2.25.1 From 7f1bdbc10b5114ae93efff0c562ee7eaee6053f0 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 27 Apr 2021 10:21:57 +0200 Subject: [PATCH 09/16] Add sanity tag to hackfest_basic and hackfest_cloudinit Change-Id: Iba2ccfa3d3cc081e2e771a712ddb63507ea8678c Signed-off-by: garciadeblas --- robot-systest/testsuite/hackfest_basic.robot | 2 +- robot-systest/testsuite/hackfest_cloudinit.robot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/robot-systest/testsuite/hackfest_basic.robot b/robot-systest/testsuite/hackfest_basic.robot index f721ef7..41a9d5f 100644 --- a/robot-systest/testsuite/hackfest_basic.robot +++ b/robot-systest/testsuite/hackfest_basic.robot @@ -27,7 +27,7 @@ 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 +Force Tags hackfest_basic cluster_main daily regression sanity Suite Teardown Run Keyword And Ignore Error Suite Cleanup diff --git a/robot-systest/testsuite/hackfest_cloudinit.robot b/robot-systest/testsuite/hackfest_cloudinit.robot index 52d6e4e..0836006 100644 --- a/robot-systest/testsuite/hackfest_cloudinit.robot +++ b/robot-systest/testsuite/hackfest_cloudinit.robot @@ -27,7 +27,7 @@ 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 +Force Tags hackfest_cloudinit cluster_main daily regression sanity Suite Teardown Run Keyword And Ignore Error Suite Cleanup -- 2.25.1 From 3f1844f55c6a9c832b78b92efbc2332244d23944 Mon Sep 17 00:00:00 2001 From: beierlm Date: Wed, 12 May 2021 04:48:23 -0400 Subject: [PATCH 10/16] Remove EPA 05 from Daily EPA 05 cannot pass in the current ETSI VIM, so it is being removed from the daily and regression suites. It is still possible to run it via the epa_05 or cliuster_epa suite. Change-Id: I61fc262556836d5f7b5af7eddd1164286e4dfea3 Signed-off-by: beierlm --- robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot index 8ee32e8..7f0f5c4 100644 --- a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot +++ b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot @@ -27,7 +27,7 @@ Resource %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot Variables %{ROBOT_DEVOPS_FOLDER}/resources/epa_05-epa_underlay_passthrough.py -Force Tags epa_05 cluster_epa daily regression +Force Tags epa_05 cluster_epa Suite Teardown Run Keyword And Ignore Error Suite Cleanup -- 2.25.1 From 576487e73575ad72071aa5680b8d17b2d8ff8027 Mon Sep 17 00:00:00 2001 From: aguilarherna Date: Wed, 5 May 2021 15:47:11 +0000 Subject: [PATCH 11/16] Modified testsuites to remove resource files Moved variables from resource file to .robot file (where possible) and removed first one. Change-Id: I4d71b33d738e1c4ae3835581f462d6a6975d66a8 Signed-off-by: aguilarherna --- ...antiation_parameters_in_cloud_init_data.py | 22 ---------- .../resources/basic_06-vnf_with_charm_data.py | 27 ------------ .../basic_07-secure_key_management_data.py | 22 ---------- .../basic_09-manual_vdu_scaling_data.py | 27 ------------ .../resources/basic_11-native_charms.py | 27 ------------ .../resources/basic_12-ns_primitives_data.py | 36 ---------------- .../resources/basic_13-ns_relations.py | 29 ------------- .../resources/basic_14-vnf_relations.py | 27 ------------ .../basic_15-rbac_configurations_data.py | 22 ---------- ...16-advanced_onboarding_and_scaling_data.py | 33 -------------- .../basic_17-delete_vnf_package_data.py | 21 --------- .../resources/epa_01-epa_sriov_data.py | 27 ------------ .../epa_02-additional_capabilities_data.py | 27 ------------ .../resources/epa_04-epa_underlay_sriov.py | 31 ------------- .../epa_05-epa_underlay_passthrough.py | 32 -------------- .../resources/hackfest_basic_ns_data.py | 27 ------------ .../resources/hackfest_cloudinit_ns_data.py | 27 ------------ .../resources/hackfest_multivdu_ns_data.py | 27 ------------ .../k8s_01-create_k8s_cluster_data.py | 43 ------------------- .../k8s_02-k8scluster_creation_data.py | 24 ----------- .../resources/k8s_03-simple_k8s_data.py | 30 ------------- .../resources/k8s_04-openldap_helm_data.py | 30 ------------- .../resources/k8s_05-k8s_proxy_charms.py | 27 ------------ .../k8s_06-k8s_secure_key_management_data.py | 27 ------------ .../resources/k8s_07-dummy_helm_data.py | 42 ------------------ .../quotas_01-quota_enforcement_data.py | 23 ---------- .../slice_01-network_slicing_data.py | 37 ---------------- .../slice_02-shared_network_slicing_data.py | 40 ----------------- .../resources/slice_02-shared_ns_data.py | 39 ----------------- ...stantiation_parameters_in_cloud_init.robot | 16 +++++-- .../testsuite/basic_06-vnf_with_charm.robot | 17 ++++++-- .../basic_07-secure_key_management.robot | 17 ++++++-- .../basic_09-manual_vdu_scaling.robot | 13 +++++- .../testsuite/basic_11-native_charms.robot | 19 ++++++-- .../testsuite/basic_12-ns_primitives.robot | 19 ++++++-- .../testsuite/basic_13-ns_relations.robot | 21 +++++++-- .../testsuite/basic_14-vnf_relations.robot | 21 ++++----- .../basic_15-rbac_configurations.robot | 11 ++++- ...c_16-advanced_onboarding_and_scaling.robot | 19 +++++++- .../basic_17-delete_vnf_package.robot | 10 ++++- .../testsuite/epa_01-epa_sriov.robot | 17 ++++++-- .../epa_02-additional_capabilities.robot | 16 +++++-- .../testsuite/epa_04-epa_underlay_sriov.robot | 16 +++++-- .../epa_05-epa_underlay_passthrough.robot | 14 +++++- robot-systest/testsuite/hackfest_basic.robot | 21 ++++++--- .../testsuite/hackfest_cloudinit.robot | 23 +++++++--- .../testsuite/hackfest_multivdu.robot | 21 ++++++--- .../testsuite/k8s_01-create_k8s_cluster.robot | 43 +++++++++++++++++-- .../k8s_02-k8scluster_creation.robot | 10 ++++- .../testsuite/k8s_03-simple_k8s.robot | 17 ++++++-- .../testsuite/k8s_04-openldap_helm.robot | 17 ++++++-- .../testsuite/k8s_05-k8s_proxy_charms.robot | 19 ++++++-- .../k8s_06-k8s_secure_key_management.robot | 18 ++++++-- .../testsuite/k8s_07-dummy_helm.robot | 25 ++++++++++- .../quotas_01-quota_enforcement.robot | 19 ++++++-- .../testsuite/slice_01-network_slicing.robot | 29 ++++++++++--- .../slice_02-shared_network_slicing.robot | 30 +++++++++++-- 57 files changed, 438 insertions(+), 953 deletions(-) delete mode 100644 robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py delete mode 100644 robot-systest/resources/basic_06-vnf_with_charm_data.py delete mode 100644 robot-systest/resources/basic_07-secure_key_management_data.py delete mode 100644 robot-systest/resources/basic_09-manual_vdu_scaling_data.py delete mode 100644 robot-systest/resources/basic_11-native_charms.py delete mode 100644 robot-systest/resources/basic_12-ns_primitives_data.py delete mode 100644 robot-systest/resources/basic_13-ns_relations.py delete mode 100644 robot-systest/resources/basic_14-vnf_relations.py delete mode 100644 robot-systest/resources/basic_15-rbac_configurations_data.py delete mode 100644 robot-systest/resources/basic_16-advanced_onboarding_and_scaling_data.py delete mode 100644 robot-systest/resources/basic_17-delete_vnf_package_data.py delete mode 100644 robot-systest/resources/epa_01-epa_sriov_data.py delete mode 100644 robot-systest/resources/epa_02-additional_capabilities_data.py delete mode 100644 robot-systest/resources/epa_04-epa_underlay_sriov.py delete mode 100644 robot-systest/resources/epa_05-epa_underlay_passthrough.py delete mode 100644 robot-systest/resources/hackfest_basic_ns_data.py delete mode 100644 robot-systest/resources/hackfest_cloudinit_ns_data.py delete mode 100644 robot-systest/resources/hackfest_multivdu_ns_data.py delete mode 100644 robot-systest/resources/k8s_01-create_k8s_cluster_data.py delete mode 100644 robot-systest/resources/k8s_02-k8scluster_creation_data.py delete mode 100644 robot-systest/resources/k8s_03-simple_k8s_data.py delete mode 100644 robot-systest/resources/k8s_04-openldap_helm_data.py delete mode 100644 robot-systest/resources/k8s_05-k8s_proxy_charms.py delete mode 100644 robot-systest/resources/k8s_06-k8s_secure_key_management_data.py delete mode 100644 robot-systest/resources/k8s_07-dummy_helm_data.py delete mode 100644 robot-systest/resources/quotas_01-quota_enforcement_data.py delete mode 100644 robot-systest/resources/slice_01-network_slicing_data.py delete mode 100644 robot-systest/resources/slice_02-shared_network_slicing_data.py delete mode 100644 robot-systest/resources/slice_02-shared_ns_data.py 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 deleted file mode 100644 index 4505d7e..0000000 --- a/robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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 deleted file mode 100644 index e8f756f..0000000 --- a/robot-systest/resources/basic_06-vnf_with_charm_data.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index bc1ee4d..0000000 --- a/robot-systest/resources/basic_07-secure_key_management_data.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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 deleted file mode 100644 index 31b45a2..0000000 --- a/robot-systest/resources/basic_09-manual_vdu_scaling_data.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index a82e9de..0000000 --- a/robot-systest/resources/basic_11-native_charms.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index 1b92b5a..0000000 --- a/robot-systest/resources/basic_12-ns_primitives_data.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 deleted file mode 100644 index ef77561..0000000 --- a/robot-systest/resources/basic_13-ns_relations.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 deleted file mode 100644 index 36deb48..0000000 --- a/robot-systest/resources/basic_14-vnf_relations.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index 094ba20..0000000 --- a/robot-systest/resources/basic_15-rbac_configurations_data.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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 deleted file mode 100644 index 03dbe46..0000000 --- a/robot-systest/resources/basic_16-advanced_onboarding_and_scaling_data.py +++ /dev/null @@ -1,33 +0,0 @@ -# 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 deleted file mode 100644 index 76f003e..0000000 --- a/robot-systest/resources/basic_17-delete_vnf_package_data.py +++ /dev/null @@ -1,21 +0,0 @@ -# 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 deleted file mode 100644 index d3cb38c..0000000 --- a/robot-systest/resources/epa_01-epa_sriov_data.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index 5318420..0000000 --- a/robot-systest/resources/epa_02-additional_capabilities_data.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index b031512..0000000 --- a/robot-systest/resources/epa_04-epa_underlay_sriov.py +++ /dev/null @@ -1,31 +0,0 @@ -# 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 deleted file mode 100644 index 4e8cc82..0000000 --- a/robot-systest/resources/epa_05-epa_underlay_passthrough.py +++ /dev/null @@ -1,32 +0,0 @@ -# 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 deleted file mode 100644 index 0f927ed..0000000 --- a/robot-systest/resources/hackfest_basic_ns_data.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index d914c49..0000000 --- a/robot-systest/resources/hackfest_cloudinit_ns_data.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index 7c75b67..0000000 --- a/robot-systest/resources/hackfest_multivdu_ns_data.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index c5a8aa9..0000000 --- a/robot-systest/resources/k8s_01-create_k8s_cluster_data.py +++ /dev/null @@ -1,43 +0,0 @@ -# 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 deleted file mode 100644 index 8a816ab..0000000 --- a/robot-systest/resources/k8s_02-k8scluster_creation_data.py +++ /dev/null @@ -1,24 +0,0 @@ -# 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 deleted file mode 100644 index b544eef..0000000 --- a/robot-systest/resources/k8s_03-simple_k8s_data.py +++ /dev/null @@ -1,30 +0,0 @@ -# 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 deleted file mode 100644 index e8c7a69..0000000 --- a/robot-systest/resources/k8s_04-openldap_helm_data.py +++ /dev/null @@ -1,30 +0,0 @@ -# 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 deleted file mode 100644 index f2abc7e..0000000 --- a/robot-systest/resources/k8s_05-k8s_proxy_charms.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index 404c508..0000000 --- a/robot-systest/resources/k8s_06-k8s_secure_key_management_data.py +++ /dev/null @@ -1,27 +0,0 @@ -# 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 deleted file mode 100644 index e8326ad..0000000 --- a/robot-systest/resources/k8s_07-dummy_helm_data.py +++ /dev/null @@ -1,42 +0,0 @@ -# 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 deleted file mode 100644 index abf6a13..0000000 --- a/robot-systest/resources/quotas_01-quota_enforcement_data.py +++ /dev/null @@ -1,23 +0,0 @@ -# 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 deleted file mode 100644 index cc64eed..0000000 --- a/robot-systest/resources/slice_01-network_slicing_data.py +++ /dev/null @@ -1,37 +0,0 @@ -# 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 deleted file mode 100644 index d6358a2..0000000 --- a/robot-systest/resources/slice_02-shared_network_slicing_data.py +++ /dev/null @@ -1,40 +0,0 @@ -# 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 deleted file mode 100644 index 2170b57..0000000 --- a/robot-systest/resources/slice_02-shared_ns_data.py +++ /dev/null @@ -1,39 +0,0 @@ -# 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 b0d66d8..75c911c 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,19 +21,27 @@ 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 *** -${username} ubuntu -${new_password} newpassword +# 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 + *** Test Cases *** Create Cloudinit VNF Descriptor diff --git a/robot-systest/testsuite/basic_06-vnf_with_charm.robot b/robot-systest/testsuite/basic_06-vnf_with_charm.robot index e455e08..704f04f 100644 --- a/robot-systest/testsuite/basic_06-vnf_with_charm.robot +++ b/robot-systest/testsuite/basic_06-vnf_with_charm.robot @@ -21,17 +21,28 @@ 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 081dc3c..8d57bb6 100644 --- a/robot-systest/testsuite/basic_07-secure_key_management.robot +++ b/robot-systest/testsuite/basic_07-secure_key_management.robot @@ -21,22 +21,31 @@ 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 9b0138b..7989d98 100644 --- a/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot +++ b/robot-systest/testsuite/basic_09-manual_vdu_scaling.robot @@ -22,18 +22,27 @@ 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 89f5e63..be3af67 100644 --- a/robot-systest/testsuite/basic_11-native_charms.robot +++ b/robot-systest/testsuite/basic_11-native_charms.robot @@ -21,24 +21,35 @@ 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 6b94d3a..d1a0ebd 100644 --- a/robot-systest/testsuite/basic_12-ns_primitives.robot +++ b/robot-systest/testsuite/basic_12-ns_primitives.robot @@ -24,15 +24,28 @@ 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 @@ -58,7 +71,7 @@ Upload Nsd Instantiate NS - ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} ns_launch_max_wait_time=40min + ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} ns_launch_max_wait_time=${ns_timeout} 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 50f0851..fe0fe97 100644 --- a/robot-systest/testsuite/basic_13-ns_relations.robot +++ b/robot-systest/testsuite/basic_13-ns_relations.robot @@ -21,24 +21,37 @@ 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 035612b..91f4a4d 100644 --- a/robot-systest/testsuite/basic_14-vnf_relations.robot +++ b/robot-systest/testsuite/basic_14-vnf_relations.robot @@ -21,25 +21,26 @@ 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 *** -${username} ubuntu -${password} ${EMPTY} +# 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 ${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 55e0113..6cc62cc 100644 --- a/robot-systest/testsuite/basic_15-rbac_configurations.robot +++ b/robot-systest/testsuite/basic_15-rbac_configurations.robot @@ -21,16 +21,23 @@ 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 04e9b31..52d8069 100644 --- a/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot +++ b/robot-systest/testsuite/basic_16-advanced_onboarding_and_scaling.robot @@ -22,15 +22,30 @@ 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 d61e682..b6ce774 100644 --- a/robot-systest/testsuite/basic_17-delete_vnf_package.robot +++ b/robot-systest/testsuite/basic_17-delete_vnf_package.robot @@ -22,13 +22,19 @@ 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 dec84fa..8e89641 100644 --- a/robot-systest/testsuite/epa_01-epa_sriov.robot +++ b/robot-systest/testsuite/epa_01-epa_sriov.robot @@ -23,20 +23,31 @@ 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 91b3500..6a108b3 100644 --- a/robot-systest/testsuite/epa_02-additional_capabilities.robot +++ b/robot-systest/testsuite/epa_02-additional_capabilities.robot @@ -24,18 +24,28 @@ 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 3efeb03..f88c1c6 100644 --- a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot +++ b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot @@ -25,14 +25,24 @@ 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 @@ -55,7 +65,7 @@ Create NS Descriptor Instantiate Network Service - ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} + ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${EMPTY} 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 7f0f5c4..ddd4f82 100644 --- a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot +++ b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot @@ -33,6 +33,18 @@ 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 @@ -55,7 +67,7 @@ Create NS Descriptor Instantiate Network Service - ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${publickey} + ${id}= Create Network Service ${nsd_name} %{VIM_TARGET} ${ns_name} ${ns_config} ${EMPTY} Set Suite Variable ${ns_id} ${id} diff --git a/robot-systest/testsuite/hackfest_basic.robot b/robot-systest/testsuite/hackfest_basic.robot index 41a9d5f..5dfacae 100644 --- a/robot-systest/testsuite/hackfest_basic.robot +++ b/robot-systest/testsuite/hackfest_basic.robot @@ -25,21 +25,32 @@ 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_id} ${EMPTY} +# 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 ${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 0836006..389dea7 100644 --- a/robot-systest/testsuite/hackfest_cloudinit.robot +++ b/robot-systest/testsuite/hackfest_cloudinit.robot @@ -25,21 +25,30 @@ 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_id} ${EMPTY} +# 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 ${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 @@ -68,12 +77,12 @@ Get Vnf Ip Address Test SSH Access Sleep 30s Waiting ssh daemon to be up - Test SSH Connection ${vnf_ip_addr} ${username} ${password} ${privatekey} + Test SSH Connection ${vnf_ip_addr} ${username} ${password} ${EMPTY} Check Remote File Injected Via Cloud-init - ${stdout}= Execute Remote Command Check Rc Return Output ${vnf_ip_addr} ${username} ${password} ${privatekey} sudo cat /root/helloworld.txt + ${stdout}= Execute Remote Command Check Rc Return Output ${vnf_ip_addr} ${username} ${password} ${EMPTY} sudo cat /root/helloworld.txt log ${stdout} diff --git a/robot-systest/testsuite/hackfest_multivdu.robot b/robot-systest/testsuite/hackfest_multivdu.robot index 131c5ac..c6bc06a 100644 --- a/robot-systest/testsuite/hackfest_multivdu.robot +++ b/robot-systest/testsuite/hackfest_multivdu.robot @@ -25,22 +25,33 @@ 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_id} ${EMPTY} +# 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 ${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 a49bbd3..6733c6c 100644 --- a/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot +++ b/robot-systest/testsuite/k8s_01-create_k8s_cluster.robot @@ -27,41 +27,75 @@ 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} @@ -80,6 +114,7 @@ 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 @@ -94,10 +129,12 @@ 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 f0b5eae..f399835 100644 --- a/robot-systest/testsuite/k8s_02-k8scluster_creation.robot +++ b/robot-systest/testsuite/k8s_02-k8scluster_creation.robot @@ -22,22 +22,28 @@ 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 d235f7e..e308d16 100644 --- a/robot-systest/testsuite/k8s_03-simple_k8s.robot +++ b/robot-systest/testsuite/k8s_03-simple_k8s.robot @@ -28,16 +28,27 @@ 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 *** -${ns_id} ${EMPTY} +# 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} ${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 d5bac76..efc9928 100644 --- a/robot-systest/testsuite/k8s_04-openldap_helm.robot +++ b/robot-systest/testsuite/k8s_04-openldap_helm.robot @@ -25,16 +25,27 @@ 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 *** -${ns_id} ${EMPTY} +# 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} ${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 a32ad66..5ea838a 100644 --- a/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot +++ b/robot-systest/testsuite/k8s_05-k8s_proxy_charms.robot @@ -21,24 +21,35 @@ 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 d12153d..3bbe5b0 100644 --- a/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot +++ b/robot-systest/testsuite/k8s_06-k8s_secure_key_management.robot @@ -21,17 +21,29 @@ 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 811d14d..8669f07 100644 --- a/robot-systest/testsuite/k8s_07-dummy_helm.robot +++ b/robot-systest/testsuite/k8s_07-dummy_helm.robot @@ -26,18 +26,39 @@ 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 339607d..c0a5043 100644 --- a/robot-systest/testsuite/quotas_01-quota_enforcement.robot +++ b/robot-systest/testsuite/quotas_01-quota_enforcement.robot @@ -19,19 +19,30 @@ 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 *** -${success_return_code} 0 +# 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 ${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= -${vnfd_pkg} %{PACKAGES_FOLDER}/${vnfd_name} + +# User name and password for project +${user_name} quotas_01_user +${user_password} quotas_01_pass + +${success_return_code} 0 + *** 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 5831e36..d9c8d59 100644 --- a/robot-systest/testsuite/slice_01-network_slicing.robot +++ b/robot-systest/testsuite/slice_01-network_slicing.robot @@ -30,25 +30,44 @@ 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_id} ${EMPTY} +# 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} ${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 *** +*** 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 7b9408c..0595480 100644 --- a/robot-systest/testsuite/slice_02-shared_network_slicing.robot +++ b/robot-systest/testsuite/slice_02-shared_network_slicing.robot @@ -29,8 +29,6 @@ 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 @@ -38,16 +36,40 @@ Suite Teardown Run Keyword And Ignore Error Suite Cleanup *** Variables *** -${ns_id} ${EMPTY} +# 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 ${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) -- 2.25.1 From c0b3a8e31b493a7d4091562f3757e8fa6d724ba6 Mon Sep 17 00:00:00 2001 From: aguilarherna Date: Wed, 12 May 2021 08:56:23 +0000 Subject: [PATCH 12/16] Revert "Modified testsuites to remove resource files" This reverts commit f0c88cd2aa142fd84650435fbbbec68e32503766. Change-Id: I7827a31b0e3489a985e7f66e94074cc57a48fc9b Signed-off-by: aguilarherna --- ...antiation_parameters_in_cloud_init_data.py | 22 ++++++++++ .../resources/basic_06-vnf_with_charm_data.py | 27 ++++++++++++ .../basic_07-secure_key_management_data.py | 22 ++++++++++ .../basic_09-manual_vdu_scaling_data.py | 27 ++++++++++++ .../resources/basic_11-native_charms.py | 27 ++++++++++++ .../resources/basic_12-ns_primitives_data.py | 36 ++++++++++++++++ .../resources/basic_13-ns_relations.py | 29 +++++++++++++ .../resources/basic_14-vnf_relations.py | 27 ++++++++++++ .../basic_15-rbac_configurations_data.py | 22 ++++++++++ ...16-advanced_onboarding_and_scaling_data.py | 33 ++++++++++++++ .../basic_17-delete_vnf_package_data.py | 21 +++++++++ .../resources/epa_01-epa_sriov_data.py | 27 ++++++++++++ .../epa_02-additional_capabilities_data.py | 27 ++++++++++++ .../resources/epa_04-epa_underlay_sriov.py | 31 +++++++++++++ .../epa_05-epa_underlay_passthrough.py | 32 ++++++++++++++ .../resources/hackfest_basic_ns_data.py | 27 ++++++++++++ .../resources/hackfest_cloudinit_ns_data.py | 27 ++++++++++++ .../resources/hackfest_multivdu_ns_data.py | 27 ++++++++++++ .../k8s_01-create_k8s_cluster_data.py | 43 +++++++++++++++++++ .../k8s_02-k8scluster_creation_data.py | 24 +++++++++++ .../resources/k8s_03-simple_k8s_data.py | 30 +++++++++++++ .../resources/k8s_04-openldap_helm_data.py | 30 +++++++++++++ .../resources/k8s_05-k8s_proxy_charms.py | 27 ++++++++++++ .../k8s_06-k8s_secure_key_management_data.py | 27 ++++++++++++ .../resources/k8s_07-dummy_helm_data.py | 42 ++++++++++++++++++ .../quotas_01-quota_enforcement_data.py | 23 ++++++++++ .../slice_01-network_slicing_data.py | 37 ++++++++++++++++ .../slice_02-shared_network_slicing_data.py | 40 +++++++++++++++++ .../resources/slice_02-shared_ns_data.py | 39 +++++++++++++++++ ...stantiation_parameters_in_cloud_init.robot | 16 ++----- .../testsuite/basic_06-vnf_with_charm.robot | 17 ++------ .../basic_07-secure_key_management.robot | 17 ++------ .../basic_09-manual_vdu_scaling.robot | 13 +----- .../testsuite/basic_11-native_charms.robot | 19 ++------ .../testsuite/basic_12-ns_primitives.robot | 19 ++------ .../testsuite/basic_13-ns_relations.robot | 21 ++------- .../testsuite/basic_14-vnf_relations.robot | 21 +++++---- .../basic_15-rbac_configurations.robot | 11 +---- ...c_16-advanced_onboarding_and_scaling.robot | 19 +------- .../basic_17-delete_vnf_package.robot | 10 +---- .../testsuite/epa_01-epa_sriov.robot | 17 ++------ .../epa_02-additional_capabilities.robot | 16 ++----- .../testsuite/epa_04-epa_underlay_sriov.robot | 16 ++----- .../epa_05-epa_underlay_passthrough.robot | 14 +----- robot-systest/testsuite/hackfest_basic.robot | 21 +++------ .../testsuite/hackfest_cloudinit.robot | 23 +++------- .../testsuite/hackfest_multivdu.robot | 21 +++------ .../testsuite/k8s_01-create_k8s_cluster.robot | 43 ++----------------- .../k8s_02-k8scluster_creation.robot | 10 +---- .../testsuite/k8s_03-simple_k8s.robot | 17 ++------ .../testsuite/k8s_04-openldap_helm.robot | 17 ++------ .../testsuite/k8s_05-k8s_proxy_charms.robot | 19 ++------ .../k8s_06-k8s_secure_key_management.robot | 18 ++------ .../testsuite/k8s_07-dummy_helm.robot | 25 +---------- .../quotas_01-quota_enforcement.robot | 19 ++------ .../testsuite/slice_01-network_slicing.robot | 29 +++---------- .../slice_02-shared_network_slicing.robot | 30 ++----------- 57 files changed, 953 insertions(+), 438 deletions(-) create mode 100644 robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py create mode 100644 robot-systest/resources/basic_06-vnf_with_charm_data.py create mode 100644 robot-systest/resources/basic_07-secure_key_management_data.py create mode 100644 robot-systest/resources/basic_09-manual_vdu_scaling_data.py create mode 100644 robot-systest/resources/basic_11-native_charms.py create mode 100644 robot-systest/resources/basic_12-ns_primitives_data.py create mode 100644 robot-systest/resources/basic_13-ns_relations.py create mode 100644 robot-systest/resources/basic_14-vnf_relations.py create mode 100644 robot-systest/resources/basic_15-rbac_configurations_data.py create mode 100644 robot-systest/resources/basic_16-advanced_onboarding_and_scaling_data.py create mode 100644 robot-systest/resources/basic_17-delete_vnf_package_data.py create mode 100644 robot-systest/resources/epa_01-epa_sriov_data.py create mode 100644 robot-systest/resources/epa_02-additional_capabilities_data.py create mode 100644 robot-systest/resources/epa_04-epa_underlay_sriov.py create mode 100644 robot-systest/resources/epa_05-epa_underlay_passthrough.py create mode 100644 robot-systest/resources/hackfest_basic_ns_data.py create mode 100644 robot-systest/resources/hackfest_cloudinit_ns_data.py create mode 100644 robot-systest/resources/hackfest_multivdu_ns_data.py create mode 100644 robot-systest/resources/k8s_01-create_k8s_cluster_data.py create mode 100644 robot-systest/resources/k8s_02-k8scluster_creation_data.py create mode 100644 robot-systest/resources/k8s_03-simple_k8s_data.py create mode 100644 robot-systest/resources/k8s_04-openldap_helm_data.py create mode 100644 robot-systest/resources/k8s_05-k8s_proxy_charms.py create mode 100644 robot-systest/resources/k8s_06-k8s_secure_key_management_data.py create mode 100644 robot-systest/resources/k8s_07-dummy_helm_data.py create mode 100644 robot-systest/resources/quotas_01-quota_enforcement_data.py create mode 100644 robot-systest/resources/slice_01-network_slicing_data.py create mode 100644 robot-systest/resources/slice_02-shared_network_slicing_data.py create mode 100644 robot-systest/resources/slice_02-shared_ns_data.py 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) -- 2.25.1 From eb5556e1fb8ce40d7fc48872d1420e57b1cffc65 Mon Sep 17 00:00:00 2001 From: beierlm Date: Wed, 12 May 2021 04:53:49 -0400 Subject: [PATCH 13/16] Server list info when waiting NS Adds output of opentstack server list to the check for ns instance so that way we can see if there is any mismatch between the state of Openstack and the LCM. Change-Id: I3c7a47b254c9ded037a8bbcc44d7b0f8e8e6d92a Signed-off-by: beierlm --- robot-systest/lib/ns_lib.robot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot index ed6e699..0747bc1 100644 --- a/robot-systest/lib/ns_lib.robot +++ b/robot-systest/lib/ns_lib.robot @@ -118,6 +118,8 @@ Get Vnf Ip List Check For Ns Instance To Configured [arguments] ${ns_name} + ${rc} ${stdout}= Run and Return RC and Output openstack server list + log ${stdout} ${rc} ${stdout}= run and return rc and output osm ns-list --filter name="${ns_name}" log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} @@ -126,6 +128,8 @@ Check For Ns Instance To Configured Check For NS Instance For Failure [Arguments] ${ns_name} + ${rc} ${stdout}= Run and Return RC and Output openstack server list + log ${stdout} ${rc} ${stdout}= Run and Return RC and Output osm ns-list --filter name="${ns_name}" log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} @@ -134,6 +138,8 @@ Check For NS Instance For Failure Check For NS Instance To Be Deleted [Arguments] ${ns} + ${rc} ${stdout}= Run and Return RC and Output openstack server list + log ${stdout} ${rc} ${stdout}= Run and Return RC and Output osm ns-list | awk '{print $2}' | grep ${ns} Should Not Be Equal As Strings ${stdout} ${ns} -- 2.25.1 From 995dc165254ae44826e3d63382702d52b44636dc Mon Sep 17 00:00:00 2001 From: beierlm Date: Fri, 21 May 2021 17:05:53 -0400 Subject: [PATCH 14/16] Point dependencies to branch Change-Id: Iee4f78587abc1d9bca8274b6934e422605615de0 Signed-off-by: beierlm --- requirements-dev.in | 8 +++---- requirements-dev.txt | 52 ++++++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/requirements-dev.in b/requirements-dev.in index dc09a5e..fd6ee1a 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -git+https://osm.etsi.org/gerrit/osm/IM.git@master#egg=osm-im --r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master +git+https://osm.etsi.org/gerrit/osm/IM.git@v10.0#egg=osm-im +-r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=v10.0 -git+https://osm.etsi.org/gerrit/osm/osmclient.git@master#egg=osm-osmclient --r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master +git+https://osm.etsi.org/gerrit/osm/osmclient.git@v10.0#egg=osm-osmclient +-r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 diff --git a/requirements-dev.txt b/requirements-dev.txt index a16fb90..a9bd0ac 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,81 +1,81 @@ bitarray==1.8.1 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=v10.0 # pyangbind certifi==2020.12.5 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 # requests chardet==4.0.0 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 # requests click==7.1.2 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 enum34==1.1.10 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=v10.0 # pyangbind idna==2.10 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 # requests jinja2==2.11.3 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 lxml==4.6.3 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=v10.0 # pyang # pyangbind markupsafe==1.1.1 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 # jinja2 -git+https://osm.etsi.org/gerrit/osm/IM.git@master#egg=osm-im +git+https://osm.etsi.org/gerrit/osm/IM.git@v10.0#egg=osm-im # via -r requirements-dev.in -git+https://osm.etsi.org/gerrit/osm/osmclient.git@master#egg=osm-osmclient +git+https://osm.etsi.org/gerrit/osm/osmclient.git@v10.0#egg=osm-osmclient # via -r requirements-dev.in packaging==20.9 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 prettytable==2.1.0 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 pyang==2.4.0 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=v10.0 # pyangbind pyangbind==0.8.1 - # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=v10.0 pycurl==7.43.0.6 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 pyparsing==2.4.7 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 # packaging python-magic==0.4.22 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 pyyaml==5.4.1 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=v10.0 + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 regex==2021.3.17 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=v10.0 # pyangbind requests==2.25.1 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 six==1.15.0 # via - # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/IM.git;a=blob_plain;f=requirements.txt;hb=v10.0 # pyangbind urllib3==1.26.4 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 # requests verboselogs==1.7 - # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # via -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 wcwidth==0.2.5 # via - # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=master + # -r https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=blob_plain;f=requirements.txt;hb=v10.0 # prettytable ####################################################################################### # Copyright ETSI Contributors and Others. -- 2.25.1 From 8adc0671d5afc1d94e0741303c3486f5c164496f Mon Sep 17 00:00:00 2001 From: aguilarherna Date: Wed, 19 May 2021 14:36:41 +0000 Subject: [PATCH 15/16] Fix bug 1536: incorrect check SDNC status in EPA03 Modified the way to check the successful creation of SDNC in 'Check for SDNC' keyword. Corrected check on metric (should be 1) in 'Check If SDNC Is Available' keyword. Change-Id: I7f23dc9033caec8ac6ab3d00be577912a1bfa0fa Signed-off-by: aguilarherna Signed-off-by: garciadeblas --- robot-systest/lib/sdnc_lib.robot | 13 +++++++------ .../epa_03-crud_operations_on_sdnc_data.py | 2 +- .../testsuite/epa_03-crud_operations_on_sdnc.robot | 10 ++++++++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/robot-systest/lib/sdnc_lib.robot b/robot-systest/lib/sdnc_lib.robot index 13cb6dc..6c16b43 100644 --- a/robot-systest/lib/sdnc_lib.robot +++ b/robot-systest/lib/sdnc_lib.robot @@ -61,6 +61,7 @@ Delete SDNC ${rc} ${stdout}= Run Keyword And Continue On Failure Run and Return RC and Output osm sdnc-delete ${sdnc_name} log ${stdout} + Should Be Equal As Integers ${rc} ${success_return_code} msg=${stdout} values=False Wait Until Keyword Succeeds ${delete_max_wait_time} ${delete_pol_time} Check for SDNC To Be Deleted ${sdnc_name} @@ -71,16 +72,16 @@ Get SDNC List Check for SDNC - [Arguments] ${sdnc_name} + [Arguments] ${sdnc_id} - ${rc} ${stdout}= Run and Return RC and Output osm sdnc-list | awk '{print $2}' | grep ${sdnc_name} - Should Be Equal As Strings ${stdout} ${sdnc_name} + ${rc} ${stdout}= Run and Return RC and Output osm sdnc-show ${sdnc_id} | grep -io ENABLED + log ${stdout} + Should Be Equal As Integers ${rc} ${success_return_code} Check for SDNC Status - [Arguments] ${sdnc_name} ${prometheus_host} ${prometheus_port} + [Arguments] ${sdnc_id} ${prometheus_host} ${prometheus_port} - ${sdnc_id}= Get SDNC ID ${sdnc_name} Wait Until Keyword Succeeds ${sdnc_status_max_wait_time} ${sdnc_status_pol_time} Check If SDNC Is Available ${sdnc_id} ${prometheus_host} ${prometheus_port} @@ -97,4 +98,4 @@ Check If SDNC Is Available [Arguments] ${sdnc_id} ${prometheus_host} ${prometheus_port} ${metric}= Get Metric ${prometheus_host} ${prometheus_port} osm_sdnc_status sdnc_id=${sdnc_id} - Should Be Equal As Integers ${metric} 0 msg=SDNC '${sdnc_id}' is not active values=false + Should Be Equal As Integers ${metric} 1 msg=SDNC '${sdnc_id}' is not active values=false diff --git a/robot-systest/resources/epa_03-crud_operations_on_sdnc_data.py b/robot-systest/resources/epa_03-crud_operations_on_sdnc_data.py index 827baf6..029cb2b 100644 --- a/robot-systest/resources/epa_03-crud_operations_on_sdnc_data.py +++ b/robot-systest/resources/epa_03-crud_operations_on_sdnc_data.py @@ -23,7 +23,7 @@ from common_helpers import get_prometheus_info # SDNC Configuration -sdnc_name = "epa_03_crud_operations_on_sdnc_test" +sdnc_name = "epa_03" sdnc_user = os.environ.get("SDNC_USER") if not sdnc_user: raise Exception("'SDNC_USER' environment variable not found") diff --git a/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot b/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot index 4b222e4..b0d86df 100644 --- a/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot +++ b/robot-systest/testsuite/epa_03-crud_operations_on_sdnc.robot @@ -22,16 +22,22 @@ Force Tags epa_03 cluster_epa daily regression Suite Teardown Run Keyword And Ignore Error Delete Basic SDNC +*** Variables *** +${sdnc_enabled_max_wait_time} 1min +${sdnc_enabled_pol_time} 10 + + *** Test Cases *** Create Basic SDNC ${created_sdnc_id}= Create SDNC ${sdnc_name} ${sdnc_user} ${sdnc_password} ${sdnc_url} ${sdnc_type} - Check for SDNC ${sdnc_name} + Set Suite Variable ${sdnc_id} ${created_sdnc_id} + Wait Until Keyword Succeeds ${sdnc_enabled_max_wait_time} ${sdnc_enabled_pol_time} Check for SDNC ${sdnc_id} Check SDNC Status Is Healthy - Check for SDNC Status ${sdnc_name} ${prometheus_host} ${prometheus_port} + Check for SDNC Status ${sdnc_id} ${prometheus_host} ${prometheus_port} Delete Basic SDNC -- 2.25.1 From 6eab23ae7e2ca44484f87d31a3ecf3b5a396913d Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 13 May 2021 12:38:53 +0200 Subject: [PATCH 16/16] ns_lib: update scaling timeout with the env modifier OSM_VIM_MULTIPLIER_TIMEOUT Change-Id: Ie8dfad05c42d2a962659dc5ad74b3f5290307aec Signed-off-by: garciadeblas --- robot-systest/lib/ns_lib.robot | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot index 0747bc1..501bee2 100644 --- a/robot-systest/lib/ns_lib.robot +++ b/robot-systest/lib/ns_lib.robot @@ -22,7 +22,6 @@ ${ns_launch_pol_time} 30sec ${ns_delete_pol_time} 15sec ${ns_action_max_wait_time} 1min ${ns_action_pol_time} 15sec -${vnf_scale_max_wait_time} 2min ${vnf_scale_pol_time} 15sec ${vim_timeout_multiplier} %{OSM_VIM_MULTIPLIER_TIMEOUT=1.0} @@ -211,8 +210,10 @@ Execute Manual VNF Scale ... The parameter 'scale_type' must be SCALE_IN or SCALE_OUT. ... Return the ID of the operation associated to the executed scale action. - [Arguments] ${ns_name} ${vnf_member_index} ${scaling_group} ${scale_type} + [Arguments] ${ns_name} ${vnf_member_index} ${scaling_group} ${scale_type} ${vnf_scale_max_wait_time}=2min + ${vnf_scale_max_wait_time}= Convert Time ${vnf_scale_max_wait_time} result_format=number + ${vnf_scale_max_wait_time}= Evaluate ${vnf_scale_max_wait_time} * ${vim_timeout_multiplier} Should Contain Any ${scale_type} SCALE_IN SCALE_OUT msg=Unknown scale type: ${scale_type} values=False ${osm_vnf_scale_command}= Set Variable osm vnf-scale --scaling-group ${scaling_group} ${osm_vnf_scale_command}= Run Keyword If '${scale_type}'=='SCALE_IN' Catenate ${osm_vnf_scale_command} --scale-in -- 2.25.1