Change in vdsm[master]: net: factor out _find_nets_with_available_devices.
automat...@ovirt.org has posted comments on this change. Change subject: net: factor out _find_nets_with_available_devices. .. Patch Set 4: * 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/40540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 Gerrit-PatchSet: 4 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]: net: factor out _find_nets_with_available_devices.
automat...@ovirt.org has posted comments on this change. Change subject: net: factor out _find_nets_with_available_devices. .. Patch Set 5: * Update tracker::IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/40540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 Gerrit-PatchSet: 5 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]: net: factor out _find_nets_with_available_devices.
Dan Kenigsberg has posted comments on this change. Change subject: net: factor out _find_nets_with_available_devices. .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.ovirt.org/40540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 Gerrit-PatchSet: 4 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]: net: factor out _find_nets_with_available_devices.
Dan Kenigsberg has submitted this change and it was merged. Change subject: net: factor out _find_nets_with_available_devices. .. net: factor out _find_nets_with_available_devices. Aiming to simplify _filter_nets_bonds. Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 Signed-off-by: Ido Barkan ibar...@redhat.com Reviewed-on: https://gerrit.ovirt.org/40540 Reviewed-by: Ondřej Svoboda osvob...@redhat.com Continuous-Integration: Jenkins CI Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M vdsm/vdsm-restore-net-config 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Ido Barkan: Verified Ondřej Svoboda: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/40540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 Gerrit-PatchSet: 5 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]: net: factor out _find_nets_with_available_devices.
automat...@ovirt.org has posted comments on this change. Change subject: net: factor out _find_nets_with_available_devices. .. 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/40540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 Gerrit-PatchSet: 3 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]: net: factor out _find_nets_with_available_devices.
Ido Barkan has posted comments on this change. Change subject: net: factor out _find_nets_with_available_devices. .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.ovirt.org/40540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 Gerrit-PatchSet: 3 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]: net: factor out _find_nets_with_available_devices.
Ondřej Svoboda has posted comments on this change. Change subject: net: factor out _find_nets_with_available_devices. .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/40540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 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: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: factor out _find_nets_with_available_devices.
automat...@ovirt.org has posted comments on this change. Change subject: net: factor out _find_nets_with_available_devices. .. 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/40540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 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]: net: factor out _find_nets_with_available_devices.
automat...@ovirt.org has posted comments on this change. Change subject: net: factor out _find_nets_with_available_devices. .. 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/40540 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928 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
Change in vdsm[master]: net: factor out _find_nets_with_available_devices.
Ido Barkan has uploaded a new change for review.
Change subject: net: factor out _find_nets_with_available_devices.
..
net: factor out _find_nets_with_available_devices.
Aiming to simplify _filter_nets_bonds.
Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928
Signed-off-by: Ido Barkan ibar...@redhat.com
---
M vdsm/vdsm-restore-net-config
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/40540/1
diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index 6f0f195..4b1fd8a 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -116,11 +116,20 @@
def _filter_nets_bonds(persisted_nets, persisted_bonds):
Returns only nets and bonds that can be configured with the devices
present in the system
-available_nets = {}
available_nics = netinfo.nics()
available_bonds = _find_bonds_with_available_nics(available_nics,
persisted_bonds)
+available_nets = _find_nets_with_available_devices(available_bonds,
+ available_nics,
+ persisted_bonds,
+ persisted_nets)
+return available_nets, available_bonds
+
+
+def _find_nets_with_available_devices(available_bonds, available_nics,
+ persisted_bonds, persisted_nets):
+available_nets = {}
for net, attrs in persisted_nets.iteritems():
bond = attrs.get('bonding')
if bond is not None:
@@ -148,7 +157,8 @@
# Bridge-only nics
available_nets[net] = attrs
-return available_nets, available_bonds
+
+return available_nets
def _find_bonds_with_available_nics(available_nics, persisted_bonds):
--
To view, visit https://gerrit.ovirt.org/40540
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e1ea8759d2c671fa27edc9b01ccc496e31dc928
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
