Change in vdsm[master]: Continue support nicless bridge.

[Igor Lvovsky]

Igor Lvovsky has uploaded a new change for review.

Change subject: Continue support nicless bridge.
......................................................................

Continue support nicless bridge.

In general we can define bridge without connect it to any interface (nic/bond).
This behaviour was broken mistakenly in previous commits, fixed now.

Change-Id: Ief7138b659370fef9b38987980216dd8453cfee1
Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
---
M vdsm/configNetwork.py
1 file changed, 15 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/7831/1

diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 6fe7ac7..0afc012 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -1040,20 +1040,22 @@
     if network and bridged:
         configWriter.removeBridge(network)
 
-    iface = bonding if bonding else nics[0]
-    if vlan:
-        configWriter.removeVlan(vlan, iface)
-    else:
-        cf = configWriter.NET_CONF_PREF + iface
-        if not bridged:
-            # When removing bridgeless non-VLANed network
-            # we need to remove IP/NETMASK from the cfg file
-            for key in ('IPADDR', 'NETMASK', 'GATEWAY',
'BOOTPROTO'):
-                configWriter._updateConfigValue(cf, key, '', True)
+    nic = nics[0] if nics else None
+    iface = bonding if bonding else nic
+    if iface:
+        if vlan:
+            configWriter.removeVlan(vlan, iface)
         else:
-            # When removing bridged non-VLANed network
-            # we need to remove BRIDGE from the cfg file
-            configWriter._updateConfigValue(cf, 'BRIDGE', '', True)
+            cf = configWriter.NET_CONF_PREF + iface
+            if not bridged:
+                # When removing bridgeless non-VLANed network
+                # we need to remove IP/NETMASK from the cfg file
+                for key in ('IPADDR', 'NETMASK', 'GATEWAY',
'BOOTPROTO'):
+                    configWriter._updateConfigValue(cf, key, '', True)
+            else:
+                # When removing bridged non-VLANed network
+                # we need to remove BRIDGE from the cfg file
+                configWriter._updateConfigValue(cf, 'BRIDGE', '', True)
 
     # The (relatively) new setupNetwork verb allows to remove a network
     # defined on top of an bonding device without break the bond itself.


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief7138b659370fef9b38987980216dd8453cfee1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Continue support nicless bridge.
......................................................................


Patch Set 2: Verified; Looks good to me, approved

copying score

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ief7138b659370fef9b38987980216dd8453cfee1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Continue support nicless bridge.
......................................................................


Continue support nicless bridge.

In general we can define bridge without connect it to any interface (nic/bond).
This behaviour was broken mistakenly in previous commits, fixed now.

Change-Id: Ief7138b659370fef9b38987980216dd8453cfee1
Signed-off-by: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
---
M vdsm/configNetwork.py
1 file changed, 15 insertions(+), 13 deletions(-)

Approvals:
  Dan Kenigsberg: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief7138b659370fef9b38987980216dd8453cfee1
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Continue support nicless bridge.
......................................................................


Patch Set 1: Looks good to me, but someone else must approve

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ief7138b659370fef9b38987980216dd8453cfee1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com&gt;

[Igor Lvovsky]

Igor Lvovsky has posted comments on this change.

Change subject: Continue support nicless bridge.
......................................................................


Patch Set 1:

Path all ruth tests

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ief7138b659370fef9b38987980216dd8453cfee1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com&gt;

[Igor Lvovsky]

Igor Lvovsky has posted comments on this change.

Change subject: Continue support nicless bridge.
......................................................................


Patch Set 1: Verified

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ief7138b659370fef9b38987980216dd8453cfee1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Gerrit-Reviewer: Livnat Peer <lpeer(a)redhat.com&gt;