@@ -533,6 +533,13 @@ class TestCase(object):
return bitrate * num_ports / 8 / (frame_size + 20)
+ def bind_nic_driver(self, ports, driver=""):
+ for port in ports:
+ netdev = self.dut.ports_info[port]['port']
+ driver_now = netdev.get_nic_driver()
+ driver_new = driver if driver else netdev.default_driver
+ if driver_new != driver_now:
+ netdev.bind_driver(driver=driver_new)
def skip_unsupported_pkg(pkgs):
"""
@@ -125,26 +125,10 @@ class TestDdpGtp(TestCase):
else:
if Q_strip is self.VF_Q_strip:
queue = res.group(1)
- else :
+ else:
queue = res.group(2)
return int(queue)
- def bind_nic_driver(self, ports, driver=""):
- if driver == "igb_uio":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def setup_vm_env(self, driver='igb_uio'):
"""
Create testing environment with VF generated from 1PF
@@ -72,24 +72,6 @@ class Testddp_mpls(TestCase):
def set_up(self):
self.setup_vm_env()
-
- def bind_nic_driver(self, ports, driver=""):
- if driver == "igb_uio":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
-
def setup_vm_env(self, driver='default'):
"""
Create testing environment with VF generated from 1PF
@@ -150,30 +150,6 @@ class TestIavf(TestCase):
self.vm0_testpmd = PmdOutput(self.vm_dut_0)
self.env_done = True
- def bind_nic_driver(self, ports, driver=""):
- # modprobe vfio driver
- if driver == "vfio-pci":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'vfio-pci':
- netdev.bind_driver(driver='vfio-pci')
- elif driver == "igb_uio":
- # igb_uio should insmod as default, no need to check
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def destroy_vm_env(self):
if getattr(self, 'vm0', None):
if getattr(self, 'vm_dut_0', None):
@@ -114,31 +114,6 @@ class TestKernelpfIavf(TestCase):
elif self.env_done is False:
self.setup_vm_env()
- def bind_nic_driver(self, ports, driver=""):
- # modprobe vfio driver
- if driver == "vfio-pci":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'vfio-pci':
- netdev.bind_driver(driver='vfio-pci')
-
- elif driver == "igb_uio":
- # igb_uio should insmod as default, no need to check
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver is None:
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def setup_vm_env(self, driver='default', set_vf_mac=True):
"""
Create testing environment with 1VF generated from 1PF
@@ -125,31 +125,6 @@ class TestPortControl(TestCase):
self.env_done = False
- def bind_nic_driver(self, ports, driver=""):
- # modprobe vfio driver
- if driver == "vfio-pci":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'vfio-pci':
- netdev.bind_driver(driver='vfio-pci')
-
- elif driver == "igb_uio":
- # igb_uio should insmod as default, no need to check
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver is None:
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def start_vf_pmd(self, terminal):
drive_info = terminal.send_expect("./usertools/dpdk-devbind.py -s", "#")
@@ -216,21 +216,6 @@ class TestShutdownApi(TestCase):
break
self.verify("Link status: up" in out, "VF link down!!!")
- def bind_nic_driver(self, ports, driver=""):
- if driver == "igb_uio":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
def setup_vm_env(self, driver='default'):
"""
Create testing environment with 1VF generated from 1PF
@@ -84,23 +84,6 @@ class TestVfDaemon(TestCase):
break
self.verify("Link status: up" in out, "VF link down!!!")
- def bind_nic_driver(self, ports, driver=""):
- if driver == "igb_uio":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
-
def setup_vm_env(self, driver='default'):
"""
Create testing environment with 2VFs generated from 1PF
@@ -84,31 +84,6 @@ class TestVfJumboFrame(TestCase):
def set_up(self):
pass
- def bind_nic_driver(self, ports, driver=""):
- # modprobe vfio driver
- if driver == "vfio-pci":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'vfio-pci':
- netdev.bind_driver(driver='vfio-pci')
-
- elif driver == "igb_uio":
- # igb_uio should insmod as default, no need to check
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == None:
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def setup_vm_env(self, driver='default'):
"""
Create testing environment with 1VF generated from 1PF
@@ -78,31 +78,6 @@ class TestVfVlan(TestCase):
def set_up(self):
self.setup_vm_env()
- def bind_nic_driver(self, ports, driver=""):
- # modprobe vfio driver
- if driver == "vfio-pci":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'vfio-pci':
- netdev.bind_driver(driver='vfio-pci')
-
- elif driver == "igb_uio":
- # igb_uio should insmod as default, no need to check
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def setup_vm_env(self, driver='default'):
"""
Create testing environment with 2VFs generated from 2PFs
@@ -112,15 +112,6 @@ class TestVirTioVhostCbdma(TestCase):
self.dut.send_expect("rm -rf /tmp/s0", "#")
self.mode_list = []
- def bind_nic_driver(self, ports, driver=""):
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def get_cbdma_ports_info_and_bind_to_dpdk(self, cbdma_num):
"""
get all cbdma ports
@@ -280,15 +280,6 @@ class TestVhostEventIdxInterrupt(TestCase):
session_info[sess_index].send_expect("^c", "#")
self.vm_dut[vm_index].close_session(session_info[sess_index])
- def bind_nic_driver(self, ports, driver=""):
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def get_cbdma_ports_info_and_bind_to_dpdk(self):
"""
get all cbdma ports
@@ -339,22 +339,6 @@ class TestVM2VMVirtioNetPerf(TestCase):
md5_revd = md5_revd[: md5_revd.find(' ')]
self.verify(md5_send == md5_revd, 'the received file is different with send file')
- def bind_nic_driver(self, ports, driver=""):
- if driver == "igb_uio":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def test_vm2vm_split_ring_iperf_with_tso(self):
"""
TestCase1: VM2VM split ring vhost-user/virtio-net test with tcp traffic
@@ -733,15 +733,6 @@ class TestVM2VMVirtioPMD(TestCase):
self.dut.send_expect('./usertools/dpdk-devbind.py -u %s' % self.device_str, '# ', 30)
self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=ioatdma %s' % self.device_str, '# ', 60)
- def bind_nic_driver(self, ports, driver=""):
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def tear_down(self):
#
# Run after each test case.
@@ -738,22 +738,6 @@ class TestVM2VMVirtioUser(TestCase):
self.dut.send_expect('./usertools/dpdk-devbind.py -u %s' % self.device_str, '# ', 30)
self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=ioatdma %s' % self.device_str, '# ', 60)
- def bind_nic_driver(self, ports, driver=""):
- if driver == "igb_uio":
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver = netdev.get_nic_driver()
- if driver != 'igb_uio':
- netdev.bind_driver(driver='igb_uio')
- else:
- for port in ports:
- netdev = self.dut.ports_info[port]['port']
- driver_now = netdev.get_nic_driver()
- if driver == "":
- driver = netdev.default_driver
- if driver != driver_now:
- netdev.bind_driver(driver=driver)
-
def test_vm2vm_virtio_user_split_virtqueue_inorder_mergeable_path_with_cbdma(self):
"""
Test Case 12: split virtqueue vm2vm inorder mergeable path multi-queues payload check with cbdma enabled