From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: Makefile: replace astrisks with equal signs
......................................................................
Makefile: replace astrisks with equal signs
Tripple astrisks are used to mark failures in make and other utilities.
Let us use '===' instead for comments.
Change-Id: I0a7f41effd11152195ff4bd7e499ca585fd3349f
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/Makefile.am
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/79750/1
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 464850f..734e80d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -304,16 +304,16 @@
@true
check-net:
- @echo '*** Running networking tests. ***'
+ @echo '=== Running networking tests. ==='
@$(top_srcdir)/tests/run_tests_local.sh $(network_modules)
check-virt:
- @echo '*** Running virt tests. ***'
+ @echo '=== Running virt tests. ==='
@$(top_srcdir)/tests/run_tests_local.sh $(virt_modules)
check:
- @echo '*** Running tests. To skip this step place NOSE_EXCLUDE=.* ***'
- @echo '*** into your environment. Do not submit untested code! ***'
+ @echo '=== Running tests. To skip this step place NOSE_EXCLUDE=.* ==='
+ @echo '=== into your environment. Do not submit untested code! ==='
$(top_srcdir)/tests/run_tests_local.sh $(run_modules)
if [ "$(PYTHON3_SUPPORT)" == "1" ]; then \
all_modules=`mktemp`; \
--
To view, visit https://gerrit.ovirt.org/79750
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a7f41effd11152195ff4bd7e499ca585fd3349f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/76153 )
Change subject: network: add IPAddressApi and its iproute implementation
......................................................................
network: add IPAddressApi and its iproute implementation
Change-Id: I8f90df4142aee11cf1cba1293fb89ebc7cace1ac
Signed-off-by: Petr Horacek <phoracek(a)redhat.com>
---
M automation/check-merged.packages.el7
M automation/check-merged.packages.fc24
M automation/check-patch.packages.el7
M automation/check-patch.packages.fc24
M automation/check-patch.packages.fc25
M docker/Dockerfile.centos
M docker/Dockerfile.fedora.25
M docker/Dockerfile.fedora.rawhide
M lib/vdsm/network/ip/address/__init__.py
A lib/vdsm/network/ip/address/iproute2.py
M lib/vdsm/network/ipwrapper.py
M tests/network/ip_address_test.py
M vdsm.spec.in
13 files changed, 445 insertions(+), 19 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Petr Horáček: Verified
Edward Haas: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/76153
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f90df4142aee11cf1cba1293fb89ebc7cace1ac
Gerrit-PatchSet: 30
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horacek <phoracek(a)redhat.com>
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/78660 )
Change subject: RPC: Refactor JSON RPC exceptions
......................................................................
RPC: Refactor JSON RPC exceptions
JsonRpcError class is now derived from ContextException
and other derived exceptions use the context to
provide more information.
For example, new error message for JsonRpcMethodNotFoundError is:
The method does not exist or is not available: {'method': 'some_missing_method'}
Also added a new class JsonRpcServerError, that can have
any code and message.
Change-Id: Ifdaf434aec6c65e7a896e5594fba711193cd2958
Signed-off-by: Andrej Krejcir <akrejcir(a)redhat.com>
---
M lib/vdsm/common/exception.py
M lib/vdsm/jsonrpcvdscli.py
M lib/vdsm/rpc/Bridge.py
M lib/yajsonrpc/__init__.py
M tests/bridge_test.py
M tests/integration/jsonRpcTests.py
M tests/stomp_test.py
M tests/vdsmapi_test.py
8 files changed, 97 insertions(+), 91 deletions(-)
Approvals:
Piotr Kliczewski: Looks good to me, approved
Nir Soffer: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Andrej Krejcir: Verified
--
To view, visit https://gerrit.ovirt.org/78660
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdaf434aec6c65e7a896e5594fba711193cd2958
Gerrit-PatchSet: 37
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com>
Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com>
Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79665 )
Change subject: RPC: Fix error messages in JsonRpcResponse
......................................................................
RPC: Fix error messages in JsonRpcResponse
JsonRpcResponse.error is now always an exception
object derived from JsonRpcError.
Previously it could also be a dictionary which caused problems.
Change-Id: Ie9a4b318dfca66e8b50eb44fe9a24fb43ee32275
Signed-off-by: Andrej Krejcir <akrejcir(a)redhat.com>
---
M lib/vdsm/client.py
M lib/vdsm/jsonrpcvdscli.py
M lib/yajsonrpc/__init__.py
M tests/integration/jsonRpcTests.py
4 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Piotr Kliczewski: Looks good to me, approved
Nir Soffer: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Andrej Krejcir: Verified
--
To view, visit https://gerrit.ovirt.org/79665
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9a4b318dfca66e8b50eb44fe9a24fb43ee32275
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com>
Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Denis Chaplygin <dchaplyg(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
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>
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has posted comments on this change.
Change subject: m2c: uses different protocol constant names
......................................................................
Patch Set 2:
(1 comment)
https://gerrit.ovirt.org/#/c/79664/2//COMMIT_MSG
Commit Message:
Line 9: M2crypto uses the same name scheme as openssl which differs from ssl
Line 10: module. SSL_OP_NO_TLSv1_1 is not available on some of m2c versions.
Line 11:
Line 12:
Line 13: Label: ovirt-4.1-only
> There is no need to write anything about m2c being removed from master.
sounds reasonable to me to say why its ovirt-4.1 only.. but as you wish
Line 14: Bug-Url: https://bugzilla.redhat.com/1473344
Line 15: Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5
--
To view, visit https://gerrit.ovirt.org/79664
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6c05bddfba94d85e2c48122b6fd56d8f336d01f5
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-4.1
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
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: Yes
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has posted comments on this change.
Change subject: ssl: handle handshake errors
......................................................................
Patch Set 4:
(2 comments)
https://gerrit.ovirt.org/#/c/79668/4//COMMIT_MSG
Commit Message:
Line 5: CommitDate: 2017-07-24 12:08:16 +0200
Line 6:
Line 7: ssl: handle handshake errors
Line 8:
Line 9: We need to make sure to close socket when handshake fails.
what happened otherwise?
Line 10:
Line 11:
Line 12: Bug-url: https://bugzilla.redhat.com/1473295
Line 13: Change-Id: I99cfa35e608f429640455c35495be1783854e3da
https://gerrit.ovirt.org/#/c/79668/4/lib/vdsm/sslutils.py
File lib/vdsm/sslutils.py:
Line 250: self.want_read = True
Line 251: elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE:
Line 252: self.want_write = True
Line 253: else:
Line 254: dispatcher.close()
don't we need the above treatment ?
Line 255: except socket.error:
Line 256: dispatcher.close()
Line 257: else:
Line 258: self.want_read = self.want_write = True
--
To view, visit https://gerrit.ovirt.org/79668
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I99cfa35e608f429640455c35495be1783854e3da
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Irit Goihman <igoihman(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
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: Yes