Change in vdsm[master]: network: do not try to clean running configuration
automat...@ovirt.org has posted comments on this change. Change subject: network: do not try to clean running configuration .. Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
Dan Kenigsberg has submitted this change and it was merged. Change subject: network: do not try to clean running configuration .. network: do not try to clean running configuration This small optimization was also the behavior before this change, only now it is easier to read and is also logged. Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Signed-off-by: Ido Barkan ibar...@redhat.com Reviewed-on: https://gerrit.ovirt.org/40537 Reviewed-by: Ondřej Svoboda osvob...@redhat.com Reviewed-by: Dan Kenigsberg dan...@redhat.com Continuous-Integration: Dan Kenigsberg dan...@redhat.com --- M vdsm/vdsm-restore-net-config 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Ido Barkan: Verified Ondřej Svoboda: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved; Passed CI tests -- To view, visit https://gerrit.ovirt.org/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
Dan Kenigsberg has posted comments on this change. Change subject: network: do not try to clean running configuration .. Patch Set 2: Continuous-Integration+1 -- To view, visit https://gerrit.ovirt.org/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
Dan Kenigsberg has posted comments on this change. Change subject: network: do not try to clean running configuration .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
Ido Barkan has posted comments on this change. Change subject: network: do not try to clean running configuration .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
Ondřej Svoboda has posted comments on this change. Change subject: network: do not try to clean running configuration .. Patch Set 1: Code-Review-1 (2 comments) Much clearer! Just fix the typos for me :-) https://gerrit.ovirt.org/#/c/40537/1/vdsm/vdsm-restore-net-config File vdsm/vdsm-restore-net-config: Line 73: n Since you're ending with a full stop you may also want to begin with uppercase. Line 73: nn n -- To view, visit https://gerrit.ovirt.org/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
Ido Barkan has posted comments on this change. Change subject: network: do not try to clean running configuration .. Patch Set 1: (2 comments) https://gerrit.ovirt.org/#/c/40537/1/vdsm/vdsm-restore-net-config File vdsm/vdsm-restore-net-config: Line 73: nn n Done Line 73: n Since you're ending with a full stop you may also want to begin with upperc Done -- To view, visit https://gerrit.ovirt.org/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
automat...@ovirt.org has posted comments on this change. Change subject: network: do not try to clean running configuration .. 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/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
Ondřej Svoboda has posted comments on this change. Change subject: network: do not try to clean running configuration .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
Ido Barkan has uploaded a new change for review.
Change subject: network: do not try to clean running configuration
..
network: do not try to clean running configuration
This small optimization was also the behavior before this change,
only now it is easier to read and is also logged.
Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e
Signed-off-by: Ido Barkan ibar...@redhat.com
---
M vdsm/vdsm-restore-net-config
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/37/40537/1
diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index 0c60732..eb19a1a 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -69,6 +69,10 @@
def _remove_networks_in_running_config():
runningConfig = RunningConfig()
+if not runningConfig:
+logging.debug(not cleanning running configuration since it is empty.)
+return
+
removeNetworks = {}
removeBonds = {}
for network in runningConfig.networks:
@@ -77,9 +81,8 @@
removeBonds[bond] = {'remove': True}
logging.debug('Removing all networks (%s) and bonds (%s) in running '
'config.', removeNetworks, removeBonds)
-if removeNetworks or removeBonds:
-setupNetworks(removeNetworks, removeBonds, connectivityCheck=False,
- _inRollback=True)
+setupNetworks(removeNetworks, removeBonds, connectivityCheck=False,
+ _inRollback=True)
def _flush_configurators_leftovers():
--
To view, visit https://gerrit.ovirt.org/40537
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan ibar...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: network: do not try to clean running configuration
automat...@ovirt.org has posted comments on this change. Change subject: network: do not try to clean running configuration .. 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/40537 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If8c0062e3d0c3625311876ef740b15577bf8a16e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan ibar...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
