[node-patches] Change in ovirt-node[master]: tui: Translate bootprotocol 'none' to 'static'

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: tui: Translate bootprotocol 'none' to 'static'
......................................................................

tui: Translate bootprotocol 'none' to 'static'

Previosuly the TUI displayed 'none' on the Status page, if a static IP
configuration was used.
Now the correct term 'static' is used. The problem was that the TUI
passed the low-level BOOTPROTO variable from ifcfg-* to the TUI, where
'none' is the correct value for static IP configurations.

Change-Id: I1d28b056657e632d5553b5881767acb42511c935
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/ovirt-config-setup.py
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/23/8023/1

diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py
index c9e6e67..fa0f931 100755
--- a/scripts/ovirt-config-setup.py
+++ b/scripts/ovirt-config-setup.py
@@ -739,20 +739,21 @@
                     dev_bootproto = augtool_get(cmd)
                     if dev_bootproto is None:
                         dev_bootproto = "Disabled"
+                dev_bootproto = dev_bootproto.strip().lower().replace("none", "static")
                 if not nic_link_detected(key):
                     ipv4_addr = "(Link Inactive)"
-                if ipv4_addr.strip() == "" and dev_bootproto.strip() == "dhcp":
+                if ipv4_addr.strip() == "" and dev_bootproto == "dhcp":
                     if "Inactive" in ipv4_addr:
                         ipv4_addr = "(Link Inactive)"
                     else:
                         ipv4_addr = "(DHCP Failed)"
                 if "OVIRT_IPV6" in OVIRT_VARS and ipv6_addr != "":
                         status_text += "%1s: %5s %14s \nIPv6: %1s\n\n" % (
-                                        key.strip(), dev_bootproto.strip(),
+                                        key.strip(), dev_bootproto,
                                         ipv4_addr.strip(), ipv6_addr.strip())
                 else:
                     status_text += "%1s: %5s %14s \n" % (key.strip(),
-                                    dev_bootproto.strip(), ipv4_addr.strip())
+                                    dev_bootproto, ipv4_addr.strip())
                 status_text.strip()
                 networking = TextboxReflowed(32, status_text, maxHeight=3)
                 networking.setText(status_text)


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

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