diff --git a/code/daisy/daisy/api/backends/driver.py b/code/daisy/daisy/api/backends/driver.py index 283086ad..06e5ef92 100755 --- a/code/daisy/daisy/api/backends/driver.py +++ b/code/daisy/daisy/api/backends/driver.py @@ -73,7 +73,7 @@ def check_isinstance(obj, cls): raise Exception(_('Expected object of type: %s') % (str(cls))) -def load_deployment_dirver(backend_name): +def load_deployment_driver(backend_name): """Load a cluster backend installation driver. """ backend_driver = "%s.api.API" % backend_name diff --git a/code/daisy/daisy/api/v1/hosts.py b/code/daisy/daisy/api/v1/hosts.py index fc8003fb..f00213c4 100644 --- a/code/daisy/daisy/api/v1/hosts.py +++ b/code/daisy/daisy/api/v1/hosts.py @@ -1902,7 +1902,7 @@ class Controller(controller.BaseController): backends = get_backend() with open(var_log_path, "w+") as fp: for backend in backends: - backend_driver = driver.load_deployment_dirver(backend) + backend_driver = driver.load_deployment_driver(backend) backend_driver.prepare_ssh_discovered_node(req, fp, discover_host_meta) try: @@ -2048,7 +2048,7 @@ class Controller(controller.BaseController): if daisy_management_ip: backends = get_backend() for backend in backends: - backend_driver = driver.load_deployment_dirver(backend) + backend_driver = driver.load_deployment_driver(backend) backend_driver.getnodeinfo_ip(daisy_management_ip) config_discoverd = ConfigParser.ConfigParser( defaults=DISCOVER_DEFAULTS) @@ -2057,7 +2057,7 @@ class Controller(controller.BaseController): if listen_port: backends = get_backend() for backend in backends: - backend_driver = driver.load_deployment_dirver(backend) + backend_driver = driver.load_deployment_driver(backend) backend_driver.getnodeinfo_listen_port(listen_port) discovery_host_thread = threading.Thread( diff --git a/code/daisy/daisy/api/v1/install.py b/code/daisy/daisy/api/v1/install.py index 00a3e85e..2dd0e255 100644 --- a/code/daisy/daisy/api/v1/install.py +++ b/code/daisy/daisy/api/v1/install.py @@ -114,7 +114,7 @@ class InstallTask(object): LOG.info(_("No backends need to install.")) return for backend in backends: - backend_driver = driver.load_deployment_dirver(backend) + backend_driver = driver.load_deployment_driver(backend) backend_driver.install(self.req, self.cluster_id) # this will be raise raise all the exceptions of the thread to log file @@ -381,7 +381,7 @@ class Controller(controller.BaseController): backends = get_deployment_backends( req, cluster_id, BACKENDS_UNINSTALL_ORDER) for backend in backends: - backend_driver = driver.load_deployment_dirver(backend) + backend_driver = driver.load_deployment_driver(backend) backend_driver.check_uninstall_hosts(req, cluster_id, uninstall_hosts) @@ -403,7 +403,7 @@ class Controller(controller.BaseController): LOG.info(_("No backends need to uninstall.")) return all_nodes for backend in backends: - backend_driver = driver.load_deployment_dirver(backend) + backend_driver = driver.load_deployment_driver(backend) nodes_process = backend_driver.uninstall_progress(req, cluster_id) all_nodes.update(nodes_process) return all_nodes @@ -438,7 +438,7 @@ class Controller(controller.BaseController): {'messages': 'Waiting for TECS upgrading', 'progress': '0'}, 'tecs') for backend in backends: - backend_driver = driver.load_deployment_dirver(backend) + backend_driver = driver.load_deployment_driver(backend) update_thread = Thread(target=backend_driver.upgrade, args=(req, cluster_id, install_meta['version_id'], @@ -481,7 +481,7 @@ class Controller(controller.BaseController): req, cluster_id, BACKENDS_UPGRADE_ORDER) all_nodes = {} for backend in backends: - backend_driver = driver.load_deployment_dirver(backend) + backend_driver = driver.load_deployment_driver(backend) nodes_process = backend_driver.upgrade_progress(req, cluster_id) all_nodes.update(nodes_process) return all_nodes @@ -506,7 +506,7 @@ class Controller(controller.BaseController): LOG.info(_("No backends need to export.")) return all_config_files for backend in backends: - backend_driver = driver.load_deployment_dirver(backend) + backend_driver = driver.load_deployment_driver(backend) backend_config_files = backend_driver.export_db(req, cluster_id) all_config_files.update(backend_config_files) return all_config_files @@ -530,7 +530,7 @@ class Controller(controller.BaseController): message = "No tecs backend" LOG.info(_(message)) else: - backend_driver = driver.load_deployment_dirver(tecs_backend_name) + backend_driver = driver.load_deployment_driver(tecs_backend_name) message = backend_driver.update_disk_array(req, cluster_id) return {'status': message}