[dts] [PATCH V1 1/3] solve dts compile error on freesbd

[dts] [PATCH V1 1/3] solve dts compile error on freesbd

[xu,gang]

Signed-off-by: xu,gang <gangx.xu@intel.com>
---
 framework/dut.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/dut.py b/framework/dut.py
index 2f4e53a..d92713b 100644
--- a/framework/dut.py
+++ b/framework/dut.py
@@ -726,7 +726,7 @@ class Dut(Crb):
                                                       skipped))
                 continue
 
-            port = GetNicObj(self, pci_bus, '')
+            port = GetNicObj(self, '',pci_bus, '')
             intf = port.get_interface_name()
 
             macaddr = port.get_mac_addr()
-- 
1.9.3

[dts] [PATCH V1 2/3] solve dts compile error on freesbd

[xu,gang]

Signed-off-by: xu,gang <gangx.xu@intel.com>
---
 framework/crb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/crb.py b/framework/crb.py
index 066bb3f..c5faa3e 100644
--- a/framework/crb.py
+++ b/framework/crb.py
@@ -281,7 +281,7 @@ class Crb(object):
             return None
         return match.group(1)
 
-    def get_pci_dev_driver_freebsd(self, bus_id, devfun_id):
+    def get_pci_dev_driver_freebsd(self, domain_id,bus_id, devfun_id):
         """
         Get the driver of specified pci device.
         """
-- 
1.9.3

[dts] [PATCH V1 3/3] solve dts compile error on freesbd

[xu,gang]

Signed-off-by: xu,gang <gangx.xu@intel.com>
---
 nics/net_device.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nics/net_device.py b/nics/net_device.py
index 897ceb9..b3cd967 100644
--- a/nics/net_device.py
+++ b/nics/net_device.py
@@ -136,7 +136,7 @@ class NetDevice(object):
             socket = -1
         return socket
 
-    def get_nic_socket_freebsd(self, bus_id, devfun_id):
+    def get_nic_socket_freebsd(self, domain_id,bus_id, devfun_id):
         NotImplemented
 
     @nic_has_driver
@@ -200,7 +200,7 @@ class NetDevice(object):
             domain_id, bus_id, devfun_id)
         return self.__send_expect(command, '# ')
 
-    def get_interface_name_freebsd(self, bus_id, devfun_id, driver):
+    def get_interface_name_freebsd(self, domain_id,bus_id, devfun_id, driver):
         """
         Get interface name of specified pci device on Freebsd.
         """
@@ -212,9 +212,9 @@ class NetDevice(object):
             get_interface_name_freebsd = getattr(self,
                                                  'get_interface_name_freebsd_%s' % generic_driver)
 
-        return get_interface_name_freebsd(bus_id, devfun_id)
+        return get_interface_name_freebsd(domain_id,bus_id, devfun_id)
 
-    def get_interface_name_freebsd_generic(self, bus_id, devfun_id):
+    def get_interface_name_freebsd_generic(self,domain_id,bus_id, devfun_id):
         """
         Get the interface name by the default way on freebsd.
         """
@@ -307,7 +307,7 @@ class NetDevice(object):
                    (domain_id, bus_id, devfun_id, virtio, intf))
         return self.__send_expect(command, '# ')
 
-    def get_mac_addr_freebsd(self, intf, bus_id, devfun_id, driver):
+    def get_mac_addr_freebsd(self, intf, domain_id,bus_id, devfun_id, driver):
         """
         Get mac address of specified pci device on Freebsd.
         """
-- 
1.9.3

Re: [dts] [PATCH V1 1/3] solve dts compile error on FreeBSD

[Xu, HuilongX]

Acked-by: huilong <huilongx.xu@intel.com>

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of xu,gang
> Sent: Tuesday, August 30, 2016 5:52 PM
> To: dts@dpdk.org
> Cc: Xu, GangX
> Subject: [dts] [PATCH V1 1/3] solve dts compile error on freesbd
> 
> Signed-off-by: xu,gang <gangx.xu@intel.com>
> ---
>  framework/dut.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/framework/dut.py b/framework/dut.py
> index 2f4e53a..d92713b 100644
> --- a/framework/dut.py
> +++ b/framework/dut.py
> @@ -726,7 +726,7 @@ class Dut(Crb):
>                                                        skipped))
>                  continue
> 
> -            port = GetNicObj(self, pci_bus, '')
> +            port = GetNicObj(self, '',pci_bus, '')
>              intf = port.get_interface_name()
> 
>              macaddr = port.get_mac_addr()
> --
> 1.9.3

Re: [dts] [PATCH V1 1/3] solve dts compile error on freesbd

[Liu, Yong]

Hi Gang, NIC object should input three parameter. If NIC object initialized with incorrect parameters, it may cause error when called some methods.

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of xu,gang
> Sent: Tuesday, August 30, 2016 5:52 PM
> To: dts@dpdk.org
> Cc: Xu, GangX
> Subject: [dts] [PATCH V1 1/3] solve dts compile error on freesbd
> 
> Signed-off-by: xu,gang <gangx.xu@intel.com>
> ---
>  framework/dut.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/framework/dut.py b/framework/dut.py
> index 2f4e53a..d92713b 100644
> --- a/framework/dut.py
> +++ b/framework/dut.py
> @@ -726,7 +726,7 @@ class Dut(Crb):
>                                                        skipped))
>                  continue
> 
> -            port = GetNicObj(self, pci_bus, '')
> +            port = GetNicObj(self, '',pci_bus, '')
>              intf = port.get_interface_name()
> 
>              macaddr = port.get_mac_addr()
> --
> 1.9.3