[Erp5-report] r45861 guillaume.bottex - in /slapos/trunk: recipe/slapos.recipe.sheepdogtest...

[nobody at svn.erp5.org]

Author: guillaume.bottex
Date: Tue May 17 17:22:02 2011
New Revision: 45861

URL: http://svn.erp5.org?rev=45861&view=rev
Log:
Fixing sheepdog testbed and related stuff, wip.

Modified:
    slapos/trunk/recipe/slapos.recipe.sheepdogtestbed/src/slapos/recipe/sheepdogtestbed/__init__.py
    slapos/trunk/software_release/sheepdogtestbed/sheepstrike.cfg
    slapos/trunk/software_release/sheepdogtestbed/software.cfg
    slapos/trunk/util/slapos.tool.nosqltester_manager.sheepdog/src/slapos/tool/nosqltester_manager/sheepdog/__init__.py

Modified: slapos/trunk/recipe/slapos.recipe.sheepdogtestbed/src/slapos/recipe/sheepdogtestbed/__init__.py
URL: http://svn.erp5.org/slapos/trunk/recipe/slapos.recipe.sheepdogtestbed/src/slapos/recipe/sheepdogtestbed/__init__.py?rev=45861&r1=45860&r2=45861&view=diff
==============================================================================
--- slapos/trunk/recipe/slapos.recipe.sheepdogtestbed/src/slapos/recipe/sheepdogtestbed/__init__.py [utf8] (original)
+++ slapos/trunk/recipe/slapos.recipe.sheepdogtestbed/src/slapos/recipe/sheepdogtestbed/__init__.py [utf8] Tue May 17 17:22:02 2011
@@ -57,11 +57,11 @@ class SheepDogTestBed(BaseSlapRecipe):
     sheepdog_test_config['address'] = self.getGlobalIPv6Address()
     sheepdog_test_config['report_path'] = self.log_directory
     
-    # if 'nb_server_max' not in sheepdog_test_config:
-    #   sheepdog_test_config['nb_server_max'] = 3
+    if 'nb_server_max' not in sheepdog_test_config:
+      sheepdog_test_config['nb_server_max'] = 0
     
-    # if 'nb_tester_max' not in sheepdog_test_config:
-    #   sheepdog_test_config['nb_tester_max'] = 3
+    if 'nb_tester_max' not in sheepdog_test_config:
+      sheepdog_test_config['nb_tester_max'] = 3
     
     if 'nb_thread' not in sheepdog_test_config:
       sheepdog_test_config['nb_thread'] = 1
@@ -98,9 +98,8 @@ class SheepDogTestBed(BaseSlapRecipe):
 
     tester_config['tester_address'] = self.getGlobalIPv6Address()
     tester_config['report_path'] = self.log_directory
-    tester_config['binary'] = tester_config['sheepstrike_binary'] + " -l " + \
-                              tester_config['gateway_address'].strip("[]") + " -p " + \
-                              tester_config['gateway_port'] + " -t " + \
+    tester_config['binary'] = tester_config['sheepstrike_binary'] + \
+                              " -l 192.168.1.1 -t " + \
                               tester_config['nb_thread'] + " " + \
                               tester_config['nb_request'] #" 1000" " -t 32 1024000"
 

Modified: slapos/trunk/software_release/sheepdogtestbed/sheepstrike.cfg
URL: http://svn.erp5.org/slapos/trunk/software_release/sheepdogtestbed/sheepstrike.cfg?rev=45861&r1=45860&r2=45861&view=diff
==============================================================================
--- slapos/trunk/software_release/sheepdogtestbed/sheepstrike.cfg [utf8] (original)
+++ slapos/trunk/software_release/sheepdogtestbed/sheepstrike.cfg [utf8] Tue May 17 17:22:02 2011
@@ -4,7 +4,7 @@ parts = sheepstrike
 [sheepstrike]
 recipe = hexagonit.recipe.cmmi
 url = https://gitorious.org/sheepstrike/sheepstrike/archive-tarball/0.1
-md5sum = ca0de08e764f942f343ffd8ce6f3a578
+md5sum = 016379839273a0191a60a9d21785f34b
 prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-options = --prefix=${:prefix}
 configure-command =

Modified: slapos/trunk/software_release/sheepdogtestbed/software.cfg
URL: http://svn.erp5.org/slapos/trunk/software_release/sheepdogtestbed/software.cfg?rev=45861&r1=45860&r2=45861&view=diff
==============================================================================
--- slapos/trunk/software_release/sheepdogtestbed/software.cfg [utf8] (original)
+++ slapos/trunk/software_release/sheepdogtestbed/software.cfg [utf8] Tue May 17 17:22:02 2011
@@ -2,7 +2,6 @@
 extends = 
   https://svn.erp5.org/repos/public/erp5/trunk/buildout/software-profiles/lxml-python.cfg
   sheepstrike.cfg
-#  https://svn.erp5.org/repos/public/slapos/trunk/software_release/sheepdogtestbed/sheepstrike.cfg
 
 parts =
   template

Modified: slapos/trunk/util/slapos.tool.nosqltester_manager.sheepdog/src/slapos/tool/nosqltester_manager/sheepdog/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester_manager.sheepdog/src/slapos/tool/nosqltester_manager/sheepdog/__init__.py?rev=45861&r1=45860&r2=45861&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester_manager.sheepdog/src/slapos/tool/nosqltester_manager/sheepdog/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester_manager.sheepdog/src/slapos/tool/nosqltester_manager/sheepdog/__init__.py [utf8] Tue May 17 17:22:02 2011
@@ -54,9 +54,7 @@ class SheepdogTesterManager(NoSQLTesterM
       for i in range(0, self.max_tester):
         self.logger.debug("Sheepdog tester "+str(i))
         tester_computer_partition.append(self.computer_partition.request(self.software_release_url, 'sheepdog_tester', 'sheepdog_tester'+str(i),
-                   partition_parameter_kw={'gateway_address':gateway_computer_partition.getConnectionParameter('address'),
-                                           'gateway_port':gateway_computer_partition.getConnectionParameter('port'),
-                                           'host_address':self.host_address,
+                   partition_parameter_kw={'host_address':self.host_address,
                                            'nb_thread':self.nb_thread,
                                            'nb_request':self.nb_request}))
       for partition in tester_computer_partition:
@@ -66,7 +64,6 @@ class SheepdogTesterManager(NoSQLTesterM
       self.tester_urls = list(set(self.tester_urls)) # remove duplicates
       self.logger.debug("After remove duplicates: %s" % str(self.tester_urls))
       self.todo = self.tester_urls.__len__()
-      self.manager_computer_partition = manager_computer_partition
       return True
     except:
       self.logger.debug(str(sys.exc_info()))