vdsm-patches October 2016

vdsm-patches@lists.fedorahosted.org

33 participants
468 discussions

Change in vdsm[master]: betterasynccore: Prevent double close
by Nir Soffer 24 Dec '16

24 Dec '16

Nir Soffer has uploaded a new change for review. Change subject: betterasynccore: Prevent double close ...................................................................... betterasynccore: Prevent double close asyncore.dispatcher is defining a closing attribute, but never use it. This make it possible to close a dispatcher multiple times, failing with KeyError after the first call. Because of the asynchronous nature of the reactor, it is very hard to ensure that all dispatchers are closed before the reactor, so we need a more robust close method. This patch uses the closing attribute to eliminate double close errors. Change-Id: Ia293deb79affc2f740d825e24ce8c66449385111 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/yajsonrpc/betterAsyncore.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/65209/1 diff --git a/lib/yajsonrpc/betterAsyncore.py b/lib/yajsonrpc/betterAsyncore.py index c32b54c..b86c919 100644 --- a/lib/yajsonrpc/betterAsyncore.py +++ b/lib/yajsonrpc/betterAsyncore.py @@ -69,6 +69,12 @@ def handle_write(self): self._delegate_call("handle_write") + def close(self): + if self.closing: + return + self.closing = True + asyncore.dispatcher.close(self) + def switch_implementation(self, impl): self.__impl = impl -- To view, visit https://gerrit.ovirt.org/65209 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia293deb79affc2f740d825e24ce8c66449385111 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

3 2

Change in vdsm[master]: protocoldetector: Fix random double close
by Nir Soffer 24 Dec '16

24 Dec '16

Nir Soffer has uploaded a new change for review. Change subject: protocoldetector: Fix random double close ...................................................................... protocoldetector: Fix random double close Previously we stopped the reactor before closing the acceptor. This works most of the time, but once in a while, it fails with this error: Traceback (most recent call last): File "vdsm/tests/protocoldetectorTests.py", line 113, in tearDown self.acceptor.stop() File "vdsm/lib/vdsm/protocoldetector.py", line 211, in stop self._acceptor.close() File "/usr/lib64/python2.7/asyncore.py", line 407, in close self.del_channel() File "vdsm/lib/yajsonrpc/betterAsyncore.py", line 137, in del_channel asyncore.dispatcher.del_channel(self, map) File "/usr/lib64/python2.7/asyncore.py", line 292, in del_channel del map[fd] KeyError: 63 The flow of events leading to this error is: 1. Stooping reactor, signaling the reactor thread via eventfd 2. Context switch to the reactor thread 3. Reactor find it it was closed and close all dispatchers 4. Context switch to the original thread 5. Closing acceptor, fd is not in asyncore map This patch fixes this issue by closing the acceptor before stopping the reactor. Change-Id: I0cec41c4baebcc620b70e19e62febed5dc9c542d Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/protocoldetector.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/65187/1 diff --git a/lib/vdsm/protocoldetector.py b/lib/vdsm/protocoldetector.py index 196a2ab..e505aa7 100644 --- a/lib/vdsm/protocoldetector.py +++ b/lib/vdsm/protocoldetector.py @@ -207,8 +207,8 @@ def stop(self): self.log.debug("Stopping Acceptor") - self._reactor.stop() self._acceptor.close() + self._reactor.stop() class _CannotDetectProtocol(Exception): -- To view, visit https://gerrit.ovirt.org/65187 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0cec41c4baebcc620b70e19e62febed5dc9c542d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 9

Change in vdsm[master]: py3: fix remaining references to monitor.MonitorError as ite...
by Dan Kenigsberg 24 Dec '16

24 Dec '16

Dan Kenigsberg has uploaded a new change for review. Change subject: py3: fix remaining references to monitor.MonitorError as iterable ...................................................................... py3: fix remaining references to monitor.MonitorError as iterable Change-Id: Ic991c1a017f09431d4b38f58e529d0a6ec45a896 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M init/wait_for_ipv4s M tests/network/nettestlib.py 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/29/64929/1 diff --git a/init/wait_for_ipv4s b/init/wait_for_ipv4s index c1e7f32..ab119de 100755 --- a/init/wait_for_ipv4s +++ b/init/wait_for_ipv4s @@ -51,7 +51,7 @@ if not ipless_devs: return except monitor.MonitorError as e: - if e[0] == monitor.E_TIMEOUT: + if e.args[0] == monitor.E_TIMEOUT: sys.stderr.write('IP addresses has not been caught within the ' 'given timeout.\n') else: diff --git a/tests/network/nettestlib.py b/tests/network/nettestlib.py index bf32ea3..a5fc461 100644 --- a/tests/network/nettestlib.py +++ b/tests/network/nettestlib.py @@ -464,7 +464,7 @@ return except monitor.MonitorError as e: - if e[0] == monitor.E_TIMEOUT: + if e.args[0] == monitor.E_TIMEOUT: raise Exception( 'IPv6 addresses has not been caught within 20sec.\n' 'Event log: {}\n'.format(logevents)) -- To view, visit https://gerrit.ovirt.org/64929 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic991c1a017f09431d4b38f58e529d0a6ec45a896 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

4 7

Change in vdsm[master]: v2v: support for block devices
by shavivi＠redhat.com 16 Dec '16

16 Dec '16

Shahar Havivi has uploaded a new change for review. Change subject: v2v: support for block devices ...................................................................... v2v: support for block devices extended support for block devices for KVM and VMWare. currently we do support block devices that exported as file in libvirt: <disk type='file' device='disk'> <source file='...'/> ... Added support for type block: <disk type='block' device='disk'> <source dev='/dev/mapper/...'/> ... Bug-Url: https://bugzilla.redhat.com/1378340 Change-Id: I5f7a85715764efded7b296e858b130a05fe10f2a Signed-off-by: Shahar Havivi <shaharh(a)redhat.com> --- M lib/vdsm/v2v.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/64272/1 diff --git a/lib/vdsm/v2v.py b/lib/vdsm/v2v.py index 4752477..ceb2b2b 100644 --- a/lib/vdsm/v2v.py +++ b/lib/vdsm/v2v.py @@ -1066,6 +1066,7 @@ def _add_disks(root, params): params['disks'] = [] disks = root.findall('.//disk[@type="file"]') + disks = disks + root.findall('.//disk[@type="block"]') for disk in disks: d = {} device = disk.get('device') @@ -1077,6 +1078,11 @@ source = disk.find('./source/[@file]') if source is not None: d['alias'] = source.get('file') + else: + source = disk.find('./source/[@dev]') + if source is not None: + d['alias'] = source.get('dev') + driver = disk.find('./driver/[@type]') if driver is not None: try: -- To view, visit https://gerrit.ovirt.org/64272 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f7a85715764efded7b296e858b130a05fe10f2a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com>

5 16

Change in vdsm[master]: after_vm_destroy.py: migrate to jsonrpcvdscli
by igoihman＠redhat.com 11 Dec '16

11 Dec '16

Irit Goihman has uploaded a new change for review. Change subject: after_vm_destroy.py: migrate to jsonrpcvdscli ...................................................................... after_vm_destroy.py: migrate to jsonrpcvdscli vdscli is deprecated and replaced by jsonrpcvdscli Change-Id: I3f3fa6479dde2c4a1298d0ae167d888d9f7e020a Signed-off-by: Irit Goihman <igoihman(a)redhat.com> --- M vdsm_hooks/vhostmd/after_vm_destroy.py 1 file changed, 10 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/62383/1 diff --git a/vdsm_hooks/vhostmd/after_vm_destroy.py b/vdsm_hooks/vhostmd/after_vm_destroy.py index e8887bd..7064286 100644 --- a/vdsm_hooks/vhostmd/after_vm_destroy.py +++ b/vdsm_hooks/vhostmd/after_vm_destroy.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -# Copyright 2011 Red Hat, Inc. +# Copyright 2011-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 @@ -22,14 +22,20 @@ import os import subprocess import hooking -from vdsm import vdscli -s = vdscli.connect() +from vdsm.config import config +from vdsm import jsonrpcvdscli -res = s.list(True) +requestQueues = config.get("addresses", "request_queues") +requestQueue = requestQueues.split(",")[0] +server = jsonrpcvdscli.connect(requestQueue=requestQueue) + +res = server.list(True) if res['status']['code'] == 0: if not [v for v in res['vmList'] if v.get('vmId') != os.environ.get('vmId') and hooking.tobool(v.get('custom', {}).get('sap_agent', False))]: subprocess.call(['/usr/bin/sudo', '-n', '/sbin/service', 'vhostmd', 'stop']) + +server.close() -- To view, visit https://gerrit.ovirt.org/62383 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f3fa6479dde2c4a1298d0ae167d888d9f7e020a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Irit Goihman <igoihman(a)redhat.com>

6 24

Change in vdsm[master]: py3: make network/tc_test pass
by Dan Kenigsberg 06 Dec '16

06 Dec '16

Dan Kenigsberg has uploaded a new change for review. Change subject: py3: make network/tc_test pass ...................................................................... py3: make network/tc_test pass Change-Id: I544446358e611a0507aad7d7df4ab6c57ad5bdf0 Signed-off-by: Dan Kenigsberg <danken(a)redhat.com> --- M tests/Makefile.am M tests/network/tc_test.py 2 files changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/98/63198/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 2dce548..7243e50 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -201,7 +201,6 @@ network/ovs_driver_test.py \ network/ovs_info_test.py \ network/ovs_test.py \ - network/tc_test.py \ network/unified_persistence_test.py \ numaUtilsTests.py \ outOfProcessTests.py \ diff --git a/tests/network/tc_test.py b/tests/network/tc_test.py index 7ac30c0..12bd17e 100644 --- a/tests/network/tc_test.py +++ b/tests/network/tc_test.py @@ -25,14 +25,14 @@ import os import sys from binascii import unhexlify -from itertools import izip_longest from subprocess import Popen, PIPE from nose.plugins.attrib import attr import six +from six.moves import zip_longest -from hostdevTests import Connection +from vmfakecon import Connection from testlib import (VdsmTestCase as TestCaseBase, permutations, expandPermutations) from testValidation import ValidateRunningAsRoot, stresstest @@ -170,8 +170,8 @@ with open(path) as tc_filter_show: data = tc_filter_show.read() - for parsed, correct in izip_longest(tc._filters(None, out=data), - filters): + for parsed, correct in zip_longest(tc._filters(None, out=data), + filters): self.assertEqual(parsed, correct) def test_qdiscs(self): @@ -220,8 +220,8 @@ 'target': 5000.0, 'interval': 150000.0, 'ecn': True}}, ) - for parsed, correct in izip_longest(tc.qdiscs(None, out=data), - qdiscs): + for parsed, correct in zip_longest(tc.qdiscs(None, out=data), + qdiscs): self.assertEqual(parsed, correct) def test_classes(self): @@ -265,8 +265,8 @@ 'leaf': '5000:', 'hfsc': {'ls': {'m1': 0, 'd': 0, 'm2': reported_ls_5000}}}, ) - for parsed, correct in izip_longest(tc.classes(None, out=data), - classes): + for parsed, correct in zip_longest(tc.classes(None, out=data), + classes): self.assertEqual(parsed, correct) -- To view, visit https://gerrit.ovirt.org/63198 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I544446358e611a0507aad7d7df4ab6c57ad5bdf0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>

3 8

Change in vdsm[master]: virt: Destroy VM after post-copy migration failure
by mzamazal＠redhat.com 02 Dec '16

02 Dec '16

Milan Zamazal has uploaded a new change for review. Change subject: virt: Destroy VM after post-copy migration failure ...................................................................... virt: Destroy VM after post-copy migration failure As explained in the source code comment, we don't have currently a better option than to destroy the VM remnants after a failed post-copy migration. This may change in future, if a failed post-copy migration recovery is available in libvirt/QEMU. Change-Id: I1918e9afce189c8b3f617766e55afa13f1e153f1 Signed-off-by: Milan Zamazal <mzamazal(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/1354343 --- M lib/vdsm/virt/vmexitreason.py M vdsm/virt/vm.py 2 files changed, 24 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/64142/7 diff --git a/lib/vdsm/virt/vmexitreason.py b/lib/vdsm/virt/vmexitreason.py index 46c092b..494cd28 100644 --- a/lib/vdsm/virt/vmexitreason.py +++ b/lib/vdsm/virt/vmexitreason.py @@ -30,6 +30,7 @@ MIGRATION_FAILED = 8 LIBVIRT_DOMAIN_MISSING = 9 DESTROYED_ON_STARTUP = 10 +POSTCOPY_MIGRATION_FAILED = 11 exitReasons = { @@ -44,4 +45,5 @@ MIGRATION_FAILED: 'VM failed to migrate', LIBVIRT_DOMAIN_MISSING: 'Failed to find the libvirt domain', DESTROYED_ON_STARTUP: 'VM destroyed during the startup', + POSTCOPY_MIGRATION_FAILED: 'Migration failed in post-copy', } diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index ed60354..e274388 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -4163,7 +4163,28 @@ else: hooks.after_vm_pause(domxml, self.conf) elif detail == libvirt.VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY_FAILED: - pass # will be handled in a followup patch + # This can happen on both the ends of the migration. + # After a failed post-copy migration, the VM remains in a + # paused state on both the ends of the migration. There is + # currently no way to recover it, since the VM is missing some + # memory pages on the destination and the old snapshot at the + # source doesn't know about the changes made to the external + # world (network, storage, ...) during the post-copy phase. + # The best what we can do in such a situation is to destroy the + # paused VM instances on both the ends before someone tries to + # resume any of them, causing confusion at best or more damages + # in the worse case. We must also inform Engine about the + # fatal state of the failed migration, so we can't destroy the + # VM immediately on the destination (but we can do it on the + # source). We report the VM as down on the destination to + # Engine and wait for destroy request from it. + self.log.warning("Migration failed in post-copy, " + "destroying VM: %s" % (self.id,)) + destroy = self.lastStatus == vmstatus.MIGRATION_SOURCE + self.setDownStatus(ERROR, + vmexitreason.POSTCOPY_MIGRATION_FAILED) + if destroy: + self.destroy() elif event == libvirt.VIR_DOMAIN_EVENT_RESUMED: self._setGuestCpuRunning(True) -- To view, visit https://gerrit.ovirt.org/64142 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1918e9afce189c8b3f617766e55afa13f1e153f1 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Milan Zamazal <mzamazal(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com> Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>

4 6

Change in vdsm[master]: vmstats: user proper way to detect host devices
by fromani＠redhat.com 02 Dec '16

02 Dec '16

Francesco Romani has uploaded a new change for review. Change subject: vmstats: user proper way to detect host devices ...................................................................... vmstats: user proper way to detect host devices Lacking better ways, back in time we detected host devices checking their name (!). Now we the code is evolved and we have proper and safer way to do the same task, so this patch updates the vmstats code accordingly. Change-Id: Ic71db639b980dbdf29284c432f4acda95b402c4f Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M lib/vdsm/virt/vmstats.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/65771/1 diff --git a/lib/vdsm/virt/vmstats.py b/lib/vdsm/virt/vmstats.py index 8e271cb..9b65fbd 100644 --- a/lib/vdsm/virt/vmstats.py +++ b/lib/vdsm/virt/vmstats.py @@ -330,7 +330,7 @@ last_indexes = _find_bulk_stats_reverse_map(last_sample, 'net') for nic in vm.getNicDevices(): - if nic.name.startswith('hostdev'): + if nic.is_hostdevice: continue # may happen if nic is a new hot-plugged one -- To view, visit https://gerrit.ovirt.org/65771 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic71db639b980dbdf29284c432f4acda95b402c4f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

4 3

Change in vdsm[master]: network: devices: properly initialize attributes
by fromani＠redhat.com 01 Dec '16

01 Dec '16

Francesco Romani has uploaded a new change for review. Change subject: network: devices: properly initialize attributes ...................................................................... network: devices: properly initialize attributes The `name' attribute used to be added to devices only after the device data was refreshed from libvirt. This can lead to AttributeErrors if a VM starts (very) slowly. Furthermore, is good practice to initialize all the device object attributes in __init__. Change-Id: I21ef87a9524cbfe752e6cc0f7d1d9f6139c61dfb Signed-off-by: Francesco Romani <fromani(a)redhat.com> --- M vdsm/virt/vmdevices/network.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/72/65772/1 diff --git a/vdsm/virt/vmdevices/network.py b/vdsm/virt/vmdevices/network.py index 7628f06..618c34d 100644 --- a/vdsm/virt/vmdevices/network.py +++ b/vdsm/virt/vmdevices/network.py @@ -48,6 +48,7 @@ kwargs[attr] = net_api.DUMMY_BRIDGE super(Interface, self).__init__(conf, log, **kwargs) self.sndbufParam = False + self.name = "" self.is_hostdevice = self.device == hwclass.HOSTDEV self.vlanId = self.specParams.get('vlanid') self._customize() -- To view, visit https://gerrit.ovirt.org/65772 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21ef87a9524cbfe752e6cc0f7d1d9f6139c61dfb Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani <fromani(a)redhat.com>

4 3

Change in vdsm[master]: contrib: Simple jsonrpc client
by Nir Soffer 30 Nov '16

30 Nov '16

Nir Soffer has uploaded a new change for review. Change subject: contrib: Simple jsonrpc client ...................................................................... contrib: Simple jsonrpc client This is a simple jsonrpc client for communicating with the jsonrpc server from the command line. Arguments method one of the mehtods described in json schema params optionl json object with message parameters Examples Calling method without arguements: # jsonrpc Host.getVMList { "jsonrpc": "2.0", "id": "0e043d83-294a-4d31-b1b6-6dc2f2747494", "result": [ "b3f6fa00-b315-4ad4-8108-f73da817b5c5" ] } Calling method with arguements: # jsonrpc VM.getStats '{"vmID": "b3f6fa00-b315-4ad4-8108-f73da817b5c5"}' { "jsonrpc": "2.0", "id": "cefd25a3-6250-4123-8a56-d7047899e19e", "result": [ { "status": "Down", "exitMessage": "Admin shut down from the engine", "vmId": "b3f6fa00-b315-4ad4-8108-f73da817b5c5", "exitReason": 6, "timeOffset": "0", "exitCode": 0 } ] } Requires stomp.py library: https://pypi.python.org/pypi/stomp.py Change-Id: Ia6273eabf6f3601602659d1e4e748d8025ae8084 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- A contrib/jsonrpc 1 file changed, 104 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/35181/1 diff --git a/contrib/jsonrpc b/contrib/jsonrpc new file mode 100755 index 0000000..3080193 --- /dev/null +++ b/contrib/jsonrpc @@ -0,0 +1,104 @@ +#!/usr/bin/python +# +# Copyright 2014 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 +# +""" +jsonrpc-cli - Vdsm jsonrpc client +""" + +import json +import os +import signal +import sys +import time +import uuid +import optparse + +import stomp + +# Copied from lib/vdsm/vdscli.py +PKIDIR = '/etc/pki/vdsm' +KEYFILE = os.path.join(PKIDIR, 'keys/vdsmkey.pem') +CERTFILE = os.path.join(PKIDIR, 'certs/vdsmcert.pem') +CACERT = os.path.join(PKIDIR, 'certs/cacert.pem') + +PORT = 54321 +DESTINATION = "/queue/_local/vdsm/requests" + + +class Listener(stomp.ConnectionListener): + + def on_error(self, headers, message): + print 'Error: %s' % message + terminate() + + def on_message(self, headers, message): + msg = json.loads(message) + print json.dumps(msg, indent=4) + terminate() + + +def main(args): + parser = option_parser() + options, args = parser.parse_args(args) + if not args: + parser.error("method required") + + msg = { + "id": str(uuid.uuid4()), + "jsonrpc": "2.0", + "method": args[0] + } + + if len(args) > 1: + msg["params"] = json.loads(args[1]) + + conn = stomp.Connection10( + host_and_ports=((options.host, PORT),), + use_ssl=True, + ssl_key_file=KEYFILE, + ssl_cert_file=CERTFILE, + ssl_ca_certs=CACERT) + + conn.set_listener("", Listener()) + conn.start() + conn.send(body=json.dumps(msg), destination=DESTINATION) + + try: + signal.pause() + except KeyboardInterrupt: + pass + + conn.disconnect() + + +def option_parser(): + parser = optparse.OptionParser(usage='%prog [options] method [params]') + parser.add_option("-a", "--host", dest="host", + help="host address (default localhost)") + parser.set_defaults(host="localhost") + return parser + + +def terminate(): + os.kill(os.getpid(), signal.SIGINT) + + +if __name__ == "__main__": + main(sys.argv[1:]) -- To view, visit http://gerrit.ovirt.org/35181 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia6273eabf6f3601602659d1e4e748d8025ae8084 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

9 53

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches October 2016