Change in vdsm[master]: implementing StorageDomain.reduce
gerrit-hooks has posted comments on this change. Change subject: implementing StorageDomain.reduce .. 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62905 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3c68f64b6c90f0af4d3fa4da94d5747b4ad9cfd6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron AravotGerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Define the StorageDomain.reduce API
gerrit-hooks has posted comments on this change. Change subject: Define the StorageDomain.reduce API .. 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62853 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic5e41b9fa2df4ffef1f3cbb9fbfc57022ffedd9a Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron AravotGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: implementing StorageDomain.movePV
gerrit-hooks has posted comments on this change. Change subject: implementing StorageDomain.movePV .. 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62809 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I74183d13061d114a59da23874c86186457046e94 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron AravotGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Define the StorageDomain.reduce API
gerrit-hooks has posted comments on this change. Change subject: Define the StorageDomain.reduce API .. 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62853 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic5e41b9fa2df4ffef1f3cbb9fbfc57022ffedd9a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron AravotGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: implementing StorageDomain.reduce
gerrit-hooks has posted comments on this change. Change subject: implementing StorageDomain.reduce .. 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62854 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic02b729edc5a43e0d884e5bd0ad671679c39b5a6 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Liron AravotGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: automation: remove bond0 hack
Yaniv Bronhaim has posted comments on this change. Change subject: automation: remove bond0 hack .. Patch Set 1: Code-Review+2 Continuous-Integration+1 -- To view, visit https://gerrit.ovirt.org/62889 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7b5ff287058bd9f4063d9eda6921a690645a3c5f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Irit GoihmanGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Yaniv Bronhaim Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: automation: remove bond0 hack
Irit Goihman has posted comments on this change. Change subject: automation: remove bond0 hack .. Patch Set 1: Verified+1 passes on jenkins http://jenkins.ovirt.org/job/vdsm_4.0_check-merged-fc23-x86_64/117/console -- To view, visit https://gerrit.ovirt.org/62889 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7b5ff287058bd9f4063d9eda6921a690645a3c5f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Irit GoihmanGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-3.6]: Adding build-artifacts-manual.sh script
gerrit-hooks has posted comments on this change. Change subject: Adding build-artifacts-manual.sh script .. Patch Set 4: Verified-1 * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::ERROR, At least one bug-url is required for the stable branch * Check merged to previous::WARN, Still missing on branches ovirt-4.0, master -- To view, visit https://gerrit.ovirt.org/62557 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id3ea3ad68dbd5f822f6e57f4557b4670cb0e89c1 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Sharon NaftalyGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: Adding build-artifacts-manual.sh script
gerrit-hooks has posted comments on this change. Change subject: Adding build-artifacts-manual.sh script .. Patch Set 4: Verified-1 * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::ERROR, At least one bug-url is required for the stable branch * Check merged to previous::WARN, Still missing on branches master -- To view, visit https://gerrit.ovirt.org/62559 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I70ed044ff9c8bc89c75e6c5e3669373468fadc1c Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Sharon NaftalyGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: certificates: remove config.read call
Yaniv Bronhaim has posted comments on this change. Change subject: certificates: remove config.read call .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/62885 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3f7c092a81af2dbe44cb60ab86c4bf74570b4514 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit GoihmanGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Adding build-artifacts-manual.sh script
Sharon Naftaly has posted comments on this change. Change subject: Adding build-artifacts-manual.sh script .. Patch Set 7: Verified-1 @fromani, even after rebasing the patch on top of https://gerrit.ovirt.org/#/c/62779/1 the jobs still fail on tests. For example: http://jenkins.ovirt.org/job/vdsm_master_build-artifacts-manual-el7-x86_64/4/ -- To view, visit https://gerrit.ovirt.org/62560 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3962bfd45b651323a54c04cac6fdb5e844a78f7 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Sharon NaftalyGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sharon Naftaly Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Adding build-artifacts-manual.sh script
gerrit-hooks has posted comments on this change. Change subject: Adding build-artifacts-manual.sh script .. Patch Set 7: * 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62560 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3962bfd45b651323a54c04cac6fdb5e844a78f7 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Sharon NaftalyGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sharon Naftaly Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Using %{?_smp_mflags} for make calls
Yaniv Bronhaim has posted comments on this change. Change subject: Using %{?_smp_mflags} for make calls .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/62163/2/vdsm.spec.in File vdsm.spec.in: Line 743: %endif Line 744: --with-qemu-kvm='@QEMU_KVM_PKG@' \ Line 745: --with-qemu-img='@QEMU_IMG_PKG@' Line 746: Line 747: make %{?_smp_mflags} > Tested only my laptop (lenovo t450s): to be honest - I spent some time to figure why rpmbuild fails here why I use -j4 while going over vdsm_hooks/checkips/Makefile.am - I couldn't figure the exact reason. maybe someone can give me push here? Line 748: # Setting software_version and software_revision in dsaversion.py Line 749: baserelease=`echo "%{release}" | sed 's/\([0-9]\+\(\.[0-9]\+\)\?\).*/\1/'` Line 750: baseversion=`echo "%{version}" | sed 's/\([0-9]\+\(\.[0-9]\+\)\?\).*/\1/'` Line 751: rawversion=%{version}-%{release} -- To view, visit https://gerrit.ovirt.org/62163 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I290734e0ac4db6d6891428a9c149d631f5b705f8 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yaniv BronhaimGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Douglas Schilling Landgraf Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Milan Zamazal Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Tomas Golembiovsky Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Adding build-artifacts-manual.sh script
gerrit-hooks has posted comments on this change. Change subject: Adding build-artifacts-manual.sh script .. Patch Set 6: * 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62560 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3962bfd45b651323a54c04cac6fdb5e844a78f7 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Sharon NaftalyGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sharon Naftaly Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: certificates: remove config.read call
gerrit-hooks has posted comments on this change. Change subject: certificates: remove config.read call .. Patch Set 2: * #1368115::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1368115::OK, public bug * Check Product::#1368115::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62885 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3f7c092a81af2dbe44cb60ab86c4bf74570b4514 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit GoihmanGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Adding build-artifacts-manual.sh script
Yaniv Bronhaim has posted comments on this change. Change subject: Adding build-artifacts-manual.sh script .. Patch Set 5: Code-Review+1 (1 comment) https://gerrit.ovirt.org/#/c/62560/5/automation/build-artifacts-manual.sh File automation/build-artifacts-manual.sh: Line 19: # create the src.rpm, assuming the tarball is in the directory Line 20: rpmbuild \ Line 21: -D "_srcrpmdir $OUTPUT" \ Line 22: -D "_topmdir $BUILDS" \ Line 23: -ts ./*.gz > In the jenkins job - it removes all *.tar.gz files before moving the tested if you clear the path before its fine Line 24: Line 25: # install any build requirements Line 26: yum-builddep output/*src.rpm Line 27: -- To view, visit https://gerrit.ovirt.org/62560 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3962bfd45b651323a54c04cac6fdb5e844a78f7 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Sharon NaftalyGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sharon Naftaly Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: Adding build-artifacts-manual.sh script
Sharon Naftaly has posted comments on this change. Change subject: Adding build-artifacts-manual.sh script .. Patch Set 5: (1 comment) https://gerrit.ovirt.org/#/c/62560/5/automation/build-artifacts-manual.sh File automation/build-artifacts-manual.sh: Line 19: # create the src.rpm, assuming the tarball is in the directory Line 20: rpmbuild \ Line 21: -D "_srcrpmdir $OUTPUT" \ Line 22: -D "_topmdir $BUILDS" \ Line 23: -ts ./*.gz > be more specific - vdsm-*.tar.gz In the jenkins job - it removes all *.tar.gz files before moving the tested one to the folder. I can of course check in this script as well if there are more than one such file, and fail in this case. Please let me know what you think is best. Line 24: Line 25: # install any build requirements Line 26: yum-builddep output/*src.rpm Line 27: -- To view, visit https://gerrit.ovirt.org/62560 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie3962bfd45b651323a54c04cac6fdb5e844a78f7 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Sharon NaftalyGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Sharon Naftaly Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: lvm: Improve logging lv activation logging
Maor Lipchuk has posted comments on this change. Change subject: lvm: Improve logging lv activation logging .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/62737 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I368b158c8d60ae2ff252e038b01024e4598b5f4d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Adam LitkeGerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: lvm: Fix error handling when resizing lvs
Maor Lipchuk has posted comments on this change. Change subject: lvm: Fix error handling when resizing lvs .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/62739 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id557df0b809f7ee141f2e9ea0e1c83084c71bb49 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Adam LitkeGerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: lvm: Refresh lvs during activation
Maor Lipchuk has posted comments on this change. Change subject: lvm: Refresh lvs during activation .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/62736 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I845ce1f930d7673ec16cfa0a11399081ae2e6caa Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Adam LitkeGerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: lvm: Never hide lvm errors
Maor Lipchuk has posted comments on this change. Change subject: lvm: Never hide lvm errors .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/62738 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6ce160ecddebfc903fb7bc00ba5a69e63f2cc996 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Adam LitkeGerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: lvm: Separate lv reduce and extend
Maor Lipchuk has posted comments on this change. Change subject: lvm: Separate lv reduce and extend .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/62740 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0021d380fb26318ed565b3fae0205404d90bea28 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Adam LitkeGerrit-Reviewer: Freddy Rolland Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: automation: remove bond0 hack
gerrit-hooks has posted comments on this change. Change subject: automation: remove bond0 hack .. Patch Set 1: Verified-1 * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::ERROR, At least one bug-url is required for the stable branch * Check merged to previous::WARN, Still missing on branches master -- To view, visit https://gerrit.ovirt.org/62889 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7b5ff287058bd9f4063d9eda6921a690645a3c5f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Irit GoihmanGerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[ovirt-4.0]: automation: remove bond0 hack
Irit Goihman has uploaded a new change for review. Change subject: automation: remove bond0 hack .. automation: remove bond0 hack `echo -bond0 > /sys/class/net/bonding_masters` is causing check-merged job to fail since bond0 doesn't exist. bond0 used to be added implicitly when bonding kernel module was loaded but there are merged patches that solve this issue. Change-Id: I7b5ff287058bd9f4063d9eda6921a690645a3c5f Label: ovirt-4.0-only Signed-off-by: Irit Goihman--- M automation/deploy.sh 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/62889/1 diff --git a/automation/deploy.sh b/automation/deploy.sh index c024292..c1bfdb5 100644 --- a/automation/deploy.sh +++ b/automation/deploy.sh @@ -51,4 +51,3 @@ echo "# Starting up vdsm" systemctl start vdsmd echo " DONE" -echo -bond0 > /sys/class/net/bonding_masters -- To view, visit https://gerrit.ovirt.org/62889 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b5ff287058bd9f4063d9eda6921a690645a3c5f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-4.0 Gerrit-Owner: Irit Goihman ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: py3: define __nonzero__ by means of __bool__
Yaniv Bronhaim has posted comments on this change. Change subject: py3: define __nonzero__ by means of __bool__ .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/62771 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan KenigsbergGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: py3: make conf_persistence_test pass
Yaniv Bronhaim has posted comments on this change. Change subject: py3: make conf_persistence_test pass .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/62772 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I330bd494be78bd9a78db5ac65b1a350df26b8911 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan KenigsbergGerrit-Reviewer: Edward Haas Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: py3: make conf_persistence_test pass
Irit Goihman has posted comments on this change. Change subject: py3: make conf_persistence_test pass .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/62772 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I330bd494be78bd9a78db5ac65b1a350df26b8911 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan KenigsbergGerrit-Reviewer: Edward Haas Gerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: py3: define __nonzero__ by means of __bool__
Irit Goihman has posted comments on this change. Change subject: py3: define __nonzero__ by means of __bool__ .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/62771 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan KenigsbergGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: hsm: add getVGInfo discard related fields
Allon Mureinik has posted comments on this change. Change subject: hsm: add getVGInfo discard related fields .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/62800 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3cdb535923f6f5ffc961750271e8cde823ed835a Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan ShabyGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: multipath: getDeviceDiscardMaxBytes return type
Allon Mureinik has posted comments on this change. Change subject: multipath: getDeviceDiscardMaxBytes return type .. Patch Set 2: (1 comment) https://gerrit.ovirt.org/#/c/62799/2//COMMIT_MSG Commit Message: Line 9: Since /sys/block/dm-X/queue/discard_max_bytes may return more than 4GB, Line 10: uint might not be enough. Line 11: Thus, this patch changes getDeviceDiscardMaxBytes to read and return it Line 12: as a long value. Line 13: Just to be sure - this was added with THIS VERSION, so we don't have a backwards compatibility issue, right? Line 14: Change-Id: Icc45c708df0e93ddf94165eb6f3e3630ce8430a4 -- To view, visit https://gerrit.ovirt.org/62799 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icc45c708df0e93ddf94165eb6f3e3630ce8430a4 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Idan ShabyGerrit-Reviewer: Adam Litke Gerrit-Reviewer: Ala Hino Gerrit-Reviewer: Allon Mureinik Gerrit-Reviewer: Idan Shaby Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot Gerrit-Reviewer: Nir Soffer Gerrit-Reviewer: Tal Nisan Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: certificates: remove config.read call
Irit Goihman has posted comments on this change. Change subject: certificates: remove config.read call .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.ovirt.org/62885 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3f7c092a81af2dbe44cb60ab86c4bf74570b4514 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit GoihmanGerrit-Reviewer: Irit Goihman Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: net: Report the default route flag through caps
gerrit-hooks has posted comments on this change. Change subject: net: Report the default route flag through caps .. Patch Set 15: * Update tracker: IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/58351 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6dfbdd71310cbbb672a185e2f1ac6fdd9b495906 Gerrit-PatchSet: 15 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marcin Mirecki Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: net: Report the default route flag through caps
Dan Kenigsberg has submitted this change and it was merged. Change subject: net: Report the default route flag through caps .. net: Report the default route flag through caps With the removal of the cfg (ifcfg info) from netinfo and caps, the default route inforamtion is now missing for a VDSM client. This patch introduces ipv4defaultroute flag in the network devices caps, describing if the gateway is the host default route. Change-Id: I6dfbdd71310cbbb672a185e2f1ac6fdd9b495906 Signed-off-by: Edward HaasReviewed-on: https://gerrit.ovirt.org/58351 Continuous-Integration: Jenkins CI Reviewed-by: Dan Kenigsberg --- M lib/api/vdsm-api.yml M lib/vdsm/network/kernelconfig.py M lib/vdsm/network/netinfo/cache.py M lib/vdsm/network/netinfo/routes.py M lib/vdsm/network/ovs/info.py M tests/network/func_static_ip_test.py M tests/network/netfunctestlib.py M tests/network/ovs_info_test.py M vdsm_hooks/ovs/ovs_after_get_caps.py 9 files changed, 79 insertions(+), 13 deletions(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/58351 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dfbdd71310cbbb672a185e2f1ac6fdd9b495906 Gerrit-PatchSet: 15 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marcin Mirecki Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: net: Report the default route flag through caps
Dan Kenigsberg has posted comments on this change. Change subject: net: Report the default route flag through caps .. Patch Set 14: Code-Review+2 Only naming changed -- To view, visit https://gerrit.ovirt.org/58351 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6dfbdd71310cbbb672a185e2f1ac6fdd9b495906 Gerrit-PatchSet: 14 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marcin Mirecki Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: certificates: remove config.read call
gerrit-hooks has posted comments on this change. Change subject: certificates: remove config.read call .. Patch Set 1: * #1368115::Update tracker: OK * Check Bug-Url::OK * Check Public Bug::#1368115::OK, public bug * Check Product::#1368115::OK, Correct classification oVirt * Check TM::SKIP, not in a monitored branch (ovirt-3.6 ovirt-4.0) * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62885 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3f7c092a81af2dbe44cb60ab86c4bf74570b4514 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit GoihmanGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: certificates: remove config.read call
Irit Goihman has uploaded a new change for review. Change subject: certificates: remove config.read call .. certificates: remove config.read call certificates initiated config read from 'vdsm.conf' file, while config should be built from a few configuration files. This call overrides vdsm configuration and should be removed. Change-Id: I3f7c092a81af2dbe44cb60ab86c4bf74570b4514 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1368115 Signed-off-by: Irit Goihman--- M lib/vdsm/tool/configurators/certificates.py 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/62885/1 diff --git a/lib/vdsm/tool/configurators/certificates.py b/lib/vdsm/tool/configurators/certificates.py index bdb686a..0462b4d 100644 --- a/lib/vdsm/tool/configurators/certificates.py +++ b/lib/vdsm/tool/configurators/certificates.py @@ -68,11 +68,5 @@ def _certsExist(): -config.read( -os.path.join( -SYSCONF_PATH, -'vdsm/vdsm.conf' -) -) return not config.getboolean('vars', 'ssl') or\ os.path.isfile(CERT_FILE) -- To view, visit https://gerrit.ovirt.org/62885 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f7c092a81af2dbe44cb60ab86c4bf74570b4514 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: v2v: filter out Xen VMs with block storage
Shahar Havivi has posted comments on this change. Change subject: v2v: filter out Xen VMs with block storage .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/62368 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I84512f54f9949640a568a444dd7eeb78db852134 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar HaviviGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi Gerrit-Reviewer: Tomas Golembiovsky Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: net: Relocating wait-for-event under its own module.
gerrit-hooks has posted comments on this change. Change subject: net: Relocating wait-for-event under its own module. .. 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/62876 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie99c93083fd4db7a2d20518c06e70da5bc333a71 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: net: Relocating wait-for-event under its own module.
Edward Haas has uploaded a new change for review. Change subject: net: Relocating wait-for-event under its own module. .. net: Relocating wait-for-event under its own module. Creating waitfor module under the netlink package. To be used as a context manager that waits for a specific event to arrive (using monitor module) before proceeding with the context body. Change-Id: Ie99c93083fd4db7a2d20518c06e70da5bc333a71 Signed-off-by: Edward Haas--- M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/netlink/Makefile.am A lib/vdsm/network/netlink/waitfor.py M vdsm.spec.in 4 files changed, 74 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/62876/1 diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index 64fe623..3b76e97 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -53,7 +53,7 @@ from vdsm.network.netinfo import (bonding as netinfo_bonding, mtus, nics, vlans, misc, NET_PATH) from vdsm.network.netinfo.cache import ifaceUsed -from vdsm.network.netlink import monitor +from vdsm.network.netlink import waitfor if utils.isOvirtNode(): from ovirt.node.utils import fs as node_fs @@ -869,12 +869,11 @@ else: if not iface.master and (iface.ipv4 or iface.ipv6): if iface.ipv4: -expected_event = {'label': iface.name, 'family': 'inet', - 'scope': 'global'} +wait_for_ip = waitfor.waitfor_ipv4_addr elif iface.ipv6: -expected_event = {'label': iface.name, 'family': 'inet6', - 'scope': 'global'} -with _wait_for_event(iface, expected_event): +wait_for_ip = waitfor.waitfor_ipv6_addr + +with wait_for_ip(iface): _exec_ifup(iface, cgroup) else: _exec_ifup(iface, cgroup) @@ -1001,31 +1000,3 @@ ifcfgs.add(ROUTE_PATH % top_level_device) return ifcfgs - - -def _is_subdict(subdict, superdict): -return all(item in frozenset(superdict.items()) - for item in frozenset(subdict.items())) - - -@contextmanager -def _wait_for_event(iface, expected_event, timeout=10): -with monitor.Monitor(groups=('ipv4-ifaddr', 'ipv6-ifaddr'), - timeout=timeout) as mon: -try: -yield -finally: -caught_events = [] -try: -for event in mon: -caught_events.append(event) -if _is_subdict(expected_event, event): -return -except monitor.MonitorError as e: -if e[0] == monitor.E_TIMEOUT: -logging.warning('Expected event "%s" of interface "%s" ' -'was not caught within the given timeout. ' -'Caught events: %s', expected_event, iface, -caught_events) -else: -raise diff --git a/lib/vdsm/network/netlink/Makefile.am b/lib/vdsm/network/netlink/Makefile.am index 5cf018a..cc4ca26 100644 --- a/lib/vdsm/network/netlink/Makefile.am +++ b/lib/vdsm/network/netlink/Makefile.am @@ -25,4 +25,5 @@ link.py \ monitor.py \ route.py \ + waitfor.py \ $(NULL) diff --git a/lib/vdsm/network/netlink/waitfor.py b/lib/vdsm/network/netlink/waitfor.py new file mode 100644 index 000..2b8a138 --- /dev/null +++ b/lib/vdsm/network/netlink/waitfor.py @@ -0,0 +1,67 @@ +# +# Copyright 2016 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# +from __future__ import absolute_import + +from contextlib import contextmanager +import logging + +from . import monitor + + +@contextmanager +def waitfor_ipv4_addr(iface, timeout=10): +expected_event = {'label': iface, 'family': 'inet', 'scope': 'global'} +with _wait_for_event(iface, expected_event, timeout): +yield + + +@contextmanager +def waitfor_ipv6_addr(iface,