up

erp5/util/testnode/ScalabilityTestRunner.py

@@ -57,7 +57,7 @@ class ScalabilityTestRunner():
     key = self.testnode.test_suite_portal.getSlaposAccountKey()
     certificate = self.testnode.test_suite_portal.getSlaposAccountCertificate()
     self.slapos_controler.createSlaposConfigurationFileAccount(key,certificate,
-                                    self.testnode.config, self.testnode.log)
+                                    self.testnode.config)
     self.remaining_software_installation_grid = {}
     # Protection to prevent installation of softwares after checking
     self.authorize_supply = True
@@ -176,7 +176,7 @@ class ScalabilityTestRunner():
       while ( self.remainSoftwareToInstall() 
          and (max_time > (time.time()-start_time))):
         self.testnode.log("Master testnode is waiting\
-  for the end of all software installation (for %ss).",
+ for the end of all software installation (for %ss).",
           str(int(time.time()-start_time)))
         time.sleep(interval_time)
       # We were wainting for too long time, that's a failure.

erp5/util/testnode/SlapOSControler.py

@@ -70,7 +70,7 @@ class SlapOSControler(object):
     self.log = log
     self.proxy_database = os.path.join(working_directory, 'proxy.db')
 
-  def createSlaposConfigurationFileAccount(self, key, certificate, config, log):
+  def createSlaposConfigurationFileAccount(self, key, certificate, config):
     # Create "slapos_account" directory in the "slapos_directory"
     slapos_account_directory = os.path.join(config['slapos_directory'], "slapos_account")
     createFolder(slapos_account_directory)
@@ -84,11 +84,11 @@ class SlapOSControler(object):
                                   slapos_account_certificate_path,
                                   slapos_account_key_path)
     createFile(slapos_account_key_path, "w", key)
-    log("%s created." %(str(slapos_account_key_path)))
+    self.log("%s created." %(str(slapos_account_key_path)))
     createFile(slapos_account_certificate_path, "w", certificate)
-    log("%s created." %(str(slapos_account_certificate_path)))
+    self.log("%s created." %(str(slapos_account_certificate_path)))
     createFile(configuration_file_path, "w", configuration_file_value)
-    log("%s created." %(str(configuration_file_path)))
+    self.log("%s created." %(str(configuration_file_path)))
     self.configuration_file_path = configuration_file_path
 
   def supply(self, software_url, computer_id, state="available"):
@@ -97,8 +97,8 @@ class SlapOSControler(object):
     Ex :
     my_controler.supply('kvm.cfg', 'COMP-726')
     """
-    return
     self.log('SlapOSControler : supply')
+    return
     parser = argparse.ArgumentParser()
     parser.add_argument("configuration_file")
     parser.add_argument("software_url")