Browse Source

Add client_url and server_url to all scenarios

Ilya Shakhat 3 years ago
parent
commit
81ba681918

+ 1
- 1
performa/modules/omsimulator.py View File

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

+ 2
- 2
performa/scenarios/mq/omsimulator-ha-call.yaml View File

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

+ 4
- 0
performa/scenarios/mq/omsimulator-ha-cast.yaml View File

@@ -6,6 +6,8 @@ description:
6 6
 parameters:
7 7
   tester_hosts: List of hosts were omsimulator will be executed
8 8
   rabbit_url: RabbitMQ address
9
+  client_url: Override RabbitMQ address for the client
10
+  server_url: Override RabbitMQ address for the server
9 11
 
10 12
 setup:
11 13
   -
@@ -40,6 +42,8 @@ execution:
40 42
         threads: 1
41 43
         host_count: 1
42 44
         url: {{ rabbit_url }}
45
+        client_url: {{ client_url }}
46
+        server_url: {{ server_url }}
43 47
 
44 48
 report:
45 49
   template: omsimulator-ha-cast.rst

+ 4
- 0
performa/scenarios/mq/omsimulator-ha-notify.yaml View File

@@ -6,6 +6,8 @@ description:
6 6
 parameters:
7 7
   tester_hosts: List of hosts were omsimulator will be executed
8 8
   rabbit_url: RabbitMQ address
9
+  client_url: Override RabbitMQ address for the client
10
+  server_url: Override RabbitMQ address for the server
9 11
 
10 12
 setup:
11 13
   -
@@ -40,6 +42,8 @@ execution:
40 42
         threads: 1
41 43
         host_count: 1
42 44
         url: {{ rabbit_url }}
45
+        client_url: {{ client_url }}
46
+        server_url: {{ server_url }}
43 47
 
44 48
 report:
45 49
   template: omsimulator-ha-notify.rst

+ 8
- 0
performa/scenarios/mq/omsimulator-threading.yaml View File

@@ -7,6 +7,8 @@ parameters:
7 7
   tester_hosts: List of hosts were omsimulator will be executed
8 8
   rabbit_hosts: List of hosts were RabbitMQ runs
9 9
   rabbit_url: RabbitMQ address
10
+  client_url: Override RabbitMQ address for the client
11
+  server_url: Override RabbitMQ address for the server
10 12
 
11 13
 setup:
12 14
   -
@@ -53,6 +55,8 @@ execution:
53 55
         mode: call
54 56
         duration: 100
55 57
         url: {{ rabbit_url }}
58
+        client_url: {{ client_url }}
59
+        server_url: {{ server_url }}
56 60
   -
57 61
     hosts: {{ tester_hosts }}
58 62
     matrix:
@@ -62,6 +66,8 @@ execution:
62 66
         mode: cast
63 67
         duration: 100
64 68
         url: {{ rabbit_url }}
69
+        client_url: {{ client_url }}
70
+        server_url: {{ server_url }}
65 71
   -
66 72
     hosts: {{ tester_hosts }}
67 73
     matrix:
@@ -71,6 +77,8 @@ execution:
71 77
         mode: notify
72 78
         duration: 100
73 79
         url: {{ rabbit_url }}
80
+        client_url: {{ client_url }}
81
+        server_url: {{ server_url }}
74 82
   -
75 83
     hosts: {{ rabbit_hosts }}
76 84
     tasks:

+ 8
- 0
performa/scenarios/mq/omsimulator.yaml View File

@@ -7,6 +7,8 @@ parameters:
7 7
   tester_hosts: List of hosts were omsimulator will be executed
8 8
   rabbit_hosts: List of hosts were RabbitMQ runs
9 9
   rabbit_url: RabbitMQ address
10
+  client_url: Override RabbitMQ address for the client
11
+  server_url: Override RabbitMQ address for the server
10 12
 
11 13
 setup:
12 14
   -
@@ -54,6 +56,8 @@ execution:
54 56
         duration: 100
55 57
         threads: 10
56 58
         url: {{ rabbit_url }}
59
+        client_url: {{ client_url }}
60
+        server_url: {{ server_url }}
57 61
   -
58 62
     hosts: {{ tester_hosts }}
59 63
     matrix:
@@ -64,6 +68,8 @@ execution:
64 68
         duration: 100
65 69
         threads: 10
66 70
         url: {{ rabbit_url }}
71
+        client_url: {{ client_url }}
72
+        server_url: {{ server_url }}
67 73
   -
68 74
     hosts: {{ tester_hosts }}
69 75
     matrix:
@@ -74,6 +80,8 @@ execution:
74 80
         duration: 100
75 81
         threads: 10
76 82
         url: {{ rabbit_url }}
83
+        client_url: {{ client_url }}
84
+        server_url: {{ server_url }}
77 85
   -
78 86
     hosts: {{ rabbit_hosts }}
79 87
     tasks:

Loading…
Cancel
Save