Update example scripts for recent API changes
This commit is contained in:
parent
9cb803ee10
commit
1f1ba52e01
@ -4,11 +4,8 @@ import threading
|
||||
|
||||
from oslo.config import cfg
|
||||
|
||||
from oslo.messaging.openstack.common import log as logging
|
||||
from oslo import messaging
|
||||
|
||||
logging.setup('test-blocking')
|
||||
|
||||
_opts = [
|
||||
cfg.StrOpt('host', default=socket.gethostname()),
|
||||
]
|
||||
@ -16,37 +13,40 @@ _opts = [
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(_opts)
|
||||
|
||||
class Server(messaging.BlockingRPCServer):
|
||||
class Server(object):
|
||||
|
||||
def __init__(self, transport):
|
||||
target = messaging.Target(topic='testtopic',
|
||||
server=transport.conf.host,
|
||||
version='2.5')
|
||||
super(Server, self).__init__(transport, target, [self])
|
||||
self.target = messaging.Target(topic='testtopic',
|
||||
server=transport.conf.host,
|
||||
version='2.5')
|
||||
self._server = messaging.rpc_server.get_rpc_server(transport,
|
||||
self.target,
|
||||
[self])
|
||||
super(Server, self).__init__()
|
||||
|
||||
def start(self):
|
||||
self._server.start()
|
||||
|
||||
def test(self, ctxt, arg):
|
||||
self.stop()
|
||||
self._server.stop()
|
||||
return arg
|
||||
|
||||
transport = messaging.get_transport(CONF, 'fake:///testexchange')
|
||||
|
||||
server = Server(transport)
|
||||
|
||||
def server_thread(server):
|
||||
server.start()
|
||||
|
||||
thread = threading.Thread(target=server_thread, args=[server])
|
||||
thread = threading.Thread(target=server.start)
|
||||
thread.daemon = True
|
||||
thread.start()
|
||||
|
||||
class Client(messaging.RPCClient):
|
||||
class Client(object):
|
||||
|
||||
def __init__(self, transport):
|
||||
target = messaging.Target(topic='testtopic', version='2.0')
|
||||
super(Client, self).__init__(transport, target)
|
||||
self._client = messaging.RPCClient(transport, target)
|
||||
super(Client, self).__init__()
|
||||
|
||||
def test(self, ctxt, arg):
|
||||
cctxt = self.prepare(version='2.5')
|
||||
cctxt = self._client.prepare(version='2.5')
|
||||
return cctxt.call(ctxt, 'test', arg=arg)
|
||||
|
||||
|
||||
|
@ -8,11 +8,7 @@ import socket
|
||||
|
||||
from oslo.config import cfg
|
||||
|
||||
from oslo.messaging.openstack.common import log as logging
|
||||
from oslo import messaging
|
||||
from oslo.messaging import eventlet as evmsg
|
||||
|
||||
logging.setup('test-eventlet')
|
||||
|
||||
_opts = [
|
||||
cfg.StrOpt('host', default=socket.gethostname()),
|
||||
@ -21,13 +17,20 @@ _opts = [
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(_opts)
|
||||
|
||||
class Server(evmsg.EventletRPCServer):
|
||||
class Server(object):
|
||||
|
||||
def __init__(self, transport):
|
||||
target = messaging.Target(topic='testtopic',
|
||||
server=transport.conf.host,
|
||||
version='2.5')
|
||||
super(Server, self).__init__(transport, target, [self])
|
||||
self.target = messaging.Target(topic='testtopic',
|
||||
server=transport.conf.host,
|
||||
version='2.5')
|
||||
self._server = messaging.rpc_server.get_rpc_server(transport,
|
||||
self.target,
|
||||
[self],
|
||||
executor='eventlet')
|
||||
super(Server, self).__init__()
|
||||
|
||||
def start(self):
|
||||
self._server.start()
|
||||
|
||||
def test(self, ctxt, arg):
|
||||
return arg
|
||||
@ -38,14 +41,15 @@ server = Server(transport)
|
||||
server.start()
|
||||
|
||||
|
||||
class Client(messaging.RPCClient):
|
||||
class Client(object):
|
||||
|
||||
def __init__(self, transport):
|
||||
target = messaging.Target(topic='testtopic', version='2.0')
|
||||
super(Client, self).__init__(transport, target)
|
||||
self._client = messaging.RPCClient(transport, target)
|
||||
super(Client, self).__init__()
|
||||
|
||||
def test(self, ctxt, arg):
|
||||
cctxt = self.prepare(version='2.5')
|
||||
cctxt = self._client.prepare(version='2.5')
|
||||
return cctxt.call(ctxt, 'test', arg=arg)
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user