Shortname utilitites

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):

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):

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):

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):

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"

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,
 )
 
 

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
 
 

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,
 )
 
 

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

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):

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):

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 = {