[node-patches] Change in ovirt-node[master]: ui: Select static bootprotocol

fabiand at fedoraproject.org fabiand at fedoraproject.org
Fri Jul 5 11:13:48 UTC 2013


Fabian Deutsch has uploaded a new change for review.

Change subject: ui: Select static bootprotocol
......................................................................

ui: Select static bootprotocol

Previously the bootprotocol was set incorrectly when a NIC had a static
IP. The bootprotocol was set to Disabled instead of Static.
Now Static is selected when a static IP is set.

Change-Id: Ib9a77ef28318c1ce16fb311e62ed6134785e19fc
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/setup/core/network_page.py
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/08/16508/1

diff --git a/src/ovirt/node/setup/core/network_page.py b/src/ovirt/node/setup/core/network_page.py
index 1bdb150..1656e6b 100644
--- a/src/ovirt/node/setup/core/network_page.py
+++ b/src/ovirt/node/setup/core/network_page.py
@@ -442,12 +442,16 @@
                                                          ip6model["gateway"],
                                                          ip6model["bootproto"])
 
+        bootproto = model["bootproto"]
         if model["bootproto"] == "dhcp":
             if nic.exists():
                 routes = utils.network.Routes()
                 gateway = routes.default()
                 ipaddr, netmask = nic.ipv4_address().items()
                 vlanid = ",".join(nic.vlanids())
+        else:
+            if ipaddr:
+                bootproto = "static"
 
         link_status_txt = ("Connected" if nic.has_link()
                            else "Disconnected")
@@ -459,7 +463,7 @@
             "dialog.nic.link_status": link_status_txt,
             "dialog.nic.hwaddress": nic.hwaddr,
 
-            "dialog.nic.ipv4.bootproto": model["bootproto"],
+            "dialog.nic.ipv4.bootproto": bootproto,
             "dialog.nic.ipv4.address": ipaddr,
             "dialog.nic.ipv4.netmask": netmask,
             "dialog.nic.ipv4.gateway": gateway,


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

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



More information about the node-patches mailing list