diff --git a/erp5/tests/testERP5TestNode.py b/erp5/tests/testERP5TestNode.py index 4e74acca43fa1ce7aa79086632f03259c7406809..36edcff572099393a1aec7f8bf51c0195ecf1ff6 100644 --- a/erp5/tests/testERP5TestNode.py +++ b/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" diff --git a/erp5/util/testnode/ScalabilityTestRunner.py b/erp5/util/testnode/ScalabilityTestRunner.py index 95e5cef1727d45ad1220cfab3b815a666f375557..2ff757aadf4f84e03c72f60b9f9458a6be0e1f91 100644 --- a/erp5/util/testnode/ScalabilityTestRunner.py +++ b/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 diff --git a/erp5/util/testnode/SlapOSMasterCommunicator.py b/erp5/util/testnode/SlapOSMasterCommunicator.py index 5dde73a90fe1eb23e349df1f002ffa6fbc0bd3c8..ae146264ab62912c35adec0c32b3727f89c2ff3e 100644 --- a/erp5/util/testnode/SlapOSMasterCommunicator.py +++ b/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 diff --git a/erp5/util/testnode/__init__.py b/erp5/util/testnode/__init__.py index c6060d1e3350e1fa5eaa68a863a2cd112b9dc0e7..c082eee3fa386d09eb5a566b178ac0631dc95257 100644 --- a/erp5/util/testnode/__init__.py +++ b/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)