Fixes tests QUOTAS-01, BASIC-08 and hackfest_cloudinit for SOL006
Change-Id: I65ad52a95666e41a9f76525447ea19f3265e907d
Signed-off-by: garciaale <agarcia@whitestack.com>
diff --git a/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot b/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot
index 8535014..7e65c9e 100644
--- a/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot
+++ b/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot
@@ -61,8 +61,8 @@
Check Port Security Is Disabled
[Tags] disable_port_security sanity regression
- ${rc} ${disabled_ports}= Run and Return RC and Output osm ns-show ${ns_name} | grep -c '${port_disabled_msg}'
- Run Keyword Unless ${disabled_ports} > 6 Fail msg=Found only '${disabled_ports}' matches for '${port_disabled_msg}'
+ ${rc} ${disabled_ports}= Run and Return RC and Output osm ns-show ${ns_name} --literal | grep -c '${port_disabled_msg}'
+ Run Keyword Unless ${disabled_ports} > 0 Fail msg=Found '${disabled_ports}' matches for '${port_disabled_msg}'
Delete NS Instance
diff --git a/robot-systest/testsuite/hackfest_cloudinit.robot b/robot-systest/testsuite/hackfest_cloudinit.robot
index 2fb79fa..3ac1189 100644
--- a/robot-systest/testsuite/hackfest_cloudinit.robot
+++ b/robot-systest/testsuite/hackfest_cloudinit.robot
@@ -31,7 +31,7 @@
*** Variables ***
${ns_id} ${EMPTY}
${username} ubuntu
-${password} ${EMPTY}
+${password} osm4u
${vnf_member_index} 1
${vnf_ip_addr} ${EMPTY}
${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
@@ -53,7 +53,7 @@
Network Service Instance Test
[Tags] hackfest_cloudinit sanity regression
- ${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/quotas_01-quota_enforcement.robot b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
index e0cb576..db91be0 100644
--- a/robot-systest/testsuite/quotas_01-quota_enforcement.robot
+++ b/robot-systest/testsuite/quotas_01-quota_enforcement.robot
@@ -80,8 +80,8 @@
Create VNFDs On Third Project Until Exceed Quota
[Tags] quota_enforcement sanity regression
- Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v1;name=v1'
- Run Keyword And Expect Error * Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v2;name=v2'
+ Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v1;product-name=v1'
+ Run Keyword And Expect Error * Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v2;product-name=v2'
Increase Third Project Quotas
@@ -95,18 +95,18 @@
Create More VNFDs On Third Project Until Exceed Quota
[Tags] quota_enforcement sanity regression
- Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v2;name=v2'
- Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v3;name=v3'
- Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v4;name=v4'
- Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v5;name=v5'
- Run Keyword And Expect Error * Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v6;name=v6'
+ Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v2;product-name=v2'
+ Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v3;product-name=v3'
+ Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v4;product-name=v4'
+ Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v5;product-name=v5'
+ Run Keyword And Expect Error * Create VNFD In Project ${project_3_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=v6;product-name=v6'
Create VNFDs On Second Project Until Exceed Quota
[Tags] quota_enforcement sanity regression
- Create VNFD In Project ${project_2_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=vp2_1;name=vp2_1'
- Run Keyword And Expect Error * Create VNFD In Project ${project_2_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=vp2_2;name=vp2_2'
+ Create VNFD In Project ${project_2_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=vp2_1;product-name=vp2_1'
+ Run Keyword And Expect Error * Create VNFD In Project ${project_2_name} ${vnfd_pkg} ${user_name} ${user_password} override='id=vp2_2;product-name=vp2_2'
Check Project Scopes