[node-patches] Change in ovirt-node[master]: setup: Don't provide a bridge option anymore

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: setup: Don't provide a bridge option anymore
......................................................................

setup: Don't provide a bridge option anymore

Previously it was possible to create bridges from within the TUI, this
is not possible anymore (through the TUI), because it is not needed -
even making it more difficult - to let vdsm rollout the desired network
setup.

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/13/33013/1

diff --git a/src/ovirt/node/setup/core/network_page.py b/src/ovirt/node/setup/core/network_page.py
index 55110a7..d3b25fd 100644
--- a/src/ovirt/node/setup/core/network_page.py
+++ b/src/ovirt/node/setup/core/network_page.py
@@ -104,8 +104,7 @@
             "dialog.nic.ipv4.netmask", "dialog.nic.ipv4.gateway",
             "dialog.nic.ipv6.bootproto", "dialog.nic.ipv6.address",
             "dialog.nic.ipv6.netmask", "dialog.nic.ipv6.gateway",
-            "dialog.nic.vlanid",
-            "dialog.nic.layout_bridged"])
+            "dialog.nic.vlanid"])
 
         self._bond_group = self.widgets.group([
             "bond.name",
@@ -404,7 +403,7 @@
 
     def _configure_nic(self, bootproto, ipaddr, netmask, gateway,
                        ipv6_bootproto, ipv6_address, ipv6_netmask,
-                       ipv6_gateway, vlanid, layout_bridged):
+                       ipv6_gateway, vlanid):
         vlanid = vlanid or None
         iface = self._model_extra["dialog.nic.ifname"]
 
@@ -452,10 +451,7 @@
             model.update(bootif=None, vlanid=None)
 
         mt = defaults.NetworkLayout()
-        if layout_bridged:
-            mt.configure_bridged()
-        else:
-            mt.configure_default()
+        mt.configure_default()
 
         # Return the resulting transaction
         txs = model.transaction()
@@ -484,7 +480,6 @@
 
         model = defaults.Network().retrieve()
         ip6model = defaults.IPv6().retrieve()
-        m_layout = defaults.NetworkLayout().retrieve()
 
         self.logger.debug("nic: %s" % nic)
         self.logger.debug("model: %s" % model)
@@ -535,7 +530,6 @@
             "dialog.nic.ipv6.netmask": ip6model["netmask"],
             "dialog.nic.ipv6.gateway": ip6model["gateway"],
             "dialog.nic.vlanid": vlanid,
-            "dialog.nic.layout_bridged": m_layout["layout"] == "bridged",
         }
         self.plugin._model_extra.update(nicfields)
 
@@ -618,9 +612,6 @@
 
                ui.Divider("dialog.nic._divider[3]"),
 
-               ui.Checkbox("dialog.nic.layout_bridged",
-                           _("Use Bridge: ")),
-
                ui.Divider("dialog.nic._divider[4]"),
                ui.Button("dialog.nic.identify", _("Flash Lights to Identify"))
                ]
@@ -632,7 +623,6 @@
                         ]
         self.plugin._nic_details_group.enabled(False)
         self.plugin.widgets["dialog.nic.vlanid"].enabled(True)
-        self.plugin.widgets["dialog.nic.layout_bridged"].enabled(True)
 
 
 class CreateBondDialog(ui.Dialog):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If451d5de636bafbfeeaaef5e11de46a290ac0b70
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>