WIP, recipe modification for multi-users.

slapos/recipe/erp5scalabilitytestbed/__init__.py

@@ -47,8 +47,7 @@ class Recipe(BaseSlapRecipe):
 
     config['address'] = self.getGlobalIPv6Address()
     config['report_path'] = self.log_directory
-    config.setdefault('nb_server_max', 3)
-    config.setdefault('nb_tester_max', 3)
+    config.setdefault('user_range_increment', 1)
     config['software_release_url'] = self.software_release_url
     config['server_url'] = self.server_url
     config['key_file'] = self.key_file
@@ -57,6 +56,13 @@ class Recipe(BaseSlapRecipe):
     config['computer_partition_id'] = self.computer_partition_id
     config['plugin_name'] = 'erp5'
 
+    if ',' in config['nb_users']:
+      config['nb_tester_init'] = config['nb_users'].split(',')[0]
+      config['nb_tester_max'] = config['nb_users'].split(',')[1]
+    else:
+      config['nb_tester_init'] = config['nb_users']
+      config['nb_tester_max'] = config['nb_users']
+
     connection = {}
     connection['url'] = 'http://['+config['address']+']:5000/'
     connection['erp5_url'] = config['erp5_url']

slapos/recipe/erp5scalabilitytestbed/template/erp5tester_manager_run.in

@@ -2,6 +2,6 @@
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
 exec %(scalability_tester_manager_binary)s -a %(address)s -r %(report_path)s \
-  -s %(nb_server_max)s -t %(nb_tester_max)s %(software_release_url)s \
+  -m %(nb_tester_init)s-t %(nb_tester_max)s %(software_release_url)s \
   %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s \
   %(computer_partition_id)s %(plugin_name)s