[dts] [PATCH v2 13/17] tests/vf_daemon: Replace sniff_packets to tester.tcpdump_sniff_packets

[Phil Yang]

Make sniff_packet running on the tester. Create a ssh connection to the
tester then call tcpdump.

Signed-off-by: Phil Yang <phil.yang at arm.com>
---
 tests/TestSuite_vf_daemon.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py
index b1ad522..15a95d7 100644
--- a/tests/TestSuite_vf_daemon.py
+++ b/tests/TestSuite_vf_daemon.py
@@ -8,7 +8,6 @@ from scapy.utils import rdpcap
 from qemu_kvm import QEMUKvm
 from test_case import TestCase
 from pmd_output import PmdOutput
-from packet import Packet, sniff_packets, load_sniff_packets
 from settings import get_nic_name
 import random
 
@@ -154,7 +153,7 @@ class Testvf_daemon(TestCase):
             pkt.config_layer('vlan', {'vlan': vlan_id})
         pkt.config_layer('ether', {'dst': dst_mac})
 
-        inst = sniff_packets(self.tester_intf, timeout=30)
+        inst = self.tester.tcpdump_sniff_packets(self.tester_intf, timeout=30)
         pkt.send_pkt(tx_port=self.tester_intf, count=num)
         return inst
 
@@ -162,7 +161,8 @@ class Testvf_daemon(TestCase):
         """
         Load sniff packets, strip and return mac address from dump message
         """
-        pkts = load_sniff_packets(inst)
+        self.tester.session.copy_file_from("/tmp/sniff_%s.pcap" % self.tester_intf, "/tmp/")
+        pkts = self.tester.load_tcpdump_sniff_packets(inst)
         macs = []
         for pkt in pkts:
             mac = pkt.strip_element_layer2(element)
@@ -173,7 +173,8 @@ class Testvf_daemon(TestCase):
         """
         Load sniff packets, strip and return vlan id from dump message
         """
-        pkts = load_sniff_packets(inst)
+        self.tester.session.copy_file_from("/tmp/sniff_%s.pcap" % self.tester_intf, "/tmp/")
+        pkts = self.tester.load_tcpdump_sniff_packets(inst)
         vlans = []
         for pkt in pkts:
             vlan = pkt.strip_element_vlan("vlan")
@@ -422,7 +423,7 @@ class Testvf_daemon(TestCase):
         self.dut_testpmd.execute_cmd('set tx loopback 0 off')
         time.sleep(5)
 
-        inst = sniff_packets(self.tester_intf, timeout=10)
+        inst = self.tester.tcpdump_sniff_packets(self.tester_intf, timeout=10)
 
         self.vm1_testpmd.execute_cmd('set burst 5')
         self.vm1_testpmd.execute_cmd('start tx_first')
@@ -438,7 +439,7 @@ class Testvf_daemon(TestCase):
         self.dut_testpmd.execute_cmd('set tx loopback 0 on')
         time.sleep(3)
 
-        inst = sniff_packets(self.tester_intf, timeout=10)
+        inst = self.tester.tcpdump_sniff_packets(self.tester_intf, timeout=10)
 
         self.vm1_testpmd.execute_cmd('stop')
         self.vm1_testpmd.execute_cmd('start tx_first')
-- 
2.7.4