From c32a6d420b7c085fe93ebd9bdee560616dbdac86 Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Fri, 24 Sep 2021 14:20:01 +0200
Subject: [PATCH] Fix various typos

---
 zaza/openstack/charm_tests/mysql/tests.py             | 2 +-
 zaza/openstack/charm_tests/openstack_upgrade/tests.py | 5 +++--
 zaza/openstack/charm_tests/trilio/tests.py            | 2 +-
 zaza/openstack/utilities/openstack.py                 | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/zaza/openstack/charm_tests/mysql/tests.py b/zaza/openstack/charm_tests/mysql/tests.py
index 5fbfb7e..165e66f 100644
--- a/zaza/openstack/charm_tests/mysql/tests.py
+++ b/zaza/openstack/charm_tests/mysql/tests.py
@@ -223,7 +223,7 @@ class MySQLCommonTests(MySQLBaseTest):
         logging.info("Wait till model is idle ...")
         zaza.model.block_until_all_units_idle()
 
-        # If there are any blocekd mysql routers restart them.
+        # If there are any blocked mysql routers restart them.
         self.restart_blocked_mysql_routers()
         assert not self.get_blocked_mysql_routers(), (
             "Should no longer be blocked mysql-router units")
diff --git a/zaza/openstack/charm_tests/openstack_upgrade/tests.py b/zaza/openstack/charm_tests/openstack_upgrade/tests.py
index 620bda0..661a076 100644
--- a/zaza/openstack/charm_tests/openstack_upgrade/tests.py
+++ b/zaza/openstack/charm_tests/openstack_upgrade/tests.py
@@ -108,7 +108,7 @@ class OpenStackUpgradeTestsByOption(OpenStackUpgradeVMLaunchBase):
 
         tests_options:
           openstack-upgrade:
-            detect-charm: keystone
+            detect-using-charm: keystone
 
     This will use the octavia application, detect the ubuntu version and then
     read the config to discover the current OpenStack version.
@@ -135,7 +135,8 @@ class OpenStackUpgradeTestsByOption(OpenStackUpgradeVMLaunchBase):
                 .openstack_upgrade.detect_using_charm)
         except KeyError:
             raise exceptions.InvalidTestConfig(
-                "Missing tests_options.openstack-upgrade.detect-charm config.")
+                "Missing tests_options.openstack-upgrade.detect-using-charm "
+                "config.")
 
         unit = zaza.model.get_lead_unit(detect_charm)
         ubuntu_version = generic.get_series(unit)
diff --git a/zaza/openstack/charm_tests/trilio/tests.py b/zaza/openstack/charm_tests/trilio/tests.py
index 8e81ae7..c5902c2 100644
--- a/zaza/openstack/charm_tests/trilio/tests.py
+++ b/zaza/openstack/charm_tests/trilio/tests.py
@@ -426,7 +426,7 @@ class TrilioBaseTest(test_utils.OpenStackBaseTest):
         workloadmgrcli.oneclick_restore(snapshot_id)
 
     def test_update_trilio_action(self):
-        """Test that the action runs succesfully."""
+        """Test that the action runs successfully."""
         action_name = 'update-trilio'
         actions = zaza_model.get_actions(
             self.application_name)
diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index 36ff964..ce57157 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -2832,7 +2832,7 @@ def ssh_test(username, ip, vm_name, password=None, privkey=None, retry=True):
         return_string = stdout.readlines()[0].strip()
 
         if return_string == vm_name:
-            logging.info('SSH to %s(%s) succesfull' % (vm_name, ip))
+            logging.info('SSH to %s(%s) successful' % (vm_name, ip))
         else:
             logging.info('SSH to %s(%s) failed (%s != %s)' % (vm_name, ip,
                                                               return_string,