[node-patches] Change in ovirt-node[master]: ui: Correct network status also in case of a vlan

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: ui: Correct network status also in case of a vlan
......................................................................

ui: Correct network status also in case of a vlan

Previously an incorrect network status was displayed when a vlan was
assigned to the main NIC, this is fixed now.

Change-Id: I000979673a25b390b780466c5a588ff00591f289
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/tui/src/ovirt/node/config/network.py
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/52/11752/1

diff --git a/scripts/tui/src/ovirt/node/config/network.py b/scripts/tui/src/ovirt/node/config/network.py
index 1aa22c3..7e3d668 100644
--- a/scripts/tui/src/ovirt/node/config/network.py
+++ b/scripts/tui/src/ovirt/node/config/network.py
@@ -198,8 +198,11 @@
     """
     bridge = None
     model = defaults.Network()
-    bootif = model.retrieve()["iface"]
-    if bootif:
-        nic = Ifcfg(bootif)
+    iface = model.retrieve()["iface"]
+    vlan = model.retrieve()["vlanid"]
+    if iface:
+        if vlan is not None:
+            iface = "%s.%s" % (iface, vlan)
+        nic = Ifcfg(iface)
         bridge = nic.bridge
-    return bridge
\ No newline at end of file
+    return bridge


--
To view, visit http://gerrit.ovirt.org/11752
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I000979673a25b390b780466c5a588ff00591f289
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>