[Erp5-report] r45884 guillaume.bottex - /slapos/trunk/util/slapos.tool.nosqltester_manager....

[nobody at svn.erp5.org]

Author: guillaume.bottex
Date: Fri Jun 10 03:58:21 2011
New Revision: 45884

URL: http://svn.erp5.org?rev=45884&view=rev
Log:
Change the way to use the computer guid list.

Modified:
    slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py

Modified: slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py
URL: http://svn.erp5.org/slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py?rev=45884&r1=45883&r2=45884&view=diff
==============================================================================
--- slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py [utf8] (original)
+++ slapos/trunk/util/slapos.tool.nosqltester_manager.kumo/src/slapos/tool/nosqltester_manager/kumo/__init__.py [utf8] Fri Jun 10 03:58:21 2011
@@ -49,16 +49,22 @@ class KumoTesterManager(NoSQLTesterManag
     else:
       self.nb_request = argv[1]
 
+    self.max_manager = 1
+    self.computer_guids = self.computer_partition.getConnectionParameter('computer_guid_list').split(':')
+
   def _kumo_init(self):
     try:
       self.logger.debug("Kumo manager")
-      manager_computer_partition = self.computer_partition.request(self.software_release_url, 'kumo_manager', 'kumo_manager')
+      manager_computer_partition = self.computer_partition.request(self.software_release_url, 'kumo_manager', 'kumo_manager',
+                   filter_kw={'computer_guid':self.computer_guids[0]})
+      self.logger.debug("Kumo manager guid: "+self.computer_guids[0])
 
       self.logger.debug("Kumo server 1")
       self.computer_partition.request(self.software_release_url, 'kumo_server', 'kumo_server'+str(self.server_count),
                    partition_parameter_kw={'manager_address':manager_computer_partition.getConnectionParameter('address'),
                                            'manager_port':manager_computer_partition.getConnectionParameter('port')},
-                   filter_kw={'computer_guid':self.computer_partition.getConnectionParameter('computer_guid_list').split(':')[self.server_count-1]})
+                   filter_kw={'computer_guid':self.computer_guids[self.max_manager+self.server_count-1]})
+      self.logger.debug("Kumo server 1 guid: "+self.computer_guids[self.max_manager+self.server_count-1])
 
 
       tester_computer_partition = []
@@ -67,7 +73,8 @@ class KumoTesterManager(NoSQLTesterManag
         gateway_computer_partition = self.computer_partition.request(self.software_release_url, 'kumo_gateway', 'kumo_gateway'+str(i),
                      partition_parameter_kw={'manager_address':manager_computer_partition.getConnectionParameter('address'),
                                              'manager_port':manager_computer_partition.getConnectionParameter('port')},
-                     filter_kw={'computer_guid':self.computer_partition.getConnectionParameter('computer_guid_list').split(':')[i-1]})
+                     filter_kw={'computer_guid':self.computer_guids[self.max_manager+self.max_server+i]})
+        self.logger.debug("Kumo gateway "+str(i)+" guid: "+self.computer_guids[self.max_manager+self.max_server+i])
 
         self.logger.debug("Kumo tester "+str(i))
         tester_computer_partition.append(self.computer_partition.request(self.software_release_url, 'kumo_tester', 'kumo_tester'+str(i),
@@ -76,7 +83,7 @@ class KumoTesterManager(NoSQLTesterManag
                                            'host_address':self.host_address,
                                            'nb_thread':self.nb_thread,
                                            'nb_request':self.nb_request},
-                   filter_kw={'computer_guid':self.computer_partition.getConnectionParameter('computer_guid_list').split(':')[i-1]}))
+                   filter_kw={'computer_guid':self.computer_guids[self.max_manager+self.max_server+i]}))
       for partition in tester_computer_partition:
         self.logger.debug("Appending Kumo testers' start url")
         self.tester_urls.append(partition.getConnectionParameter('start_url'))
@@ -96,7 +103,8 @@ class KumoTesterManager(NoSQLTesterManag
       partition = self.computer_partition.request(self.software_release_url, 'kumo_server', 'kumo_server'+str(self.server_count),
                    partition_parameter_kw={'manager_address':self.manager_computer_partition.getConnectionParameter('address'),
                                            'manager_port':self.manager_computer_partition.getConnectionParameter('port')},
-                   filter_kw={'computer_guid':self.computer_partition.getConnectionParameter('computer_guid_list').split(':')[self.server_count-1]})
+                   filter_kw={'computer_guid':self.computer_guids[self.max_manager+self.server_count-1]})
+      self.logger.debug("Kumo server "+str(self.server_count)+" guid: "+self.computer_guids[self.max_manager+self.server_count-1])
       # line made to crash the function call until we call slapgrid
       partition.getConnectionParameter('address')
       return True