commit 66f1b0d69323e0b53e8eca2a0cd0cbe58221b28e
Author: Ondrej Lichtner <olichtne(a)redhat.com>
Date: Fri Oct 4 16:14:58 2013 +0200
NetTestController: fix for configuration saving
We should only save information about dynamically created devices into
the file used for deconfiguration of previous config_only runs.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
lnst/Controller/NetTestController.py | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index e55c36d..d0a53ae 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -29,7 +29,7 @@ from lnst.Common.NetTestCommand import NetTestCommandContext,
NetTestCommand
from lnst.Common.NetTestCommand import str_command, CommandException
from lnst.Controller.RecipeParser import RecipeParser, RecipeError
from lnst.Controller.SlavePool import SlavePool
-from lnst.Controller.Machine import Machine, MachineError
+from lnst.Controller.Machine import Machine, MachineError, VirtualInterface
from lnst.Common.ConnectionHandler import send_data, recv_data
from lnst.Common.ConnectionHandler import ConnectionHandler
from lnst.Common.Config import lnst_config
@@ -426,9 +426,10 @@ class NetTestController:
machine["interfaces"] = []
for i in m._interfaces:
- hwaddr = i.get_orig_hwaddr()
+ if isinstance(i, VirtualInterface):
+ hwaddr = i.get_orig_hwaddr()
- machine["interfaces"].append(hwaddr)
+ machine["interfaces"].append(hwaddr)
config_data["bridges"] = bridges = []
for bridge in self._network_bridges.itervalues():
Show replies by date