Commit 5b5e6b87 authored by Benjamin Blanc's avatar Benjamin Blanc

testnode: ScalabilityTestRunner: Fix key and cert path

parent cb167dee
...@@ -59,11 +59,11 @@ class ScalabilityTestRunner(): ...@@ -59,11 +59,11 @@ class ScalabilityTestRunner():
# Create the slapos account configuration file and dir # Create the slapos account configuration file and dir
key = self.testnode.test_suite_portal.getSlaposAccountKey() key = self.testnode.test_suite_portal.getSlaposAccountKey()
certificate = self.testnode.test_suite_portal.getSlaposAccountCertificate() certificate = self.testnode.test_suite_portal.getSlaposAccountCertificate()
self.slapos_controler.createSlaposConfigurationFileAccount(key,certificate, key_path, cert_path, config_path = self.slapos_controler.createSlaposConfigurationFileAccount(
self.testnode.config) key,certificate, self.testnode.config)
self.slapos_communicator = SlapOSMasterCommunicator.SlapOSMasterCommunicator( self.slapos_communicator = SlapOSMasterCommunicator.SlapOSMasterCommunicator(
key, cert_path,
certificate, key_path,
self.log, self.log,
url='https://rest.slapos.org/Base_getHateoasMaster') url='https://rest.slapos.org/Base_getHateoasMaster')
self.remaining_software_installation_dict = {} self.remaining_software_installation_dict = {}
......
...@@ -94,6 +94,7 @@ class SlapOSControler(object): ...@@ -94,6 +94,7 @@ class SlapOSControler(object):
createFile(slapos_account_certificate_path, "w", certificate) createFile(slapos_account_certificate_path, "w", certificate)
createFile(configuration_file_path, "w", configuration_file_value) createFile(configuration_file_path, "w", configuration_file_value)
self.configuration_file_path = configuration_file_path self.configuration_file_path = configuration_file_path
return slapos_account_key_path, slapos_account_certificate_path, configuration_file_path
def supply(self, software_url, computer_id, state="available"): def supply(self, software_url, computer_id, state="available"):
""" """
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment