[dts] [PATCH V1 3/5] framework/dut:add -d parameters in create_eal_parameters when use shared mode

Haiyang Zhao haiyangx.zhao at intel.com
Wed Jan 15 10:12:25 CET 2020


*.add -d parameters in create_eal_parameters. 
*.fix pep8 issues. 
*.when out returned by self.tester.send_ping is None,
  the judgement statement will cause an exception, fixed it.

Signed-off-by: Haiyang Zhao <haiyangx.zhao at intel.com>
---
 framework/dut.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/framework/dut.py b/framework/dut.py
index 5409b93..60745e6 100644
--- a/framework/dut.py
+++ b/framework/dut.py
@@ -190,7 +190,7 @@ class Dut(Crb):
                           + blank + b_ports_str \
                           + blank + no_pci \
                           + blank + vdev
-		self.prefix_list = []
+                self.prefix_list = []
             else:
                 eal_str = '-l ' + ','.join(map(str, core_list)) \
                           + blank + '-n %d' % self.get_memory_channels() \
@@ -215,12 +215,16 @@ class Dut(Crb):
                 eal_str = '-l ' + ','.join(map(str, core_list)) \
                           + blank + '-n %d' % self.get_memory_channels() \
                           + blank + pci_str
-		self.prefix_list = []
+                self.prefix_list = []
             else:
                 eal_str = '-l ' + ','.join(map(str, core_list)) \
                           + blank + '-n %d' % self.get_memory_channels() \
                           + blank + pci_str \
                           + blank + '--file-prefix=' + file_prefix
+        use_shared_lib = settings.load_global_setting(settings.HOST_SHARED_LIB_SETTING)
+        shared_lib_path = settings.load_global_setting(settings.HOST_SHARED_LIB_PATH)
+        if use_shared_lib == 'true' and shared_lib_path and 'Virt' not in str(self):
+            eal_str = eal_str + ' -d {}'.format(shared_lib_path)
 
         return eal_str
 
@@ -1185,7 +1189,7 @@ class Dut(Crb):
                         out = self.tester.send_ping6(
                             remotePort, ipv6, self.get_mac_address(dutPort))
 
-                    if ('64 bytes from' in out):
+                    if out and '64 bytes from' in out:
                         self.logger.info("PORT MAP: [dut %d: tester %d]" % (dutPort, remotePort))
                         self.ports_map[dutPort] = remotePort
                         hits[remotePort] = True
-- 
1.8.3.1



More information about the dts mailing list