Change in vdsm[master]: network: No need to call setupNetworks with empty arguments ...

Ido Barkan has uploaded a new change for review.

Change subject: network: No need to call setupNetworks with empty arguments during network
restoration
......................................................................

network: No need to call setupNetworks with empty arguments during network
restoration

Lets not trust setupNetwork implementation so that it is really a no-op when
called with empty input.

Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Signed-off-by: Ido Barkan <ibarkan(a)redhat.com&gt;
---
M vdsm/vdsm-restore-net-config
1 file changed, 13 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/39214/1

diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index 2fdba11..9bfd7a8 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -58,10 +58,13 @@
         removeNetworks[network] = {'remove': True}
     for bond in runningConfig.bonds:
         removeBonds[bond] = {'remove': True}
-    logging.debug('Removing all networks (%s) and bonds (%s) in running '
-                  'config.', removeNetworks, removeBonds)
-    setupNetworks(removeNetworks, removeBonds, connectivityCheck=False,
-                  _inRollback=True)
+    if removeNetworks or removeBonds:
+        logging.debug('Removing all networks (%s) and bonds (%s) in running '
+                      'config.', removeNetworks, removeBonds)
+        setupNetworks(removeNetworks, removeBonds, connectivityCheck=False,
+                      _inRollback=True)
+    else:
+        logging.debug('runningConfig is empty. Nothing to remove')
 
     # Flush vdsm configurations left-overs from any configurator on the system
     # so that changes of configurator and persistence system are smooth.
@@ -75,9 +78,12 @@
     persistentConfig = PersistentConfig()
     nets, bonds = _filter_nets_bonds(persistentConfig.networks,
                                      persistentConfig.bonds)
-    logging.debug('Calling setupNetworks with networks (%s) and bond (%s).',
-                  nets, bonds)
-    setupNetworks(nets, bonds, connectivityCheck=False, _inRollback=True)
+    if nets or bonds:
+        logging.debug('Calling setupNetworks with networks '
+                      '(%s) and bond (%s).', nets, bonds)
+        setupNetworks(nets, bonds, connectivityCheck=False, _inRollback=True)
+    else:
+        logging.debug('Nothing to restore')
 
 
 def _filter_nets_bonds(nets, bonds):


-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;

automation(a)ovirt.org has posted comments on this change.

Change subject: network: No need to call setupNetworks with empty arguments during network
restoration
......................................................................


Patch Set 1:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: No need to call setupNetworks with empty arguments during network
restoration
......................................................................


Patch Set 1:

Build Started (1/3) ->
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/17321/

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: No need to call setupNetworks with empty arguments during network
restoration
......................................................................


Patch Set 1:

Build Started (2/3) -> http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/17147/

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: No need to call setupNetworks with empty arguments during network
restoration
......................................................................


Patch Set 1:

Build Started (3/3) ->
http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/...

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: No need to call setupNetworks with empty arguments during network
restoration
......................................................................


Patch Set 1:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/17147/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/17321/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

automation(a)ovirt.org has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 2:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 2:

Build Started (1/3) -> http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/17658/

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 2:

Build Started (2/3) ->
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/17829/

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 2:

Build Started (3/3) ->
http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/...

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 2:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/17829/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/17658/ : SUCCESS

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

Ido Barkan has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 2: Verified+1

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

automation(a)ovirt.org has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 3:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and
is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5',
'ovirt-3.4', 'ovirt-3.3'])

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 3:

Build Started (1/3) -> http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/18392/

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 3:

Build Started (2/3) ->
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/1623/

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: network: better logging on network restoration.

Ido Barkan has abandoned this change.

Change subject: network: better logging on network restoration.
......................................................................


Abandoned

restore-net-cleanup is a better direction

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org

Change in vdsm[master]: network: better logging on network restoration.

automation(a)ovirt.org has posted comments on this change.

Change subject: network: better logging on network restoration.
......................................................................


Patch Set 3:

* Update tracker::IGNORE, no Bug-Url found

-- 
To view, visit https://gerrit.ovirt.org/39214
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0241e7379f799e65bbeba3e13a288e52e5dbc734
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Ido Barkan <ibarkan(a)redhat.com&gt;
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-HasComments: No