Change in vdsm[ovirt-4.0.5]: net: edit nic detached from bridge but still attached to a vlan

Hello Dan Kenigsberg,

I'd like you to do a code review.  Please visit

https://gerrit.ovirt.org/65760

to review the following change.

Change subject: net: edit nic detached from bridge but still attached to a vlan
......................................................................

net: edit nic detached from bridge but still attached to a vlan

Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e
Signed-off-by: Petr Horáček 
Bug-Url: https://bugzilla.redhat.com/1372798
Reviewed-on: https://gerrit.ovirt.org/65231
Reviewed-by: Dan Kenigsberg 
Continuous-Integration: Jenkins CI
(cherry picked from commit 0970a9e90bc229d1fc95210153aacf564353516d)
Reviewed-on: https://gerrit.ovirt.org/65232
---
M lib/vdsm/network/configurators/ifcfg.py
1 file changed, 5 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/60/65760/1

diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py
index f49693a..f04a7f3 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -281,6 +281,11 @@
             if set_mtu is not None:
                 ipwrapper.linkSet(nic.name, ['mtu', str(set_mtu)])

+            # If the nic was bridged, we must remove BRIDGE parameter from its
+            # ifcfg configuration file.
+            if nic.bridge:
+                self.configApplier.dropBridgeParameter(nic.name)
+
     def _getFilePath(self, fileType, device):
         return os.path.join(NET_CONF_DIR, '%s-%s' % (fileType, device))

gerrit-hooks has posted comments on this change.

Change subject: net: edit nic detached from bridge but still attached to a vlan
......................................................................

Patch Set 1:

* Update Tracker::#1372798::IGNORE, not relevant for Red Hat classification
* Check Bug-Url::IGNORE, not relevant for 'Red Hat' classification
* Check Public Bug::#1372798::OK, public bug
* Check merged to previous::IGNORE,         Not in stable branch (['ovirt-3.6', 'ovirt-4.0'])

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: net: edit nic detached from bridge but still attached to a vlan
......................................................................

Patch Set 1: Code-Review+2

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: net: edit nic detached from bridge but still attached to a vlan
......................................................................

Patch Set 1: Continuous-Integration+1

copying CI score

[Jenkins CI RO]

Anonymous Coward #1001177 has posted comments on this change.

Change subject: net: edit nic detached from bridge but still attached to a vlan
......................................................................

Patch Set 1: Verified+1

Francesco Romani has submitted this change and it was merged.

Change subject: net: edit nic detached from bridge but still attached to a vlan
......................................................................

net: edit nic detached from bridge but still attached to a vlan

Change-Id: I460cb08cf436b932e7d9592557a03d7b6fc36a0e
Signed-off-by: Petr Horáček 
Bug-Url: https://bugzilla.redhat.com/1372798
Reviewed-on: https://gerrit.ovirt.org/65231
Reviewed-by: Dan Kenigsberg 
Continuous-Integration: Jenkins CI
(cherry picked from commit 0970a9e90bc229d1fc95210153aacf564353516d)
Reviewed-on: https://gerrit.ovirt.org/65232
Reviewed-on: https://gerrit.ovirt.org/65760
Continuous-Integration: Dan Kenigsberg 
---
M lib/vdsm/network/configurators/ifcfg.py
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Anonymous Coward #1001177: Verified
  Dan Kenigsberg: Looks good to me, approved; Passed CI tests

gerrit-hooks has posted comments on this change.

Change subject: net: edit nic detached from bridge but still attached to a vlan
......................................................................

Patch Set 2:

* update_tracker: OK
* Set MODIFIED::bug 1372798::::#1372798::::IGNORE, not all related patches are closed, check 65219