test suite reviews and discussions
 help / color / mirror / Atom feed
From: Raslan Darawsheh <rasland@mellanox.com>
To: dts@dpdk.org
Cc: rdarawsheh@asaltech.com
Subject: [dts] [PATCH 5/6] framework:net_device : adding function get_interface_name_Mellanox to get the ConnectX_3_Pro interfaces
Date: Tue, 27 Oct 2015 08:07:54 +0200	[thread overview]
Message-ID: <1445926076-31279-5-git-send-email-rasland@mellanox.com> (raw)
In-Reply-To: <1445926076-31279-1-git-send-email-rasland@mellanox.com>

From: Raslsn Darawsheh <rdarawsheh@asaltech.com>

Signed-off-by: Raslsn Darawsheh <rdarawsheh@asaltech.com>
---
 framework/net_device.py | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/framework/net_device.py b/framework/net_device.py
index 37495bd..ac121cc 100644
--- a/framework/net_device.py
+++ b/framework/net_device.py
@@ -127,17 +127,42 @@ class NetDevice(object):
         Get interface name of specified pci device.
         Cal this function will update intf_name everytime
         """
-        get_interface_name = getattr(
-            self, 'get_interface_name_%s' %
-            self.__get_os_type())
-        out = get_interface_name(self.bus_id, self.devfun_id, self.current_driver)
-        if "No such file or directory" in out:
-            self.intf_name = 'N/A'
+        if self.crb.isMellanox and self.crb.mellanoxCardType == "cx3":
+            self.intf_name = self.get_interface_name_Mellanox(self.bus_id,self.devfun_id)
         else:
-            self.intf_name = out
+            get_interface_name = getattr(
+                self, 'get_interface_name_%s' %
+                self.__get_os_type())
+            out = get_interface_name(self.bus_id, self.devfun_id, self.current_driver)
+            if "No such file or directory" in out:
+                self.intf_name = 'N/A'
+            else:
+                self.intf_name = out
 
         return self.intf_name
 
+    def get_interface_name_Mellanox(self,bus_id,devfun_id):
+        """
+        Get interface name of specified pci device for Mellanox.
+        """
+        command = 'ls --color=never /sys/bus/pci/devices/0000:%s:%s/net' % (bus_id, devfun_id)
+        out = self.crb.send_expect(command, '# ', verify=True)
+
+        if out == -1:
+            name = ""
+        else:
+            if self.crb.mellanoxPortCount == 0 :
+                name = out.split()[0]
+                self.crb.mellanoxPortCount = 1
+            else :
+                if len(out.split()) < 2 :
+                    self.crb.isMellanox = False
+                    name = out.split()[0]
+                    return name
+                name = out.split()[1]
+                self.crb.mellanoxPortCount = 0
+        return name
+
     def get_interface_name_linux(self, bus_id, devfun_id, driver):
         """
         Get interface name of specified pci device on linux.
-- 
1.8.3.1

  parent reply	other threads:[~2015-10-27  6:08 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-27  6:07 [dts] [PATCH 1/6] framework: crb :add some parameters and check_Mellanox_pci function to identify mellanox device Raslan Darawsheh
2015-10-27  6:07 ` [dts] [PATCH 2/6] framework:dut : excluding mellanox NICs from beeing binded Raslan Darawsheh
2015-10-27  6:07 ` [dts] [PATCH 3/6] framework:settings :adding new defines for ConnectX_3_Pro and ConnectX_4 and there drivers Raslan Darawsheh
2015-10-27  6:07 ` [dts] [PATCH 4/6] framewark:project_dpdk : Enable MLX4 and MLX5 PMD's before compiling and disable binding Raslan Darawsheh
2015-10-27  6:07 ` Raslan Darawsheh [this message]
2015-10-27  6:07 ` [dts] [PATCH 6/6] framework:tester: adding ConnectX_3_Pro second port to the list of ports Raslan Darawsheh
2015-10-27  6:07 ` [dts] [PATCH] fix queue start/stop case failed Raslan Darawsheh
2015-10-29  2:00 ` [dts] [PATCH 1/6] framework: crb :add some parameters and check_Mellanox_pci function to identify mellanox device Xu, HuilongX
2015-10-29  8:04   ` Raslan Darawsheh
2015-10-29  8:48     ` Xu, HuilongX
2015-10-29  9:58       ` Raslan Darawsheh
2015-10-29 10:10         ` Xu, HuilongX
2015-11-10  6:32           ` Raslan Darawsheh
2015-11-10  8:12             ` Liu, Yong
2016-01-18 11:18             ` Raslan Darawsheh
2016-01-19  6:05               ` Liu, Yong
2016-01-19  9:26                 ` Raslan Darawsheh
2016-01-20  9:24                   ` Liu, Yong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445926076-31279-5-git-send-email-rasland@mellanox.com \
    --to=rasland@mellanox.com \
    --cc=dts@dpdk.org \
    --cc=rdarawsheh@asaltech.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).