aboutsummaryrefslogtreecommitdiffstats
path: root/robot/resources/stack_validation
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-03-22 13:25:49 -0700
committerBrian Freeman <bf1936@att.com>2018-04-19 11:13:41 -0500
commit76bc74f47aaae4064f836b351074e3db07180c91 (patch)
tree0b6566990178bc6bc90096f73435a2feb8dffd2e /robot/resources/stack_validation
parent735671a2ed190ef5dd9244d4c7e1bd7ba4e27132 (diff)
Fix vFW Closed Loop robot test case
Issued addressed by this change: * Cherry picked from Amsterdam * Send the invariantUUID of VPKTG to Policy instead of VFW * Extraneous single quote characters in the policy yaml * Policy update wouldn’t “stick” until I added in the delays in between the various Policy API calls * Had to ignore the VID teardown errors; not sure if this is necessary to pass the closed loop test Change-Id: Ie504736484df78c46f564ee21bbd0c22d494af1f Issue-ID: INT-406 Signed-off-by: Gary Wu <gary.i.wu@huawei.com> Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'robot/resources/stack_validation')
-rw-r--r--robot/resources/stack_validation/policy_check_vfw.robot32
1 files changed, 20 insertions, 12 deletions
diff --git a/robot/resources/stack_validation/policy_check_vfw.robot b/robot/resources/stack_validation/policy_check_vfw.robot
index 22340729..a4c343eb 100644
--- a/robot/resources/stack_validation/policy_check_vfw.robot
+++ b/robot/resources/stack_validation/policy_check_vfw.robot
@@ -23,20 +23,28 @@ Resource ../../resources/test_templates/vnf_orchestration_test_template
*** Variables ***
*** Keywords ***
-Policy Check Firewall Stack
+Policy Check FirewallCL Stack
[Documentation] Executes the vFW policy closed loop test.
- [Arguments] ${stack_name} ${policy_rate}
+ [Arguments] ${stacknamemap} ${policy_rate}
Run Openstack Auth Request auth
- ${stack_info}= Wait for Stack to Be Deployed auth ${stack_name}
- ${stack_id}= Get From Dictionary ${stack_info} id
+ ${vsnk_stack_name}= Get From Dictionary ${stacknamemap} vFWSNK
+ ${vpkg_stack_name}= Get From Dictionary ${stacknamemap} vPKG
+ ${vsnk_stack_info}= Wait for Stack to Be Deployed auth ${vsnk_stack_name}
+ ${vpkg_stack_info}= Wait for Stack to Be Deployed auth ${vpkg_stack_name}
${server_list}= Get Openstack Servers auth
Log ${server_list}
- ${vpg_unprotected_ip}= Get From Dictionary ${stack_info} vpg_private_ip_0
- ${vsn_protected_ip}= Get From Dictionary ${stack_info} vsn_private_ip_0
- ${vpg_public_ip}= Get Server Ip ${server_list} ${stack_info} vpg_name_0 network_name=public
- ${vsn_public_ip}= Get Server Ip ${server_list} ${stack_info} vsn_name_0 network_name=public
+ ${vpkg_id}= Get From Dictionary ${vpkg_stack_info} vnf_id
+ ${status} ${generic_vnf}= Run Keyword And Ignore Error Get Generic VNF By ID ${vpkg_id}
+ Run Keyword If '${status}' == 'FAIL' FAIL VNF ID: ${vpkg_id} is not found.
+ ${invariantUUID} Get From Dictionary ${generic_vnf} persona-model-id
+ Update vVFWCL Policy ${invariantUUID}
+
+ ${vpg_unprotected_ip}= Get From Dictionary ${vpkg_stack_info} vpg_private_ip_0
+ ${vsn_protected_ip}= Get From Dictionary ${vsnk_stack_info} vsn_private_ip_0
+ ${vpg_public_ip}= Get Server Ip ${server_list} ${vpkg_stack_info} vpg_name_0 network_name=public
+ ${vsn_public_ip}= Get Server Ip ${server_list} ${vsnk_stack_info} vsn_name_0 network_name=public
${upper_bound}= Evaluate ${policy_rate}*2
- Wait Until Keyword Succeeds 300s 1s Run VFW Policy Check ${vpg_public_ip} ${policy_rate} ${upper_bound} 1
+ Wait Until Keyword Succeeds 30m 2s Run VFW Policy Check ${vpg_public_ip} ${policy_rate} ${upper_bound} 1
Run VFW Policy Check
[Documentation] Push traffic above upper bound, wait for policy to fix it, push traffic to lower bound, wait for policy to fix it,
@@ -51,8 +59,8 @@ Check For Policy Enforcement
[Documentation] Push traffic above upper bound, wait for policy to fix it, push traffic to lower bound, wait for policy to fix it,
[Arguments] ${vpg_public_ip} ${policy_rate} ${forced_rate}
Enable Streams ${vpg_public_ip} ${forced_rate}
- Wait Until Keyword Succeeds 20s 5s Test For Expected Rate ${vpg_public_ip} ${forced_rate}
- Wait Until Keyword Succeeds 280s 5s Test For Expected Rate ${vpg_public_ip} ${policy_rate}
+ Wait Until Keyword Succeeds 20s 2s Test For Expected Rate ${vpg_public_ip} ${forced_rate}
+ Wait Until Keyword Succeeds 10m 2s Test For Expected Rate ${vpg_public_ip} ${policy_rate}
Test For Expected Rate
[Documentation] Ge the number of pg-streams from the PGN, and test to see if it is what we expect.
@@ -93,4 +101,4 @@ Start DNS Traffic
[Documentation] Run nslookups at rate per second. Run for 10 minutes or until it is called by the terminate process
[Arguments] ${vlb_public_ip} ${rate}
${pid}= Start Process ./dnstraffic.sh ${vlb_public_ip} ${rate} ${GLOBAL_DNS_TRAFFIC_DURATION}
- [Return] ${pid} \ No newline at end of file
+ [Return] ${pid}