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

[nobody at svn.erp5.org]

Author: guillaume.bottex
Date: Tue Jun  7 19:00:06 2011
New Revision: 45883

URL: http://svn.erp5.org?rev=45883&view=rev
Log:
Use one gateway on every application server.

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=45883&r1=45882&r2=45883&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] Tue Jun  7 19:00:06 2011
@@ -60,26 +60,23 @@ class KumoTesterManager(NoSQLTesterManag
                                            'manager_port':manager_computer_partition.getConnectionParameter('port')},
                    filter_kw={'computer_guid':self.computer_partition.getConnectionParameter('computer_guid_list').split(':')[self.server_count-1]})
 
-      self.logger.debug("Kumo gateway")
-      gateway_computer_partition = self.computer_partition.request(self.software_release_url, 'kumo_gateway', 'kumo_gateway',
-                   partition_parameter_kw={'manager_address':manager_computer_partition.getConnectionParameter('address'),
-                                           'manager_port':manager_computer_partition.getConnectionParameter('port')})
 
       tester_computer_partition = []
       for i in range(0, self.max_tester):
-        """
-        tester_computer_partition.append(self.computer_partition.request(self.software_release_url, 'nosqltester', 'nosqltester'+str(i),
-                   partition_parameter_kw={'gateway_address':gateway_computer_partition.getConnectionParameter('gateway_address'),
-                                           'gateway_port':gateway_computer_partition.getConnectionParameter('gateway_port'),
-                                           'host_address':params['address']}))
-        """
+        self.logger.debug("Kumo gateway "+str(i))
+        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]})
+
         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),
                    partition_parameter_kw={'gateway_address':gateway_computer_partition.getConnectionParameter('address'),
                                            'gateway_port':gateway_computer_partition.getConnectionParameter('port'),
                                            'host_address':self.host_address,
                                            'nb_thread':self.nb_thread,
-                                           'nb_request':self.nb_request}))
+                                           'nb_request':self.nb_request},
+                   filter_kw={'computer_guid':self.computer_partition.getConnectionParameter('computer_guid_list').split(':')[i-1]}))
       for partition in tester_computer_partition:
         self.logger.debug("Appending Kumo testers' start url")
         self.tester_urls.append(partition.getConnectionParameter('start_url'))