Change in vdsm[master]: py3: make gluster_cli_tests pass
Dan Kenigsberg has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 5: Code-Review+2 copying dropped scores, and raising. -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
gerrit-hooks has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 6: * Update Tracker::IGNORE, no bug url/s found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
Dan Kenigsberg has submitted this change and it was merged. Change subject: py3: make gluster_cli_tests pass .. py3: make gluster_cli_tests pass Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Signed-off-by: Dan Kenigsberg Reviewed-on: https://gerrit.ovirt.org/65008 Continuous-Integration: Jenkins CI Reviewed-by: Piotr Kliczewski --- M lib/vdsm/kaxmlrpclib.py M lib/vdsm/network/netlink/addr.py M tests/Makefile.am M tests/gluster_cli_tests.py M vdsm/gluster/storagedev.py 5 files changed, 14 insertions(+), 13 deletions(-) Approvals: Piotr Kliczewski: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Dan Kenigsberg: Verified; Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
Piotr Kliczewski has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
gerrit-hooks has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 5: * 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/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
Dan Kenigsberg has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 5: Verified+1 copying score, no code change -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
Piotr Kliczewski has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 4: Code-Review+1 (3 comments) Minor date in copyrights update but the patch looks good. https://gerrit.ovirt.org/#/c/65008/4/lib/vdsm/kaxmlrpclib.py File lib/vdsm/kaxmlrpclib.py: PS4, Line 2: 2008-2011 please update https://gerrit.ovirt.org/#/c/65008/4/lib/vdsm/network/netlink/addr.py File lib/vdsm/network/netlink/addr.py: PS4, Line 1: 2014 please update https://gerrit.ovirt.org/#/c/65008/4/tests/gluster_cli_tests.py File tests/gluster_cli_tests.py: PS4, Line 2: 2012 please update -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Piotr Kliczewski Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
Ramesh N has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
Ramesh N has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 3: @Dan: I manually built and installed the vdsm packages with this patch. I didn't see any issue with the gluster management features. -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
Ramesh N has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
gerrit-hooks has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. 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.6', 'ovirt-4.0']) -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
gerrit-hooks has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. 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/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
gerrit-hooks has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. 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/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
Dan Kenigsberg has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. Patch Set 1: Ramesh, can you verify that the change does not harm vdsm nor its gluster support? -- To view, visit https://gerrit.ovirt.org/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ramesh N Gerrit-Reviewer: Sahina Bose Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
gerrit-hooks has posted comments on this change. Change subject: py3: make gluster_cli_tests pass .. 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/65008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
Change in vdsm[master]: py3: make gluster_cli_tests pass
Dan Kenigsberg has uploaded a new change for review.
Change subject: py3: make gluster_cli_tests pass
..
py3: make gluster_cli_tests pass
Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24
Signed-off-by: Dan Kenigsberg
---
M lib/vdsm/kaxmlrpclib.py
M lib/vdsm/network/netlink/addr.py
M tests/gluster_cli_tests.py
M vdsm/gluster/storagedev.py
4 files changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/65008/1
diff --git a/lib/vdsm/kaxmlrpclib.py b/lib/vdsm/kaxmlrpclib.py
index e24316c..66ec9e0 100644
--- a/lib/vdsm/kaxmlrpclib.py
+++ b/lib/vdsm/kaxmlrpclib.py
@@ -33,8 +33,8 @@
from __future__ import absolute_import
from __future__ import print_function
-import xmlrpclib
-import httplib
+import six.moves.xmlrpc_client
+import six.moves.http_client
import socket
# It would have been nicer to make these server-specific and not module-wide
@@ -48,19 +48,19 @@
def Server(url, *args, **kwargs):
kwargs['transport'] = TcpkeepTransport()
-server = xmlrpclib.Server(url, *args, **kwargs)
+server = six.moves.xmlrpc_client.Server(url, *args, **kwargs)
return server
ServerProxy = Server
-class TcpkeepTransport(xmlrpclib.Transport):
+class TcpkeepTransport(six.moves.xmlrpc_client.Transport):
def make_connection(self, host):
return TcpkeepHTTPConnection(host)
-class TcpkeepHTTPConnection(httplib.HTTPConnection):
+class TcpkeepHTTPConnection(six.moves.http_client.HTTPConnection):
def connect(self):
"""Connect to the host and port specified in __init__.
@@ -110,7 +110,7 @@
def SslServer(url, ctx, *args, **kwargs):
kwargs['transport'] = TcpkeepSafeTransport(ctx)
-server = xmlrpclib.Server(url, *args, **kwargs)
+server = six.moves.xmlrpc_client.Server(url, *args, **kwargs)
return server
SslServerProxy = SslServer
diff --git a/lib/vdsm/network/netlink/addr.py b/lib/vdsm/network/netlink/addr.py
index 0037454..cb17bf3 100644
--- a/lib/vdsm/network/netlink/addr.py
+++ b/lib/vdsm/network/netlink/addr.py
@@ -79,7 +79,7 @@
"""Returns the textual representation of the address flags"""
flags = (c_char * (CHARBUFFSIZE * 2))()
return frozenset(_rtnl_addr_flags2str(_rtnl_addr_get_flags(addr), flags,
- sizeof(flags)).split(','))
+ sizeof(flags)).split(b','))
# C function prototypes
diff --git a/tests/gluster_cli_tests.py b/tests/gluster_cli_tests.py
index 4ab9daf..0493c27 100644
--- a/tests/gluster_cli_tests.py
+++ b/tests/gluster_cli_tests.py
@@ -18,6 +18,8 @@
# Refer to the README and COPYING files for full details of the license
#
+import six
+
from testlib import VdsmTestCase as TestCaseBase
from gluster import cli as gcli
import xml.etree.cElementTree as etree
@@ -446,7 +448,7 @@
"""
tree = etree.fromstring(out)
status = gcli._parseVolumeStatusClients(tree)
-self.assertEquals(status.keys(), ['bricks', 'name'])
+self.assertEquals(set(six.iterkeys(status)), {'bricks', 'name'})
self.assertEquals(status['name'], 'music')
oBricks = [{'brick': '192.168.122.2:/tmp/music-b1',
'hostuuid':
diff --git a/vdsm/gluster/storagedev.py b/vdsm/gluster/storagedev.py
index a7ab985..a0eefaa 100644
--- a/vdsm/gluster/storagedev.py
+++ b/vdsm/gluster/storagedev.py
@@ -35,7 +35,7 @@
from vdsm import utils
from vdsm.gluster import exception as ge
-import fstab
+from . import fstab
from . import gluster_mgmt_api
--
To view, visit https://gerrit.ovirt.org/65008
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e212e247f057f2988debaf3b2de923851b90b24
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg
___
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
