[dts] [PATCH v2 1/6] framework tester: NIC object get from net_device module
Yong Liu
yong.liu at intel.com
Tue Jan 19 02:38:06 CET 2016
All nic object should get from net device module. If object has been
initalized, there's no need to re-instantiated it.
Signed-off-by: Marvin Liu <yong.liu at intel.com>
diff --git a/framework/tester.py b/framework/tester.py
index c8cebd6..d3dab04 100644
--- a/framework/tester.py
+++ b/framework/tester.py
@@ -37,7 +37,7 @@ import re
from time import sleep
from settings import NICS
from crb import Crb
-from net_device import NetDevice
+from net_device import GetNicObj
from etgen import IxiaPacketGenerator, SoftwarePacketGenerator
from settings import IXIA
import random
@@ -201,7 +201,7 @@ class Tester(Crb):
try:
for (pci_bus, pci_id) in self.pci_devices_info:
addr_array = pci_bus.split(':')
- port = NetDevice(self, addr_array[0], addr_array[1])
+ port = GetNicObj(self, addr_array[0], addr_array[1])
itf = port.get_interface_name()
self.enable_ipv6(itf)
self.send_expect("ifconfig %s up" % itf, "# ")
@@ -266,7 +266,7 @@ class Tester(Crb):
if port_info['type'] == 'ixia':
continue
- port = NetDevice(self, port_info['pci'], port_info['type'])
+ port = GetNicObj(self, port_info['pci'], port_info['type'])
intf = port.get_interface_name()
self.logger.info("Tester cached: [000:%s %s] %s" % (
@@ -290,7 +290,7 @@ class Tester(Crb):
bus_id = addr_array[0]
devfun_id = addr_array[1]
- port = NetDevice(self, bus_id, devfun_id)
+ port = GetNicObj(self, bus_id, devfun_id)
intf = port.get_interface_name()
if "No such file" in intf:
@@ -496,7 +496,7 @@ class Tester(Crb):
pkt = pkt_c(pkt_type=pkt_type,
pkt_len=random.randint(64, 1514),
ran_payload=True)
- # config packet if has parameters
+
if params and len(portList) == len(params):
for param in params:
layer, config = param
--
1.9.3
More information about the dts
mailing list