Fix tester command lines.

slapos/recipe/erp5scalabilitytestbed/__init__.py

@@ -24,6 +24,8 @@
 #
 ##############################################################################
 
+import os
+import pkg_resources
 from slapos.recipe.librecipe import BaseSlapRecipe
 
 class Recipe(BaseSlapRecipe):
@@ -56,7 +58,7 @@ class Recipe(BaseSlapRecipe):
     config['plugin_name'] = 'erp5'
 
     connection = {}
-    connection['url'] = 'http://["+config['address']+"]:5000/'
+    connection['url'] = 'http://['+config['address']+']:5000/'
     connection['erp5_url'] = config['erp5_url']
     connection['repeat'] = config['repeat']
     connection['nb_users'] = config['nb_users']

slapos/recipe/erp5scalabilitytestbed/template/erp5tester_manager_run.in

 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-exec %(nosqltester_manager_binary)s -a %(address)s -r %(report_path)s -s %(nb_server_max)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 %(nb_thread)s %(nb_request)s
+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 \
+  %(server_url)s "%(key_file)s" "%(cert_file)s" %(computer_id)s \
+  %(computer_partition_id)s %(plugin_name)s

slapos/recipe/erp5scalabilitytestbed/template/nosqltester_run.in

 #!/bin/sh
 # BEWARE: This file is operated by slapgrid
 # BEWARE: It will be overwritten automatically
-exec %(nosqltester_binary)s -h %(host_address)s -a %(tester_address)s -r %(report_path)s \
+exec %(scalability_tester_binary)s -h %(host_address)s -a %(tester_address)s -r %(report_path)s \
     --report-directory %(report_path)s --repeat %(repeat)d %(erp5_url)s %(nb_users)d \
     %(benchmark_suites)s