From 8a66eac4bbb898d943d461845e371381425a9cf7 Mon Sep 17 00:00:00 2001 From: Juan Vidal Date: Fri, 24 Mar 2017 15:16:21 +0000 Subject: Harmonize vxlan-tool calls Renamed vxlan_firewall and vxlan_tool_stop to start_vxlan_tool and stop_vxlan_tool respectively. Added some comments to explain their behavior. Cleaned both functions to use ".format()" string formatting, which improves readability. Modified behavior of start_vxlan_tool: now it does NOT block traffic by default Change-Id: I6754b020a474be1e9adf2d83e7c9f5053930b702 Signed-off-by: Juan Vidal --- sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py') diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py index 2c688412..a774672d 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -213,10 +213,10 @@ def main(): '\033[91mFailed to start HTTP server on %s\033[0m' % server_ip) sys.exit(1) - logger.info("Starting HTTP firewall on %s" % sf2) - test_utils.vxlan_firewall(sf2, port="80") logger.info("Starting SSH firewall on %s" % sf1) - test_utils.vxlan_firewall(sf1, port="22") + test_utils.start_vxlan_tool(sf1, block="22") + logger.info("Starting HTTP firewall on %s" % sf2) + test_utils.start_vxlan_tool(sf2, block="80") logger.info("Wait for ODL to update the classification rules in OVS") t1.join() -- cgit 1.2.3-korg