vdsm-patches June 2017

vdsm-patches@lists.fedorahosted.org

1 participants
244 discussions

Change in vdsm[master]: sslutils: add info to SSLHandshake errors
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: sslutils: add info to SSLHandshake errors ...................................................................... sslutils: add info to SSLHandshake errors Include name of peer and its full certificate if they do not match, in order to understand which non-legitimate client attempts to connect. Change-Id: I0cb2d7e0c6c86ca12a34be13b07bc960e3ad313e Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/sslutils.py 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/21/76221/1 diff --git a/lib/vdsm/sslutils.py b/lib/vdsm/sslutils.py index 10fc172..8c349ca 100644 --- a/lib/vdsm/sslutils.py +++ b/lib/vdsm/sslutils.py @@ -219,9 +219,12 @@ if self._is_handshaking: self._handshake(dispatcher) else: - if not self._verify_host(dispatcher.socket.getpeercert(), - dispatcher.socket.getpeername()[0]): - self.log.error("peer certificate does not match host name") + peercert = dispatcher.socket.getpeercert() + peername = dispatcher.socket.getpeername()[0] + if not self._verify_host(peercert, peername): + self.log.error( + "peer certificate '%s' does not match host name '%s'", + peercert, peername) dispatcher.socket.close() return -- To view, visit https://gerrit.ovirt.org/76221 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cb2d7e0c6c86ca12a34be13b07bc960e3ad313e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 2

Change in vdsm[master]: janitorial: drop once-used P_VDSM_KEYS
by Code Review 24 Jul '17

24 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: janitorial: drop once-used P_VDSM_KEYS ...................................................................... janitorial: drop once-used P_VDSM_KEYS We have another name for the same constant, PKI_DIR. Change-Id: I588a94534d2813bc9ffdd1688364cea0e7516170 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M lib/vdsm/constants.py.in M lib/vdsm/tool/configurators/passwd.py 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/77468/1 diff --git a/lib/vdsm/constants.py.in b/lib/vdsm/constants.py.in index 7c0d209..1891a49 100644 --- a/lib/vdsm/constants.py.in +++ b/lib/vdsm/constants.py.in @@ -82,7 +82,6 @@ P_VDSM_RUN = '@VDSMRUNDIR@/' # NOQA: E501 (potentially long line) P_VDSM_STORAGE = os.path.join(P_VDSM_RUN, 'storage/') P_VDSM_CONF = '@CONFDIR@/' # NOQA: E501 (potentially long line) -P_VDSM_KEYS = '/etc/pki/vdsm/keys/' P_VDSM_CLIENT_LOG = '@VDSMRUNDIR@/client.log' # NOQA: E501 (potentially long line) P_VDSM_LOG = '@VDSMLOGDIR@' # NOQA: E501 (potentially long line) diff --git a/lib/vdsm/tool/configurators/passwd.py b/lib/vdsm/tool/configurators/passwd.py index 9a3b793..fe62860 100644 --- a/lib/vdsm/tool/configurators/passwd.py +++ b/lib/vdsm/tool/configurators/passwd.py @@ -35,7 +35,7 @@ "/usr/sbin/saslpasswd2", ) SASL_USERNAME = "vdsm@ovirt" -LIBVIRT_PASSWORD_PATH = constants.P_VDSM_KEYS + 'libvirt_password' +LIBVIRT_PASSWORD_PATH = constants.PKI_DIR + 'libvirt_password' def isconfigured(): -- To view, visit https://gerrit.ovirt.org/77468 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I588a94534d2813bc9ffdd1688364cea0e7516170 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 7

Change in vdsm[master]: spec: move polkit rules location logic to automake
by Code Review 01 Jul '17

01 Jul '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has uploaded a new change for review. Change subject: spec: move polkit rules location logic to automake ...................................................................... spec: move polkit rules location logic to automake Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M configure.ac M static/Makefile.am R static/usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules M vdsm.spec.in M vdsm/Makefile.am 5 files changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/78551/1 diff --git a/configure.ac b/configure.ac index 3cd046b..e99d311 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,14 @@ [with_data_center="/rhev/data-center"]) AC_SUBST([vdsmrepo], [${with_data_center}]) +AC_ARG_WITH( + [polkitdir], + [AS_HELP_STRING([--with-polkitdir=FILE], + [where to place polkit rules, @<:@default=/usr/share/polkit-1/rules.d@:>@])], + [with_polkitdir="${withval}"], + [with_polkitdir="/usr/share/polkit-1/rules.d"]) +AC_SUBST([polkitdir], [${with_polkitdir}]) + # Users and groups AC_SUBST([VDSMUSER], [vdsm]) AC_SUBST([VDSMGROUP], [kvm]) diff --git a/static/Makefile.am b/static/Makefile.am index 85414e5..bd82a60 100644 --- a/static/Makefile.am +++ b/static/Makefile.am @@ -111,6 +111,8 @@ libvirtpassworddir = $(vdsmtsdir)/keys libvirtpassword_DATA = ./$(libvirtpassworddir)/libvirt_password +dist_polkit_SCRIPTS = \ + ./usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules cronhourlydir = $(sysconfdir)/cron.hourly dist_cronhourly_SCRIPTS = \ diff --git a/vdsm/vdsm-libvirt-access.rules b/static/usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules similarity index 100% rename from vdsm/vdsm-libvirt-access.rules rename to static/usr/share/polkit-1/rules.d/10-vdsm-libvirt-access.rules diff --git a/vdsm.spec.in b/vdsm.spec.in index 368dc59..fc18c57 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -709,7 +709,8 @@ %if 0%{?with_containers} --enable-containers \ %endif - --with-data-center='@VDSMREPO@' + --with-data-center='@VDSMREPO@' \ + --with-polkitdir=%{_polkitdir} make # Setting software_version and software_revision in dsaversion.py @@ -751,10 +752,6 @@ # dropbox for core dumps install -dDm 1777 %{buildroot}%{_localstatedir}/log/core %endif - -# Install the polkit for libvirt -install -Dm 0644 vdsm/vdsm-libvirt-access.rules \ - %{buildroot}%{_polkitdir}/10-vdsm-libvirt-access.rules # Install the libvirt hook for cleaning up the XML install -Dm 0755 vdsm/virt/libvirt-hook.sh \ diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 3675e3b..b36f56e 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -53,7 +53,6 @@ mk_sysprep_floppy.in \ vdsm-gencerts.sh.in \ vdsm-libvirt-access.pkla \ - vdsm-libvirt-access.rules \ $(NULL) all-local: \ -- To view, visit https://gerrit.ovirt.org/78551 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia16538d01fb5763095ce429238ca9489dd5eefdf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

1 7

Change in vdsm[master]: tests: Remove global panic mocking
by Code Review 30 Jun '17

30 Jun '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78592 ) Change subject: tests: Remove global panic mocking ...................................................................... tests: Remove global panic mocking Global mocking of the panic function requires using our non-standard test runner. We want to be able to run any test using existing tests runners like py.test. Tests that needs to mock panic.panic() should monkey-patch it during the test. The old panic tests was testing the panic mock; replace the test with a test testing the real code. Change-Id: I8ceebdc2ae2d457e9be1b8121327f50a7fa4bfd0 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/Makefile.am A tests/panic_helper.py M tests/testrunner.py M tests/utils_test.py 4 files changed, 14 insertions(+), 12 deletions(-) Approvals: Nir Soffer: Verified Jenkins CI: Passed CI tests Irit Goihman: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/78592 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ceebdc2ae2d457e9be1b8121327f50a7fa4bfd0 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: move vdsm-gencerts.sh to static
by Code Review 29 Jun '17

29 Jun '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78806 ) Change subject: move vdsm-gencerts.sh to static ...................................................................... move vdsm-gencerts.sh to static Change-Id: I6e7b573a2eff367f6314935216d1753b4cc1a2e7 Signed-off-by: Irit Goihman <igoihman(a)redhat.com> --- M .gitignore M static/Makefile.am R static/libexec/vdsm/vdsm-gencerts.sh.in M vdsm/Makefile.am 4 files changed, 4 insertions(+), 7 deletions(-) Approvals: Jenkins CI: Passed CI tests Irit Goihman: Verified Dan Kenigsberg: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/78806 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e7b573a2eff367f6314935216d1753b4cc1a2e7 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: move vdsm-gencerts.sh to static
by Code Review 29 Jun '17

29 Jun '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: move vdsm-gencerts.sh to static ...................................................................... Patch Set 4: Code-Review+2 copying score -- To view, visit https://gerrit.ovirt.org/78806 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6e7b573a2eff367f6314935216d1753b4cc1a2e7 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: No

1 0

Change in vdsm[master]: python3: Fix UUID packing/unpacking on python 3
by Code Review 29 Jun '17

29 Jun '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has posted comments on this change. Change subject: python3: Fix UUID packing/unpacking on python 3 ...................................................................... Patch Set 9: (1 comment) https://gerrit.ovirt.org/#/c/78632/9/tests/storage/misc_test.py File tests/storage/misc_test.py: Line 459: Test that the uuid that was packed can be unpacked without being Line 460: changed Line 461: """ Line 462: for i in range(1000): Line 463: origUuid = str(uuid.uuid4()) > We test here 1000 random uuids, better than small list of random uuids. And I have nothing against testing 1000 numbers. What I don't like is surprises in tests. Assume your test fails on a single random uuid on a single CI run by a single developer. Nobody would notice. All they'd see is a fluke -1, and they'd re-trigger the job. A safe approach is to have a predictable list of number. If we introduce a bug that makes the test fail on one of them, it would keep on failing. r = random.Random(42) for _ in range(1000): origUiid = str(uuid.UUID(int=r.randint(0, 2**128-1))) ... it's not terribly important for this simple test, but I think that uncontrolled randomness is a bad practice for testing, and it should be avoided. Line 464: packedUuid = misc.packUuid(origUuid) Line 465: self.assertEqual(misc.unpackUuid(packedUuid), origUuid) Line 466: Line 467: -- To view, visit https://gerrit.ovirt.org/78632 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I41cfa5e54e76dfcad267792daebc54e80bf2a022 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org> Gerrit-HasComments: Yes

1 0

Change in vdsm[master]: tests: Mark slow and stress tests using pytest.mark
by Code Review 29 Jun '17

29 Jun '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78633 ) Change subject: tests: Mark slow and stress tests using pytest.mark ...................................................................... tests: Mark slow and stress tests using pytest.mark Replace @slowtest and @stresstest with pytest.marks. When running from tox, slow and stress tests do not run but are not skipped; instead these they are reported as "deselected": 314 passed, 40 skipped, 91 deselected, 29 warnings in 22.40 seconds When running directly, for example when running a single module tests, all tests run by default: $ pytest storage/asyncevent_test.py ==================================================================================== test session starts ===================================================================================== platform linux -- Python 3.5.3, pytest-3.1.0, py-1.4.33, pluggy-0.4.0 rootdir: /home/nsoffer/src/vdsm/tests, inifile: collected 67 items storage/asyncevent_test.py ................................................................... ================================================================================= 67 passed in 8.38 seconds ================================================================================== To run only fast tests, disable slow or stress tests: $ pytest -m "not (slow or stress)" storage/asyncevent_test.py ==================================================================================== test session starts ===================================================================================== platform linux -- Python 3.5.3, pytest-3.1.0, py-1.4.33, pluggy-0.4.0 rootdir: /home/nsoffer/src/vdsm/tests, inifile: collected 67 items storage/asyncevent_test.py ................................ ==================================================================================== 35 tests deselected ===================================================================================== ========================================================================== 32 passed, 35 deselected in 0.92 seconds ========================================================================== Change-Id: I57eac4ad7eeadc4f95000d8bedc1651ecb8bcf60 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/storage/asyncevent_test.py M tests/storage/asyncutils_test.py M tests/storage/blockvolume_test.py M tests/storage/check_test.py M tests/storage/mount_test.py M tests/storage/qcow2_test.py M tests/storage/resourcemanager_test.py M tests/storage/rwlock_test.py M tests/storage/xlease_test.py M tox.ini 10 files changed, 57 insertions(+), 48 deletions(-) Approvals: Adam Litke: Looks good to me, approved Nir Soffer: Verified Jenkins CI: Passed CI tests Irit Goihman: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/78633 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57eac4ad7eeadc4f95000d8bedc1651ecb8bcf60 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: mailbox: Make run() private
by Code Review 29 Jun '17

29 Jun '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78799 ) Change subject: mailbox: Make run() private ...................................................................... mailbox: Make run() private The run() method of the mailbox threads is not part of the interface; it is used as the thread target function, and it should not be invoked by any other code. Rename the methods to make this clear. Change-Id: Ie954296eb54341c9277d05819660ccf86d89828d Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/storage/mailbox.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Adam Litke: Looks good to me, approved Nir Soffer: Verified Jenkins CI: Passed CI tests Freddy Rolland: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/78799 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie954296eb54341c9277d05819660ccf86d89828d Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Change in vdsm[master]: tests: Skip root only tests using pytest
by Code Review 29 Jun '17

29 Jun '17

From Dan Kenigsberg <danken(a)redhat.com>: Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78634 ) Change subject: tests: Skip root only tests using pytest ...................................................................... tests: Skip root only tests using pytest Replace @ValidateRunningAsRoot and @ValidateNotRunningAsRoot with pytest.mask.skipif. Change-Id: I0d9fea0f94a767071848ba31a5fc30d8a6a8e01f Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M tests/storage/blockdev_test.py M tests/storage/fileutil_test.py M tests/storage/mount_test.py 3 files changed, 10 insertions(+), 9 deletions(-) Approvals: Adam Litke: Looks good to me, but someone else must approve Nir Soffer: Verified; Looks good to me, approved Jenkins CI: Passed CI tests Irit Goihman: Looks good to me, but someone else must approve Freddy Rolland: Looks good to me, but someone else must approve -- To view, visit https://gerrit.ovirt.org/78634 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d9fea0f94a767071848ba31a5fc30d8a6a8e01f Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com> Gerrit-Reviewer: Ala Hino <ahino(a)redhat.com> Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland(a)redhat.com> Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches June 2017