From ac26593edf2b6cacbe17506328f4cf56b9b1dd3a Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Thu, 30 May 2019 22:35:30 -0500 Subject: Cherry pick: vfwclosedloop for new vFW Manual cherry pick from dublin Issue-ID: INT-838 Change-Id: I19f619f6e5b1c0a788e0f6014d79c07c88e3eecd Signed-off-by: Brian Freeman --- .../test_templates/closedloop_test_template.robot | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'robot/resources/test_templates/closedloop_test_template.robot') diff --git a/robot/resources/test_templates/closedloop_test_template.robot b/robot/resources/test_templates/closedloop_test_template.robot index dcbb7e65..f5c0e357 100644 --- a/robot/resources/test_templates/closedloop_test_template.robot +++ b/robot/resources/test_templates/closedloop_test_template.robot @@ -80,7 +80,7 @@ Get Configs VFW Policy ${configpolicy_name}= Create Dictionary config_policy_name=${getconfigpolicy} ${output} = Fill JSON Template File ${GECONFIG_VFW_TEMPLATE} ${configpolicy_name} ${get_resp} = Run Policy Get Configs Request ${RESOURCE_PATH_GET_CONFIG} ${output} - Should Be Equal As Strings ${get_resp.status_code} 200 + Should Be Equal As Strings ${get_resp.status_code} 200 ${config}= Catenate ${get_resp.json()[0]["config"]} ${thresholds}= Get Variable Value ${config["content"]["tca_policy"]["metricsPerEventName"][0]["thresholds"]} @@ -100,7 +100,7 @@ Get Configs VDNS Policy ${configpolicy_name}= Create Dictionary config_policy_name=${getconfigpolicy} ${output} = Fill JSON Template File ${GECONFIG_VFW_TEMPLATE} ${configpolicy_name} ${get_resp} = Run Policy Get Configs Request ${RESOURCE_PATH_GET_CONFIG} ${output} - Should Be Equal As Strings ${get_resp.status_code} 200 + Should Be Equal As Strings ${get_resp.status_code} 200 ${config}= Catenate ${get_resp.json()[0]["config"]} ${thresholds}= Get Variable Value ${config["content"]["tca_policy"]["metricsPerEventName"][0]["thresholds"]} @@ -196,12 +196,12 @@ Orchestrate VNF vFW closedloop VFWCL High Test [Documentation] Test Control Loop for High Traffic [Arguments] ${pkg_host} - Enable Streams ${pkg_host} 10 + Enable Streams V2 ${pkg_host} 10 Log To Console Set number of streams to 10 :FOR ${i} IN RANGE 12 \ Sleep 15s - \ ${resp}= Get List Of Enabled Streams ${pkg_host} - \ ${stream_count}= Evaluate len(${resp['sample-plugin']['pg-streams']['pg-stream']}) + \ ${resp}= Get List Of Enabled Streams V2 ${pkg_host} + \ ${stream_count}= Set Variable ${resp['stream-count']['streams']['active-streams']} \ Log To Console Number of streams: ${stream_count} \ Exit For Loop If '${stream_count}'=='5' Should Be Equal As Integers ${stream_count} 5 @@ -209,13 +209,12 @@ VFWCL High Test VFWCL Low Test [Documentation] Test Control Loop for Low Traffic [Arguments] ${pkg_host} - Enable Streams ${pkg_host} 1 + Enable Streams V2 ${pkg_host} 1 Log To Console Set number of streams to 1 - Get List Of Enabled Streams ${pkg_host} :FOR ${i} IN RANGE 12 \ Sleep 15s - \ ${resp}= Get List Of Enabled Streams ${pkg_host} - \ ${stream_count}= Evaluate len(${resp['sample-plugin']['pg-streams']['pg-stream']}) + \ ${resp}= Get List Of Enabled Streams V2 ${pkg_host} + \ ${stream_count}= Set Variable ${resp['stream-count']['streams']['active-streams']} \ Log To Console Number of streams: ${stream_count} \ Exit For Loop If '${stream_count}'=='5' Should Be Equal As Integers ${stream_count} 5 -- cgit 1.2.3-korg