testnode: Add getting Slapos Master Url (for scalability)

erp5/tests/testERP5TestNode.py

@@ -494,6 +494,8 @@ revision = %(revision2)s
       return "key"
     def patch_getSlaposAccountCertificate(self, *args, **kw):
       return "Certificate"
+    def patch_getSlaposUrl(self, *args, **kw):
+      return "http://Foo"
     def patch_generateConfiguration(self, *args, **kw):
       return json.dumps({"configuration_list": [], "involved_nodes_computer_guid"\
 : [], "error_message": "No error.", "launcher_nodes_computer_guid": [], \
@@ -566,6 +568,7 @@ revision = %(revision2)s
     if my_test_type == "ScalabilityTest":
       original_getSlaposAccountKey = TaskDistributor.getSlaposAccountKey
       original_getSlaposAccountCertificate = TaskDistributor.getSlaposAccountCertificate
+      original_getSlaposUrl = TaskDistributor.getSlaposUrl
       original_generateConfiguration = TaskDistributor.generateConfiguration
       original_isMasterTestnode = TaskDistributor.isMasterTestnode
       original_updateInstanceXML = RunnerClass._updateInstanceXML
@@ -574,6 +577,7 @@ revision = %(revision2)s
       original_SlapOSMasterCommunicator__init__ = SlapOSMasterCommunicator.__init__
       TaskDistributor.getSlaposAccountKey = patch_getSlaposAccountKey
       TaskDistributor.getSlaposAccountCertificate = patch_getSlaposAccountCertificate
+      TaskDistributor.getSlaposUrl = patch_getSlaposUrl
       TaskDistributor.generateConfiguration = patch_generateConfiguration
       TaskDistributor.isMasterTestnode = patch_isMasterTestnode
       RunnerClass._updateInstanceXML = doNothing
@@ -605,6 +609,7 @@ revision = %(revision2)s
     if my_test_type == "ScalabilityTest":
       TaskDistributor.getSlaposAccountKey = original_getSlaposAccountKey
       TaskDistributor.getSlaposAccountCertificate = original_getSlaposAccountCertificate
+      TaskDistributor.getSlaposUrl = original_getSlaposUrl
       TaskDistributor.generateConfiguration = original_generateConfiguration
       TaskDistributor.isMasterTestnode = original_isMasterTestnode
       RunnerClass._updateInstanceXML = original_updateInstanceXML
@@ -665,6 +670,8 @@ revision = %(revision2)s
       return "key"
     def patch_getSlaposAccountCertificate(self, *args, **kw):
       return "Certificate"
+    def patch_getSlaposUrl(self, *args, **kw):
+      return "http://Foo"
     def patch_generateConfiguration(self, *args, **kw):
       return json.dumps({"configuration_list": [], "involved_nodes_computer_guid"\
 : [], "error_message": "No error.", "launcher_nodes_computer_guid": [], \
@@ -723,6 +730,7 @@ revision = %(revision2)s
     if my_test_type == "ScalabilityTest":
       original_getSlaposAccountKey = TaskDistributor.getSlaposAccountKey
       original_getSlaposAccountCertificate = TaskDistributor.getSlaposAccountCertificate
+      original_getSlaposUrl = TaskDistributor.getSlaposUrl
       original_generateConfiguration = TaskDistributor.generateConfiguration
       original_isMasterTestnode = TaskDistributor.isMasterTestnode
       original_supply = SlapOSControler.supply
@@ -733,6 +741,7 @@ revision = %(revision2)s
       original_SlapOSMasterCommunicator__init__ = SlapOSMasterCommunicator.__init__
       TaskDistributor.getSlaposAccountKey = patch_getSlaposAccountKey
       TaskDistributor.getSlaposAccountCertificate = patch_getSlaposAccountCertificate
+      TaskDistributor.getSlaposUrl = patch_getSlaposUrl
       TaskDistributor.generateConfiguration = patch_generateConfiguration
       TaskDistributor.isMasterTestnode = patch_isMasterTestnode
       SlapOSControler.supply = doNothing
@@ -764,6 +773,7 @@ revision = %(revision2)s
     if my_test_type == "ScalabilityTest":
       TaskDistributor.getSlaposAccountKey = original_getSlaposAccountKey
       TaskDistributor.getSlaposAccountCertificate = original_getSlaposAccountCertificate
+      TaskDistributor.getSlaposUrl = original_getSlaposUrl
       TaskDistributor.generateConfiguration = original_generateConfiguration
       TaskDistributor.isMasterTestnode = original_isMasterTestnode
       SlapOSControler.supply =original_supply
@@ -944,6 +954,8 @@ revision = %(revision2)s
       return "key"
     def patch_getSlaposAccountCertificate(self, *args, **kw):
       return "Certificate"
+    def patch_getSlaposUrl(self, *args, **kw):
+      return "http://Foo"
     def patch_getTestType(self, *args, **kw):
       return "ScalabilityTest"
     def patch_isHostingSubscriptionReady(self, *args, **kw):
@@ -960,6 +972,7 @@ revision = %(revision2)s
     original_sleep = time.sleep
     original_getSlaposAccountKey = TaskDistributor.getSlaposAccountKey
     original_getSlaposAccountCertificate = TaskDistributor.getSlaposAccountCertificate
+    original_getSlaposUrl = TaskDistributor.getSlaposUrl
     original_generateConfiguration = TaskDistributor.generateConfiguration
     original_isMasterTestnode = TaskDistributor.isMasterTestnode
     original_startTestSuite = TaskDistributor.startTestSuite
@@ -979,6 +992,7 @@ revision = %(revision2)s
     time.sleep = doNothing
     TaskDistributor.getSlaposAccountKey = patch_getSlaposAccountKey
     TaskDistributor.getSlaposAccountCertificate = patch_getSlaposAccountCertificate
+    TaskDistributor.getSlaposUrl = patch_getSlaposUrl
     TaskDistributor.generateConfiguration = patch_generateConfiguration
     TaskDistributor.isMasterTestnode = patch_isMasterTestnode
     TaskDistributor.startTestSuite = patch_startTestSuite
@@ -999,6 +1013,7 @@ revision = %(revision2)s
     # Restore methods
     TaskDistributor.getSlaposAccountKey = original_getSlaposAccountKey
     TaskDistributor.getSlaposAccountCertificate = original_getSlaposAccountCertificate
+    TaskDistributor.getSlaposUrl = original_getSlaposUrl
     TaskDistributor.generateConfiguration = original_generateConfiguration
     TaskDistributor.isMasterTestnode = original_isMasterTestnode
     TaskDistributor.startTestSuite = original_startTestSuite

erp5/util/taskdistribution/__init__.py

@@ -570,6 +570,13 @@ class TaskDistributor(RPCRetry):
       """
       return self._retryRPC('getSlaposAccountCertificate')
 
+    def getSlaposUrl(self):
+      """
+        Returns the url of slapos master related to the distributor
+      """
+      return self._retryRPC('getSlaposUrl')
+
+
 class DummyTaskDistributionTool(object):
     """
     Fake remote server.

erp5/util/testnode/ScalabilityTestRunner.py

@@ -63,8 +63,17 @@ class ScalabilityTestRunner():
     # Create the slapos account configuration file and dir
     key = self.testnode.test_suite_portal.getSlaposAccountKey()
     certificate = self.testnode.test_suite_portal.getSlaposAccountCertificate()
+    # Get Slapos Master Url
+    slapos_url = ''
+    try:
+      slapos_url = self.testnode.test_suite_portal.getSlaposUrl()
+      if not slapos_url:
+        slapos_url = self.testnode.config['server_url']
+    except:
+      slapos_url = self.testnode.config['server_url']
+      
     self.key_path, self.cert_path, config_path = self.slapos_controler.createSlaposConfigurationFileAccount(
-                                        key, certificate, self.testnode.config)
+                                        key, certificate, slapos_url, self.testnode.config)
     self.slapos_communicator = None
     self.remaining_software_installation_dict = {}
     

erp5/util/testnode/SlapOSControler.py

@@ -77,7 +77,7 @@ class SlapOSControler(object):
   #TODO: implement a method to get all instance related the slapOS account
   # and deleting all old instances (based on creation date or name etc...)
 
-  def createSlaposConfigurationFileAccount(self, key, certificate, config):
+  def createSlaposConfigurationFileAccount(self, key, certificate, slapos_url, config):
     # Create "slapos_account" directory in the "slapos_directory"
     slapos_account_directory = os.path.join(config['slapos_directory'], "slapos_account")
     createFolder(slapos_account_directory)
@@ -87,7 +87,7 @@ class SlapOSControler(object):
     configuration_file_path = os.path.join(slapos_account_directory, "slapos.cfg")
     configuration_file_value = "[slapos]\nmaster_url = %s\n\
 [slapconsole]\ncert_file = %s\nkey_file = %s" %(
-                                  config['server_url'],
+                                  slapos_url,
                                   slapos_account_certificate_path,
                                   slapos_account_key_path)
     createFile(slapos_account_key_path, "w", key)