[dts] [PATCH 1/2] framework: fix packet load function missed

[dts] [PATCH 1/2] framework: fix packet load function missed

[Yong Liu]

Signed-off-by: Marvin Liu <yong.liu@intel.com>

diff --git a/framework/packet.py b/framework/packet.py
index b151021..0fa4df9 100755
--- a/framework/packet.py
+++ b/framework/packet.py
@@ -48,7 +48,7 @@ from scapy.config import conf
 conf.use_pcap = True
 
 from scapy.all import conf
-from scapy.utils import struct, socket, wrpcap, rdpcap
+from scapy.utils import struct, socket, wrpcap, rdpcap, hexstr
 from scapy.layers.inet import Ether, IP, TCP, UDP, ICMP
 from scapy.layers.inet6 import IPv6, IPv6ExtHdrRouting, IPv6ExtHdrFragment
 from scapy.layers.l2 import Dot1Q, ARP, GRE
diff --git a/framework/settings.py b/framework/settings.py
index f76eadc..eabb72e 100644
--- a/framework/settings.py
+++ b/framework/settings.py
@@ -76,7 +76,7 @@ NICS = {
     'fortville_spirit_single': '8086:1584',
     'redrockcanyou': '8086:15a4',
     'fortpark':'8086:374c',
-    'fvl10g_vf':'8086:154c'
+    'fvl10g_vf':'8086:154c',
     'atwood': '8086:15d5',
 }
 
@@ -109,7 +109,7 @@ DRIVERS = {
     'fortville_spirit': 'i40e',
     'fortville_spirit_single': 'i40e',
     'redrockcanyou': 'fm10k',
-    'fvl10g_vf':'i40evf'
+    'fvl10g_vf':'i40evf',
     'atwood': 'fm10k',
 }
 
-- 
2.4.3

[dts] [PATCH 2/2] framework dut: fix hugepage not allocate to all numa

[Yong Liu]

From: Marvin Liu <yong.liu@intel.com>

When numa allocate only to numa 0, testpmd may failed to startup for NIC
attached to numa 1.

Signed-off-by: Marvin Liu <yong.liu@intel.com>

diff --git a/framework/dut.py b/framework/dut.py
index afb5204..bd437cb 100644
--- a/framework/dut.py
+++ b/framework/dut.py
@@ -289,21 +289,27 @@ class Dut(Crb):
             return
         hugepages_size = self.send_expect("awk '/Hugepagesize/ {print $2}' /proc/meminfo", "# ")
         total_huge_pages = self.get_total_huge_pages()
+        force_socket = False
 
         if int(hugepages_size) < (1024 * 1024):
             if self.architecture == "x86_64":
                 arch_huge_pages = hugepages if hugepages > 0 else 4096
             elif self.architecture == "i686":
                 arch_huge_pages = hugepages if hugepages > 0 else 512
+                force_socket = True
             # set huge pagesize for x86_x32 abi target
             elif self.architecture == "x86_x32":
                 arch_huge_pages = hugepages if hugepages > 0 else 256
+                force_socket = True
 
             if total_huge_pages != arch_huge_pages:
-                 # before all hugepage  average distribution  by all socket, 
-                 # but sometimes crete mbuf pool on socket 0 failed when setup testpmd, 
+                 # before all hugepage average distribution  by all socket,
+                 # but sometimes create mbuf pool on socket 0 failed when setup testpmd,
                  # so set all huge page on socket 0
-                self.set_huge_pages(arch_huge_pages, 0)
+                if force_socket:
+                    self.set_huge_pages(arch_huge_pages, 0)
+                else:
+                    self.set_huge_pages(arch_huge_pages)
 
         self.mount_huge_pages()
         self.hugepage_path = self.strip_hugepage_path()
-- 
2.4.3