[node-patches] Change in ovirt-node[master]: setup: IP for tagged and bridged NIC

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: setup: IP for tagged and bridged NIC
......................................................................

setup: IP for tagged and bridged NIC

Previously the IP informations weren't shown correctly on the
status page, because the logic handled tagged and bridged NICs
incorrectly.
Now the logic has been updated and IP informations can be correctly
displayed for tagged and bridged NICs.

Change-Id: I8cf1bb292ffe3c578f4690a55feea22a926f1918
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1051745
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/setup/core/status_page.py
1 file changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/61/25061/1

diff --git a/src/ovirt/node/setup/core/status_page.py b/src/ovirt/node/setup/core/status_page.py
index 02727b8..7a97df9 100644
--- a/src/ovirt/node/setup/core/status_page.py
+++ b/src/ovirt/node/setup/core/status_page.py
@@ -46,15 +46,12 @@
         return 0
 
     def model(self):
-        bootif = defaults.Network().retrieve()["iface"]
-        vlanid = defaults.Network().retrieve()["vlanid"]
-        if vlanid:
-            bootif = "%s.%s" % (bootif, vlanid)
-
         mng = defaults.Management()
         managementifs = mng.retrieve()["managed_ifnames"]
 
-        primaryif = managementifs[0] if managementifs else bootif
+        # If prmiaryif == None, then the corretc NIC will be automatically be
+        # determined
+        primaryif = managementifs[0] if managementifs else None
 
         self.logger.debug("NIC for status: %s" % primaryif)
 


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

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