X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FSFC%2FSFCTest.py;h=3794d3a2a1b047a7a0509b53c26765c8fe9202ea;hb=780b65d82863effd53ccb0e0150c29d22522c61d;hp=ec08efd17cd4d702ddfcbcdcf7d94acc217df30c;hpb=050ece3a87fbbad7d04e69ed951c48118edf0a89;p=csit.git diff --git a/resources/libraries/python/SFC/SFCTest.py b/resources/libraries/python/SFC/SFCTest.py index ec08efd17c..3794d3a2a1 100644 --- a/resources/libraries/python/SFC/SFCTest.py +++ b/resources/libraries/python/SFC/SFCTest.py @@ -17,14 +17,15 @@ the NSH SFC functional test. """ from resources.libraries.python.ssh import SSH -from resources.libraries.python.constants import Constants as con +from resources.libraries.python.Constants import Constants as con from resources.libraries.python.topology import Topology + class SFCTest(object): """Configure and Start the NSH SFC functional tests.""" @staticmethod - def config_and_start_SFC_test(dut_node, dut_if1, dut_if2, if1_adj_mac, + def config_and_start_sfc_test(dut_node, dut_if1, dut_if2, if1_adj_mac, if2_adj_mac, testtype): """ Start the SFC functional on the dut_node. @@ -42,7 +43,6 @@ class SFCTest(object): :type if1_adj_mac: str :type if2_adj_mac: str :type testtype: str - :returns: none :raises RuntimeError: If the script execute fails. """ @@ -61,9 +61,9 @@ class SFCTest(object): else: exec_shell = "set_sfc_sff.sh" - cmd = 'cd {0}/tests/nsh_sfc/sfc_scripts/ && sudo ./{1} {2} ' \ - '{3} {4} {5}'.format(con.REMOTE_FW_DIR, exec_shell, vpp_intf_name1, - vpp_intf_name2, if1_adj_mac, if2_adj_mac) + cmd = 'cd {0}/tests/nsh_sfc/sfc_scripts/ && sudo ./{1} {2} {3} {4} ' \ + '{5}'.format(con.REMOTE_FW_DIR, exec_shell, vpp_intf_name1, + vpp_intf_name2, if1_adj_mac, if2_adj_mac) (ret_code, _, _) = ssh.exec_command(cmd, timeout=600) if ret_code != 0: