Remove some deprecation warnings

unit_tests/utilities/test_zaza_utilities_openstack.py

@@ -809,12 +809,12 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
             name='_get_os_version'
         )
         self.patch(
-            'zaza.openstack.utilities.juju.get_machines_for_application',
+            'zaza.utilities.juju.get_machines_for_application',
             new_callable=mock.MagicMock(),
             name='_get_machines'
         )
         self.patch(
-            'zaza.openstack.utilities.juju.get_machine_series',
+            'zaza.utilities.juju.get_machine_series',
             new_callable=mock.MagicMock(),
             name='_get_machine_series'
         )

zaza/openstack/utilities/generic.py

@@ -23,9 +23,9 @@ import telnetlib
 import yaml
 
 from zaza import model
-from zaza.openstack.utilities import juju as juju_utils
 from zaza.openstack.utilities import exceptions as zaza_exceptions
 from zaza.openstack.utilities.os_versions import UBUNTU_OPENSTACK_RELEASE
+from zaza.utilities import juju as juju_utils
 
 
 def assertActionRanOK(action):

zaza/openstack/utilities/openstack.py

@@ -40,6 +40,7 @@ from keystoneauth1.identity import (
 )
 import zaza.openstack.utilities.cert as cert
 import zaza.utilities.deployment_env as deployment_env
+import zaza.utilities.juju as juju_utils
 from novaclient import client as novaclient_client
 from neutronclient.v2_0 import client as neutronclient
 from neutronclient.common import exceptions as neutronexceptions
@@ -66,7 +67,6 @@ from zaza import model
 from zaza.openstack.utilities import (
     exceptions,
     generic as generic_utils,
-    juju as juju_utils,
 )
 
 CIRROS_RELEASE_URL = 'http://download.cirros-cloud.net/version/released'