4:49 a.m.
Method get_device_by_params searches for device that matches provided
parameters.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
lnst/Slave/InterfaceManager.py | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py
index 09f3be9..439ced4 100644
--- a/lnst/Slave/InterfaceManager.py
+++ b/lnst/Slave/InterfaceManager.py
@@ -157,6 +157,21 @@ class InterfaceManager(object):
return dev
return None
+ def get_device_by_params(self, params):
+ matched = None
+ for dev in self._devices.values():
+ matched = dev
+ dev_data = dev.get_if_data()
+ for key, value in params.iteritems():
+ if key not in dev_data or dev_data[key] != value:
+ matched = None
+ break
+
+ if matched:
+ break
+
+ return matched
+
def deconfigure_all(self):
for dev in self._devices.itervalues():
dev.clear_configuration()
--
2.1.0
4:50 a.m.
New subject: [PATCH v3 2/5] Slave: add get_devices_by_params to SlaveMethods
Method get_devices_by_params can be used for more variable queries for
example query by both driver name and hardware address. Basically
everything that provides Device::get_if_data(). Method has one parameter
params that is a dictionary of queried parameter key-values.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
lnst/Slave/NetTestSlave.py | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py
index 775d4a5..23fd009 100644
--- a/lnst/Slave/NetTestSlave.py
+++ b/lnst/Slave/NetTestSlave.py
@@ -154,6 +154,23 @@ class SlaveMethods:
return matched
+ def get_devices_by_params(self, params):
+ devices = self._if_manager.get_devices()
+ matched = []
+ for dev in devices:
+ dev_data = dev.get_if_data()
+ entry = {"name": dev.get_name(),
+ "hwaddr": dev.get_hwaddr()}
+ for key, value in params.iteritems():
+ if key not in dev_data or dev_data[key] != value:
+ entry = None
+ break
+
+ if entry is not None:
+ matched.append(entry)
+
+ return matched
+
def get_if_data(self, if_id):
dev = self._if_manager.get_mapped_device(if_id)
if dev is None:
--
2.1.0
4:50 a.m.
New subject: [PATCH v3 3/5] Slave: add map_if_by_params to SlaveMethods
Method map_if_by_params provides ability to map interface based on more
variable query. For example to map interface based on hardware address
and driver (e.g. loopback).
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
lnst/Slave/NetTestSlave.py | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py
index 23fd009..b66dfd1 100644
--- a/lnst/Slave/NetTestSlave.py
+++ b/lnst/Slave/NetTestSlave.py
@@ -120,6 +120,15 @@ class SlaveMethods:
return devices
+ def map_if_by_params(self, if_id, params):
+ devices = self.get_devices_by_params(params)
+
+ if len(devices) == 1:
+ dev = self._if_manager.get_device_by_params(params)
+ self._if_manager.map_if(if_id, dev.get_if_index())
+
+ return devices
+
def unmap_if(self, if_id):
self._if_manager.unmap_if(if_id)
return True
--
2.1.0
4:51 a.m.
New subject: [PATCH v3 4/5] Slave: use map_if_py_params in map_if_by_hwaddr
Method map_if_by_hwaddr can use map_if_by_params now.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
lnst/Slave/NetTestSlave.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py
index b66dfd1..a37fe78 100644
--- a/lnst/Slave/NetTestSlave.py
+++ b/lnst/Slave/NetTestSlave.py
@@ -112,11 +112,7 @@ class SlaveMethods:
return "Commands killed"
def map_if_by_hwaddr(self, if_id, hwaddr):
- devices = self.get_devices_by_hwaddr(hwaddr)
-
- if len(devices) == 1:
- dev = self._if_manager.get_device_by_hwaddr(hwaddr)
- self._if_manager.map_if(if_id, dev.get_if_index())
+ devices = self.map_if_by_params(if_id, {'hwaddr' : hwaddr})
return devices
--
2.1.0
4:51 a.m.
New subject: [PATCH v3 5/5] Controller: fix loopback address conflict with other soft device addresses
This patch fixes bug when more devices with mac address
00:00:00:00:00:00 is present when recipe starts (this might happen if a
user works with tunneling devices that usually have this mac address).
As result map_if_by_hwaddr returns more than one device and device
cannot be mapped. The solution is to map loopback interface based on
mac address and driver.
Fixes issue #133.
Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
lnst/Controller/Machine.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lnst/Controller/Machine.py b/lnst/Controller/Machine.py
index e60e1ea..610d6ab 100644
--- a/lnst/Controller/Machine.py
+++ b/lnst/Controller/Machine.py
@@ -803,12 +803,18 @@ class LoopbackInterface(Interface):
def configure(self):
self._hwaddr = '00:00:00:00:00:00'
+ self._driver = 'loopback'
+
if self._netns:
phys_devs = self._machine._rpc_call_to_netns(self._netns,
- "map_if_by_hwaddr", self._id,
self._hwaddr)
+ "map_if_by_params", self._id,
+ { 'hwaddr': self._hwaddr,
+ 'driver': self._driver })
else:
- phys_devs = self._machine._rpc_call("map_if_by_hwaddr",
- self._id, self._hwaddr)
+ phys_devs = self._machine._rpc_call("map_if_by_params",
+ self._id,
+ { 'hwaddr': self._hwaddr,
+ 'driver': self._driver })
if len(phys_devs) == 1:
self.set_devname(phys_devs[0]["name"])
--
2.1.0
3166
days inactive
3166
days old
lnst-developers@lists.fedorahosted.org
5 comments
2 participants
participants (2)
-
Jan Tluka -
Ondrej Lichtner