[dts] [PATCH] framework: DUT and Tester coexisted in the same platform

Yong Liu yong.liu at intel.com
Mon Jan 26 05:52:55 CET 2015


This patch based on "[PATCH 0/4] Support additional port configuration file".
And do not support to run softwore performance test in the same platform.

Fix one bug in pci numa parse.

Signed-off-by: Marvinliu <yong.liu at intel.com>
---
 framework/config.py | 5 ++++-
 framework/tester.py | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/framework/config.py b/framework/config.py
index 140c84b..948609a 100755
--- a/framework/config.py
+++ b/framework/config.py
@@ -79,7 +79,10 @@ class UserConf():
 
         for param in port.split(','):
             (key, _, value) = param.partition('=')
-            portDict[key] = value
+            if key == 'numa':
+                portDict[key] = int(value)
+            else:
+                portDict[key] = value
         return portDict
 
 
diff --git a/framework/tester.py b/framework/tester.py
index 345ab41..b35a359 100644
--- a/framework/tester.py
+++ b/framework/tester.py
@@ -287,6 +287,10 @@ class Tester(Crb):
                 if hits[localPort]:
                     continue
 
+                # skip ping self port
+                if (self.crb['IP'] == self.crb['tester IP']) and (self.dut.ports_info[dutPort]['pci'] == self.ports_info[localPort]['pci']):
+                    continue
+                
                 ipv6 = self.dut.get_ipv6_address(dutPort)
                 if ipv6 == "Not connected":
                     continue
@@ -440,7 +444,6 @@ class Tester(Crb):
         """
         if not self.has_external_traffic_generator():
             self.alt_session.send_expect('killall scapy 2>/dev/null; echo tester', '# ', 5)
-            super(Tester, self).kill_all()
 
     def close(self):
         """
-- 
1.8.1.4



More information about the dts mailing list