Add client_url and server_url to all scenarios

performa/modules/omsimulator.py

@@ -180,7 +180,7 @@ def main():
         argument_spec=dict(
             mode=dict(required=True,
                       choices=['call', 'cast', 'fanout', 'notify']),
-            url=dict(required=True),
+            url=dict(),
             client_url=dict(),
             server_url=dict(),
             threads=dict(type='int', default=10),

performa/scenarios/mq/omsimulator-ha-call.yaml

@@ -6,8 +6,8 @@ description:
 parameters:
   tester_hosts: List of hosts were omsimulator will be executed
   rabbit_url: RabbitMQ address used by both server and client
-  client_url: RabbitMQ address used by the client
+  client_url: Override RabbitMQ address for the client
-  server_url: RabbitMQ address used by the server
+  server_url: Override RabbitMQ address for the server
 
 setup:
   -

performa/scenarios/mq/omsimulator-ha-cast.yaml

@@ -6,6 +6,8 @@ description:
 parameters:
   tester_hosts: List of hosts were omsimulator will be executed
   rabbit_url: RabbitMQ address
+  client_url: Override RabbitMQ address for the client
+  server_url: Override RabbitMQ address for the server
 
 setup:
   -
@@ -40,6 +42,8 @@ execution:
         threads: 1
         host_count: 1
         url: {{ rabbit_url }}
+        client_url: {{ client_url }}
+        server_url: {{ server_url }}
 
 report:
   template: omsimulator-ha-cast.rst

performa/scenarios/mq/omsimulator-ha-notify.yaml

@@ -6,6 +6,8 @@ description:
 parameters:
   tester_hosts: List of hosts were omsimulator will be executed
   rabbit_url: RabbitMQ address
+  client_url: Override RabbitMQ address for the client
+  server_url: Override RabbitMQ address for the server
 
 setup:
   -
@@ -40,6 +42,8 @@ execution:
         threads: 1
         host_count: 1
         url: {{ rabbit_url }}
+        client_url: {{ client_url }}
+        server_url: {{ server_url }}
 
 report:
   template: omsimulator-ha-notify.rst

performa/scenarios/mq/omsimulator-threading.yaml

@@ -7,6 +7,8 @@ parameters:
   tester_hosts: List of hosts were omsimulator will be executed
   rabbit_hosts: List of hosts were RabbitMQ runs
   rabbit_url: RabbitMQ address
+  client_url: Override RabbitMQ address for the client
+  server_url: Override RabbitMQ address for the server
 
 setup:
   -
@@ -53,6 +55,8 @@ execution:
         mode: call
         duration: 100
         url: {{ rabbit_url }}
+        client_url: {{ client_url }}
+        server_url: {{ server_url }}
   -
     hosts: {{ tester_hosts }}
     matrix:
@@ -62,6 +66,8 @@ execution:
         mode: cast
         duration: 100
         url: {{ rabbit_url }}
+        client_url: {{ client_url }}
+        server_url: {{ server_url }}
   -
     hosts: {{ tester_hosts }}
     matrix:
@@ -71,6 +77,8 @@ execution:
         mode: notify
         duration: 100
         url: {{ rabbit_url }}
+        client_url: {{ client_url }}
+        server_url: {{ server_url }}
   -
     hosts: {{ rabbit_hosts }}
     tasks:

performa/scenarios/mq/omsimulator.yaml

@@ -7,6 +7,8 @@ parameters:
   tester_hosts: List of hosts were omsimulator will be executed
   rabbit_hosts: List of hosts were RabbitMQ runs
   rabbit_url: RabbitMQ address
+  client_url: Override RabbitMQ address for the client
+  server_url: Override RabbitMQ address for the server
 
 setup:
   -
@@ -54,6 +56,8 @@ execution:
         duration: 100
         threads: 10
         url: {{ rabbit_url }}
+        client_url: {{ client_url }}
+        server_url: {{ server_url }}
   -
     hosts: {{ tester_hosts }}
     matrix:
@@ -64,6 +68,8 @@ execution:
         duration: 100
         threads: 10
         url: {{ rabbit_url }}
+        client_url: {{ client_url }}
+        server_url: {{ server_url }}
   -
     hosts: {{ tester_hosts }}
     matrix:
@@ -74,6 +80,8 @@ execution:
         duration: 100
         threads: 10
         url: {{ rabbit_url }}
+        client_url: {{ client_url }}
+        server_url: {{ server_url }}
   -
     hosts: {{ rabbit_hosts }}
     tasks: