From 5fdde89be073f4f04e3c029c1fc98aa41a182b1f Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 4 Feb 2020 12:48:00 +0000
Subject: [PATCH] Tidyup docstring and method name

---
 test.py                                   | 13 +++++++++++++
 zaza/openstack/charm_tests/vault/setup.py |  2 +-
 zaza/openstack/utilities/generic.py       |  5 +++--
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100755 test.py

diff --git a/test.py b/test.py
new file mode 100755
index 0000000..6c94b60
--- /dev/null
+++ b/test.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python3
+
+from zaza.openstack.utilities import (
+    cli as cli_utils,
+    openstack as openstack_utils,
+    openstack_upgrade as upgrade_utils,
+)
+
+
+applications = []
+for group in ['Core Identity', 'Storage', 'Control Plane', 'Compute']:
+    applications.extend(upgrade_utils.SERVICE_GROUPS[group])
+print(applications)
diff --git a/zaza/openstack/charm_tests/vault/setup.py b/zaza/openstack/charm_tests/vault/setup.py
index 6f93c0d..96c45cb 100644
--- a/zaza/openstack/charm_tests/vault/setup.py
+++ b/zaza/openstack/charm_tests/vault/setup.py
@@ -55,7 +55,7 @@ def basic_setup_and_unseal(cacert=None):
 
 def mojo_unseal_by_unit():
     """Unseal any units reported as sealed using mojo cacert."""
-    cacert = zaza.openstack.utilities.generic.get_mojo_cacert()
+    cacert = zaza.openstack.utilities.generic.get_mojo_cacert_path()
     vault_creds = vault_utils.get_credentails()
     for client in vault_utils.get_clients(cacert=cacert):
         if client.hvac_client.is_sealed():
diff --git a/zaza/openstack/utilities/generic.py b/zaza/openstack/utilities/generic.py
index c3a7afb..c0566b0 100644
--- a/zaza/openstack/utilities/generic.py
+++ b/zaza/openstack/utilities/generic.py
@@ -852,12 +852,13 @@ def systemctl(unit, service, command="restart"):
         "{} of {} on {} failed".format(command, service, unit.entity_id))
 
 
-def get_mojo_cacert():
+def get_mojo_cacert_path():
     """Retrieve cacert from Mojo storage location.
 
-    :returns: Pathh to cacert
+    :returns: Path to cacert
     :rtype: str
     :raises: zaza_exceptions.CACERTNotFound
+    :raises: :class:`zaza_exceptions.CACERTNotfound`
     """
     try:
         cert_dir = os.environ['MOJO_LOCAL_DIR']