From a73f513b97d0c3373631adfe5a085668d8eae0ca Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Fri, 11 May 2018 09:03:45 -0700
Subject: [PATCH] Shortname utilitites

---
 ...tilitites_cli_utils.py => test_zaza_utilitites_cli.py} | 2 +-
 ...s_generic_utils.py => test_zaza_utilitites_generic.py} | 2 +-
 ...litites_juju_utils.py => test_zaza_utilitites_juju.py} | 2 +-
 ...enstack_utils.py => test_zaza_utilitites_openstack.py} | 2 +-
 zaza/charm_tests/dragent/configure.py                     | 6 +++---
 zaza/charm_tests/dragent/test.py                          | 6 +++---
 zaza/charm_tests/dragent/tests.py                         | 2 +-
 zaza/configure/bgp_speaker.py                             | 4 ++--
 zaza/configure/network.py                                 | 8 ++++----
 zaza/utilities/{cli_utils.py => cli.py}                   | 0
 zaza/utilities/{generic_utils.py => generic.py}           | 2 +-
 zaza/utilities/{juju_utils.py => juju.py}                 | 2 +-
 zaza/utilities/{openstack_utils.py => openstack.py}       | 4 ++--
 13 files changed, 21 insertions(+), 21 deletions(-)
 rename unit_tests/utilitites/{test_zaza_utilitites_cli_utils.py => test_zaza_utilitites_cli.py} (97%)
 rename unit_tests/utilitites/{test_zaza_utilitites_generic_utils.py => test_zaza_utilitites_generic.py} (98%)
 rename unit_tests/utilitites/{test_zaza_utilitites_juju_utils.py => test_zaza_utilitites_juju.py} (99%)
 rename unit_tests/utilitites/{test_zaza_utilitites_openstack_utils.py => test_zaza_utilitites_openstack.py} (99%)
 rename zaza/utilities/{cli_utils.py => cli.py} (100%)
 rename zaza/utilities/{generic_utils.py => generic.py} (99%)
 rename zaza/utilities/{juju_utils.py => juju.py} (98%)
 rename zaza/utilities/{openstack_utils.py => openstack.py} (99%)

diff --git a/unit_tests/utilitites/test_zaza_utilitites_cli_utils.py b/unit_tests/utilitites/test_zaza_utilitites_cli.py
similarity index 97%
rename from unit_tests/utilitites/test_zaza_utilitites_cli_utils.py
rename to unit_tests/utilitites/test_zaza_utilitites_cli.py
index 1ac3bb6..cb7f74f 100644
--- a/unit_tests/utilitites/test_zaza_utilitites_cli_utils.py
+++ b/unit_tests/utilitites/test_zaza_utilitites_cli.py
@@ -1,6 +1,6 @@
 import mock
 import unit_tests.utils as ut_utils
-from zaza.utilities import cli_utils
+from zaza.utilities import cli as cli_utils
 
 
 class TestCLIUtils(ut_utils.BaseTestCase):
diff --git a/unit_tests/utilitites/test_zaza_utilitites_generic_utils.py b/unit_tests/utilitites/test_zaza_utilitites_generic.py
similarity index 98%
rename from unit_tests/utilitites/test_zaza_utilitites_generic_utils.py
rename to unit_tests/utilitites/test_zaza_utilitites_generic.py
index 0ad31aa..e4a1d8a 100644
--- a/unit_tests/utilitites/test_zaza_utilitites_generic_utils.py
+++ b/unit_tests/utilitites/test_zaza_utilitites_generic.py
@@ -1,6 +1,6 @@
 import mock
 import unit_tests.utils as ut_utils
-from zaza.utilities import generic_utils
+from zaza.utilities import generic as generic_utils
 
 
 class TestGenericUtils(ut_utils.BaseTestCase):
diff --git a/unit_tests/utilitites/test_zaza_utilitites_juju_utils.py b/unit_tests/utilitites/test_zaza_utilitites_juju.py
similarity index 99%
rename from unit_tests/utilitites/test_zaza_utilitites_juju_utils.py
rename to unit_tests/utilitites/test_zaza_utilitites_juju.py
index 08dd25d..28d95ed 100644
--- a/unit_tests/utilitites/test_zaza_utilitites_juju_utils.py
+++ b/unit_tests/utilitites/test_zaza_utilitites_juju.py
@@ -1,6 +1,6 @@
 import mock
 import unit_tests.utils as ut_utils
-from zaza.utilities import juju_utils
+from zaza.utilities import juju as juju_utils
 
 
 class TestJujuUtils(ut_utils.BaseTestCase):
diff --git a/unit_tests/utilitites/test_zaza_utilitites_openstack_utils.py b/unit_tests/utilitites/test_zaza_utilitites_openstack.py
similarity index 99%
rename from unit_tests/utilitites/test_zaza_utilitites_openstack_utils.py
rename to unit_tests/utilitites/test_zaza_utilitites_openstack.py
index b3b9989..016fd17 100644
--- a/unit_tests/utilitites/test_zaza_utilitites_openstack_utils.py
+++ b/unit_tests/utilitites/test_zaza_utilitites_openstack.py
@@ -1,7 +1,7 @@
 import copy
 import mock
 import unit_tests.utils as ut_utils
-from zaza.utilities import openstack_utils
+from zaza.utilities import openstack as openstack_utils
 
 
 class TestOpenStackUtils(ut_utils.BaseTestCase):
diff --git a/zaza/charm_tests/dragent/configure.py b/zaza/charm_tests/dragent/configure.py
index c45d8d6..2091bfd 100644
--- a/zaza/charm_tests/dragent/configure.py
+++ b/zaza/charm_tests/dragent/configure.py
@@ -5,9 +5,9 @@ from zaza.configure import (
     bgp_speaker,
 )
 from zaza.utilities import (
-    cli_utils,
-    generic_utils,
-    openstack_utils,
+    cli as cli_utils,
+    generic as generic_utils,
+    openstack as openstack_utils,
 )
 
 DEFAULT_PEER_APPLICATION_NAME = "quagga"
diff --git a/zaza/charm_tests/dragent/test.py b/zaza/charm_tests/dragent/test.py
index 4800ade..0ccd0e3 100644
--- a/zaza/charm_tests/dragent/test.py
+++ b/zaza/charm_tests/dragent/test.py
@@ -8,9 +8,9 @@ import tenacity
 from zaza import model
 from zaza.charm_lifecycle import utils as lifecycle_utils
 from zaza.utilities import (
-    cli_utils,
-    juju_utils,
-    openstack_utils,
+    cli as cli_utils,
+    juju as juju_utils,
+    openstack as openstack_utils,
 )
 
 
diff --git a/zaza/charm_tests/dragent/tests.py b/zaza/charm_tests/dragent/tests.py
index 7ad45a1..23244a9 100644
--- a/zaza/charm_tests/dragent/tests.py
+++ b/zaza/charm_tests/dragent/tests.py
@@ -2,7 +2,7 @@
 
 import unittest
 
-from zaza.utilities import generic_utils
+from zaza.utilities import generic as generic_utils
 from zaza.charm_tests.dragent import test
 
 
diff --git a/zaza/configure/bgp_speaker.py b/zaza/configure/bgp_speaker.py
index b16d415..5f56fc4 100755
--- a/zaza/configure/bgp_speaker.py
+++ b/zaza/configure/bgp_speaker.py
@@ -4,8 +4,8 @@ import argparse
 import logging
 import sys
 from zaza.utilities import (
-    cli_utils,
-    openstack_utils,
+    cli as cli_utils,
+    openstack as openstack_utils,
 )
 
 
diff --git a/zaza/configure/network.py b/zaza/configure/network.py
index 2793a06..8dc3e13 100755
--- a/zaza/configure/network.py
+++ b/zaza/configure/network.py
@@ -5,10 +5,10 @@ import logging
 import sys
 
 from zaza.utilities import (
-    cli_utils,
-    generic_utils,
-    juju_utils,
-    openstack_utils,
+    cli as cli_utils,
+    generic as generic_utils,
+    juju as juju_utils,
+    openstack as openstack_utils,
 )
 
 """Configure network
diff --git a/zaza/utilities/cli_utils.py b/zaza/utilities/cli.py
similarity index 100%
rename from zaza/utilities/cli_utils.py
rename to zaza/utilities/cli.py
diff --git a/zaza/utilities/generic_utils.py b/zaza/utilities/generic.py
similarity index 99%
rename from zaza/utilities/generic_utils.py
rename to zaza/utilities/generic.py
index cb2e862..62b5fc5 100644
--- a/zaza/utilities/generic_utils.py
+++ b/zaza/utilities/generic.py
@@ -6,7 +6,7 @@ import yaml
 
 from zaza import model
 from zaza.charm_lifecycle import utils as lifecycle_utils
-from zaza.utilities import juju_utils
+from zaza.utilities import juju as juju_utils
 
 
 def dict_to_yaml(dict_data):
diff --git a/zaza/utilities/juju_utils.py b/zaza/utilities/juju.py
similarity index 98%
rename from zaza/utilities/juju_utils.py
rename to zaza/utilities/juju.py
index d23a6cd..74d6a6d 100644
--- a/zaza/utilities/juju_utils.py
+++ b/zaza/utilities/juju.py
@@ -8,7 +8,7 @@ from zaza import (
     controller,
 )
 from zaza.charm_lifecycle import utils as lifecycle_utils
-from zaza.utilities import generic_utils
+from zaza.utilities import generic as generic_utils
 
 
 def get_application_status(application=None, unit=None):
diff --git a/zaza/utilities/openstack_utils.py b/zaza/utilities/openstack.py
similarity index 99%
rename from zaza/utilities/openstack_utils.py
rename to zaza/utilities/openstack.py
index 5455f21..696b74b 100644
--- a/zaza/utilities/openstack_utils.py
+++ b/zaza/utilities/openstack.py
@@ -27,8 +27,8 @@ from zaza import model
 from zaza.charm_lifecycle import utils as lifecycle_utils
 from zaza.utilities import (
     exceptions,
-    generic_utils,
-    juju_utils,
+    generic as generic_utils,
+    juju as juju_utils,
 )
 
 CHARM_TYPES = {