diff options
| author | xu,gang <gangx.xu@intel.com> | 2016-09-08 16:55:47 +0800 |
|---|---|---|
| committer | Marvin Liu <yong.liu@intel.com> | 2016-09-09 09:28:12 +0800 |
| commit | c32db910b0d13b183ecabe2b645dc5c2c235df14 (patch) | |
| tree | 782899e4f816e9b19f44d4341a0f186695aa9f3d /nics | |
| parent | 7e143c4ba379da8523d101fe7b9e323dfe82ef80 (diff) | |
framework: fix pci domain address missing on FreeBSD
Signed-off-by: xu,gang <gangx.xu@intel.com>
Diffstat (limited to 'nics')
| -rw-r--r-- | nics/net_device.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nics/net_device.py b/nics/net_device.py index 2ad950e..39bd4e5 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,14 +212,15 @@ 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. """ + pci_str = "%s:%s:%s" % (domain_id, bus_id, devfun_id) out = self.__send_expect("pciconf -l", "# ") - rexp = r"(\w*)@pci0:%s" % bus_id + rexp = r"(\w*)@pci0:%s" % pci_str pattern = re.compile(rexp) match = pattern.findall(out) if len(match) == 0: @@ -307,7 +308,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. """ @@ -323,9 +324,9 @@ class NetDevice(object): 'get_mac_addr_freebsd_%s' % generic_driver) - return get_mac_addr_freebsd(intf, bus_id, devfun_id) + return get_mac_addr_freebsd(intf, domain_id, bus_id, devfun_id) - def get_mac_addr_freebsd_generic(self, intf, bus_id, devfun_id): + def get_mac_addr_freebsd_generic(self, intf, domain_id, bus_id, devfun_id): """ Get the MAC by the default way on Freebsd. """ |