Remove deprecation warnings (#676)

Change-Id: I354d1a62c77aa1fa38f4be4615f264bc08f7795b

zaza/openstack/charm_tests/neutron/setup.py

@@ -23,10 +23,11 @@ from zaza.openstack.configure import (
 from zaza.openstack.utilities import (
     cli as cli_utils,
     generic as generic_utils,
-    juju as juju_utils,
     openstack as openstack_utils,
 )
 
+import zaza.utilities.juju as juju_utils
+
 import zaza.charm_lifecycle.utils as lifecycle_utils
 
 

zaza/openstack/configure/network.py

@@ -85,10 +85,11 @@ import sys
 from zaza.openstack.utilities import (
     cli as cli_utils,
     generic as generic_utils,
-    juju as juju_utils,
     openstack as openstack_utils,
 )
 
+import zaza.utilities.juju as juju_utils
+
 
 def setup_sdn(network_config, keystone_session=None):
     """Perform setup for Software Defined Network.

zaza/openstack/utilities/openstack_upgrade.py

@@ -17,7 +17,7 @@
 This module contains a number of functions for upgrading OpenStack.
 """
 import logging
-import zaza.openstack.utilities.juju as juju_utils
+import zaza.utilities.juju as juju_utils
 
 import zaza.model
 from zaza import sync_wrapper