From 8957b86380f433fb1b91338ac3dd535d11ccfe7c Mon Sep 17 00:00:00 2001
From: Ido Barnea <ibarnea@cisco.com>
Date: Sun, 5 Feb 2017 16:48:55 +0200
Subject: Changes to our files to make dpdk1702 work

Signed-off-by: Ido Barnea <ibarnea@cisco.com>
---
 .../regression/stateless_tests/stl_rx_test.py      | 25 ++++++++++++++--------
 scripts/dpdk_setup_ports.py                        | 16 ++++++++------
 2 files changed, 25 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/scripts/automation/regression/stateless_tests/stl_rx_test.py b/scripts/automation/regression/stateless_tests/stl_rx_test.py
index 3d4ed977..e0f32a78 100644
--- a/scripts/automation/regression/stateless_tests/stl_rx_test.py
+++ b/scripts/automation/regression/stateless_tests/stl_rx_test.py
@@ -10,13 +10,13 @@ class STLRX_Test(CStlGeneral_Test):
 
     def setUp(self):
         per_driver_params = {
-                'rte_vmxnet3_pmd': {
+                'net_vmxnet3': {
                         'rate_percent': 1,
                         'total_pkts': 50,
                         'rate_latency': 1,
                         'latency_9k_enable': False,
                         },
-                'rte_ixgbe_pmd': {
+                'net_ixgbe': {
                         'rate_percent': 30,
                         'total_pkts': 1000,
                         'rate_latency': 1,
@@ -24,7 +24,14 @@ class STLRX_Test(CStlGeneral_Test):
                         'latency_9k_max_average': 300,
                         'latency_9k_max_latency': 400,
                         },
-                'rte_i40e_pmd': {
+                'net_ixgbe_vf': {
+                        'rate_percent': 30,
+                        'total_pkts': 1000,
+                        'rate_latency': 1,
+                        'latency_9k_enable': False,
+                        },
+
+                'net_i40e': {
                         'rate_percent': 80,
                         'total_pkts': 1000,
                         'rate_latency': 1,
@@ -32,25 +39,25 @@ class STLRX_Test(CStlGeneral_Test):
                         'latency_9k_max_average': 100,
                         'latency_9k_max_latency': 250,
                         },
-                'rte_i40evf_pmd': {
+                'net_i40e_vf': {
                         'rate_percent': 80,
                         'total_pkts': 1000,
                         'rate_latency': 1,
                         'latency_9k_enable': False,
                         },
-                'rte_igb_pmd': {
+                'net_e1000_igb': {
                         'rate_percent': 80,
                         'total_pkts': 500,
                         'rate_latency': 1,
                         'latency_9k_enable': False,
                         },
-                'rte_em_pmd': {
+                'net_e1000_em': {
                         'rate_percent': 1,
                         'total_pkts': 50,
                         'rate_latency': 1,
                         'latency_9k_enable': False,
                         },
-                'rte_virtio_pmd': {
+                'net_virtio': {
                         'rate_percent': 1,
                         'total_pkts': 50,
                         'rate_latency': 1,
@@ -67,7 +74,7 @@ class STLRX_Test(CStlGeneral_Test):
                         'latency_9k_max_latency': 250,
                         },
 
-                 'rte_enic_pmd': {
+                 'net_enic': {
                         'rate_percent': 1,
                         'total_pkts': 50,
                         'rate_latency': 1,
@@ -93,7 +100,7 @@ class STLRX_Test(CStlGeneral_Test):
         self.cap = cap
 
         drv_name = port_info['driver']
-        if drv_name == 'rte_ixgbe_pmd':
+        if drv_name == 'net_ixgbe':
             self.ipv6_support = False
         else:
             self.ipv6_support = True
diff --git a/scripts/dpdk_setup_ports.py b/scripts/dpdk_setup_ports.py
index b2c9eb09..8915788d 100755
--- a/scripts/dpdk_setup_ports.py
+++ b/scripts/dpdk_setup_ports.py
@@ -573,13 +573,15 @@ Other network devices
                 if not dpdk_nic_bind.confirm('Confirm (y/N):'):
                     return
         drivers_table = {
-            'rte_ixgbe_pmd': 'ixgbe',
-            'rte_igb_pmd': 'igb',
-            'rte_i40e_pmd': 'i40e',
-            'rte_em_pmd': 'e1000',
-            'rte_vmxnet3_pmd': 'vmxnet3',
-            'rte_virtio_pmd': 'virtio-pci',
-            'rte_enic_pmd': 'enic',
+            'net_ixgbe': 'ixgbe',
+            'net_ixgbe_vf': 'ixgbe_vf',
+            'net_e1000_igb': 'e1000_igb',
+            'net_i40e': 'i40e',
+            'net_i40e_vf': 'i40e_vf',
+            'net_e1000_em': 'e1000_em',
+            'net_vmxnet3': 'vmxnet3',
+            'net_virtio': 'virtio-pci',
+            'net_enic': 'enic',
         }
         for pci, info in dpdk_nic_bind.get_info_from_trex(dpdk_interfaces).items():
             if pci not in self.m_devices:
-- 
cgit 1.2.3-korg