testnode: use hateoas_slapos_master_url parameter

erp5/tests/testERP5TestNode.py

@@ -77,6 +77,7 @@ class ERP5TestNode(TestCase):
     config["log_directory"] = self.log_directory
     config["log_file"] = self.log_file
     config["test_suite_master_url"] = None
+    config["hateoas_slapos_master_url"] = None
     config["test_node_title"] = "Foo-Test-Node"
     config["system_temp_folder"] = self.system_temp_folder
     config["computer_id"] = "COMP-TEST"

erp5/util/testnode/ScalabilityTestRunner.py

@@ -65,7 +65,7 @@ class ScalabilityTestRunner():
                                   cert_path,
                                   key_path,
                                   self.log,
-                                  url='https://rest.slapos.org/Base_getHateoasMaster')
+                                  self.testnode.config['hateoas_slapos_master_url'])
     self.remaining_software_installation_dict = {}
     
     # Protection to prevent installation of softwares after checking

erp5/util/testnode/SlapOSMasterCommunicator.py

@@ -28,7 +28,7 @@ class SlapOSMasterCommunicator(object):
     
   """
   def __init__(self, certificate_path, key_path, log,
-                     url='https://rest.slapos.org/Base_getHateoasMaster'):
+                     url):
     # Create connection
     api_scheme, api_netloc, api_path, api_query, api_fragment = urlparse.urlsplit(url)
     self.log = log

erp5/util/testnode/__init__.py

@@ -78,7 +78,7 @@ def main(*args):
               'software_directory',
               'proxy_port', 'git_binary','zip_binary','node_quantity',
               'test_node_title', 'ipv4_address','ipv6_address','test_suite_master_url',
-              'slapgrid_partition_binary','slapgrid_software_binary',
+              'hateoas_slapos_master_url', 'slapgrid_partition_binary','slapgrid_software_binary',
               'slapproxy_binary', 'httpd_ip', 'httpd_port', 'httpd_software_access_port',
               'computer_id', 'server_url'):
     CONFIG[key] = config.get('testnode',key)