diff options
Diffstat (limited to 'resources/libraries/python/SFC')
| -rw-r--r-- | resources/libraries/python/SFC/SFCTest.py | 9 | ||||
| -rw-r--r-- | resources/libraries/python/SFC/VerifyPacket.py | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/resources/libraries/python/SFC/SFCTest.py b/resources/libraries/python/SFC/SFCTest.py index ec08efd17c..2584632af9 100644 --- a/resources/libraries/python/SFC/SFCTest.py +++ b/resources/libraries/python/SFC/SFCTest.py @@ -20,11 +20,12 @@ from resources.libraries.python.ssh import SSH 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. @@ -61,9 +62,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: diff --git a/resources/libraries/python/SFC/VerifyPacket.py b/resources/libraries/python/SFC/VerifyPacket.py index fd72bb296b..189301002c 100644 --- a/resources/libraries/python/SFC/VerifyPacket.py +++ b/resources/libraries/python/SFC/VerifyPacket.py @@ -20,11 +20,9 @@ import ipaddress from scapy.layers.inet import IP, UDP from scapy.all import Raw -from resources.libraries.python.constants import Constants as con from resources.libraries.python.SFC.SFCConstants import SFCConstants as sfccon from resources.libraries.python.SFC.TunnelProtocol import VxLAN, VxLANGPE, NSH -from robot.api import logger def valid_ipv4(ipaddr): """Check if IP address has the correct IPv4 address format. @@ -185,9 +183,9 @@ class VerifyPacket(object): recv_pkt_len = len(ether) if recv_pkt_len != expect_pkt_len: - raise RuntimeError("Received packet size {0} not " \ - "the expect size {1}".format(recv_pkt_len, \ - expect_pkt_len)) + raise RuntimeError("Received packet size {0} not " + "the expect size {1}".format(recv_pkt_len, + expect_pkt_len)) if not ether.haslayer(IP): raise RuntimeError("Not a IPv4 packet") |