openstack/oslo.messaging
Code Issues Proposed changes

Improve simulator.py

Browse Source 
* passing targets to rpc-client using -tg arg
so clients can send messages to different targets
* removed redis.flush_db() so we can start
several simulator processes for zmq.

Change-Id: I0d36c5d8cbec938c8fd85d1041d2a3bff02b49e5
This commit is contained in:
Yulia Portnova 2016-01-26 14:24:19 +02:00
parent a053593c13
commit 062fedccd0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/simulator.py
View File

@ -333,12 +333,15 @@ def main():
parser.add_argument('-d', '--debug', dest='debug', type=bool, parser.add_argument('-d', '--debug', dest='debug', type=bool,
default=False, default=False,
help="Turn on DEBUG logging level instead of WARN") help="Turn on DEBUG logging level instead of WARN")
parser.add_argument('-tp', '--topics', dest='topics', nargs="+", parser.add_argument('-tp', '--topic', dest='topic',
default=["profiler_topic"], default="profiler_topic",
help="Topics to publish/receive messages to/from.") help="Topics to publish/receive messages to/from.")
parser.add_argument('-s', '--server', dest='server', parser.add_argument('-s', '--server', dest='server',
default="profiler_server", default="profiler_server",
help="Server to publish/receive messages to/from.") help="Servers to publish/receive messages to/from.")
parser.add_argument('-tg', '--targets', dest='targets', nargs="+",
default=["profiler_topic.profiler_server"],
help="Targets to publish/receive messages to/from.")
parser.add_argument('-l', dest='duration', type=int, parser.add_argument('-l', dest='duration', type=int,
help='send messages for certain time') help='send messages for certain time')
parser.add_argument('--config-file', dest='config_file', type=str, parser.add_argument('--config-file', dest='config_file', type=str,
@ -407,10 +410,9 @@ def main():
cfg.CONF.project = 'oslo.messaging' cfg.CONF.project = 'oslo.messaging'
if args.mode == 'rpc-server': if args.mode == 'rpc-server':
target = messaging.Target(topic=args.topics[0], server=args.server) target = messaging.Target(topic=args.topic, server=args.server)
if args.url.startswith('zmq'): if args.url.startswith('zmq'):
cfg.CONF.rpc_zmq_matchmaker = "redis" cfg.CONF.rpc_zmq_matchmaker = "redis"
transport._driver.matchmaker._redis.flushdb()
rpc_server(transport, target, args.wait_before_answer, args.executor, rpc_server(transport, target, args.wait_before_answer, args.executor,
args.show_stats, args.duration) args.show_stats, args.duration)
elif args.mode == 'notify-server': elif args.mode == 'notify-server':
@ -422,10 +424,10 @@ def main():
args.wait_after_msg, args.timeout) args.wait_after_msg, args.timeout)
elif args.mode == 'rpc-client': elif args.mode == 'rpc-client':
init_msg(args.messages) init_msg(args.messages)
targets = [target.partition('.')[::2] for target in args.targets]
start = datetime.datetime.now() start = datetime.datetime.now()
targets = [messaging.Target(topic=topic, server=args.server) for topic targets = [messaging.Target(topic=topic, server=server_name) for topic,
in args.topics] server_name in targets]
spawn_rpc_clients(args.threads, transport, targets, spawn_rpc_clients(args.threads, transport, targets,
args.wait_after_msg, args.timeout, args.is_cast, args.wait_after_msg, args.timeout, args.is_cast,
args.messages, args.duration) args.messages, args.duration)