From dd434e281e5ca7f9f8963b96015b07929f183233 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Thu, 25 Apr 2019 15:33:25 +0200
Subject: [PATCH] Add zaza namespacing, starting with openstack

---
 doc/source/cli-utils.rst                      |  2 +-
 doc/source/exception-utils.rst                |  2 +-
 doc/source/generic-utils.rst                  |  2 +-
 doc/source/juju-utils.rst                     |  2 +-
 doc/source/openstack-utils.rst                |  2 +-
 doc/source/tls-cert-utils.rst                 |  2 +-
 setup.py                                      |  2 +-
 tests/tests.yaml                              |  4 +-
 .../utilities/test_zaza_utilities_bundle.py   |  2 +-
 .../utilities/test_zaza_utilities_ceph.py     |  4 +-
 .../utilities/test_zaza_utilities_cert.py     |  2 +-
 .../utilities/test_zaza_utilities_cli.py      |  2 +-
 .../test_zaza_utilities_file_assertions.py    |  4 +-
 .../utilities/test_zaza_utilities_generic.py  | 10 ++---
 .../utilities/test_zaza_utilities_juju.py     |  4 +-
 .../test_zaza_utilities_openstack.py          | 24 +++++++----
 zaza/__init__.py                              |  4 ++
 zaza/openstack/__init__.py                    | 15 +++++++
 zaza/{ => openstack}/charm_tests/__init__.py  |  0
 .../charm_tests/barbican_vault/__init__.py    |  0
 .../charm_tests/barbican_vault/tests.py       |  2 +-
 .../charm_tests/ceph/__init__.py              |  0
 .../charm_tests/ceph/osd/__init__.py          |  0
 .../charm_tests/ceph/osd/tests.py             |  2 +-
 .../charm_tests/ceph/rbd_mirror/__init__.py   |  0
 .../charm_tests/ceph/rbd_mirror/tests.py      | 24 +++++------
 .../{ => openstack}/charm_tests/ceph/setup.py |  0
 .../{ => openstack}/charm_tests/ceph/tests.py | 12 +++---
 .../charm_tests/dragent/__init__.py           |  0
 .../charm_tests/dragent/configure.py          |  8 ++--
 .../charm_tests/dragent/test.py               |  2 +-
 .../charm_tests/dragent/tests.py              |  4 +-
 .../charm_tests/glance/__init__.py            |  0
 .../charm_tests/glance/setup.py               |  2 +-
 .../charm_tests/glance/tests.py               |  4 +-
 .../charm_tests/keystone/__init__.py          |  4 +-
 .../charm_tests/keystone/setup.py             |  4 +-
 .../charm_tests/keystone/tests.py             | 10 ++---
 .../charm_tests/masakari/__init__.py          |  0
 .../charm_tests/masakari/setup.py             |  4 +-
 .../charm_tests/masakari/tests.py             | 42 ++++++++++---------
 .../charm_tests/neutron/__init__.py           |  0
 .../charm_tests/neutron/setup.py              |  8 ++--
 .../neutron_openvswitch/__init__.py           |  0
 .../charm_tests/neutron_openvswitch/setup.py  |  2 +-
 .../charm_tests/neutron_openvswitch/tests.py  |  2 +-
 .../charm_tests/noop/__init__.py              |  0
 .../{ => openstack}/charm_tests/noop/setup.py |  0
 .../{ => openstack}/charm_tests/noop/tests.py |  0
 .../charm_tests/nova/__init__.py              |  0
 .../{ => openstack}/charm_tests/nova/setup.py |  6 +--
 .../{ => openstack}/charm_tests/nova/tests.py | 17 ++++----
 .../{ => openstack}/charm_tests/nova/utils.py |  0
 .../charm_tests/octavia/__init__.py           |  0
 .../charm_tests/octavia/setup.py              | 14 +++----
 .../charm_tests/octavia/tests.py              |  4 +-
 .../charm_tests/pacemaker_remote/__init__.py  |  0
 .../charm_tests/pacemaker_remote/tests.py     |  5 ++-
 .../charm_tests/security/__init__.py          |  0
 .../charm_tests/security/tests.py             |  2 +-
 .../charm_tests/series_upgrade/__init__.py    |  0
 .../charm_tests/series_upgrade/tests.py       |  4 +-
 .../{ => openstack}/charm_tests/test_utils.py |  2 +-
 .../charm_tests/vault/__init__.py             |  0
 .../charm_tests/vault/setup.py                | 12 +++---
 .../charm_tests/vault/tests.py                | 14 +++----
 .../charm_tests/vault/utils.py                |  0
 zaza/{ => openstack}/configure/__init__.py    |  0
 zaza/{ => openstack}/configure/bgp_speaker.py |  2 +-
 zaza/{ => openstack}/configure/guest.py       |  4 +-
 zaza/{ => openstack}/configure/hacluster.py   |  0
 zaza/{ => openstack}/configure/masakari.py    |  2 +-
 zaza/{ => openstack}/configure/network.py     | 12 +++---
 zaza/{ => openstack}/utilities/__init__.py    |  0
 zaza/{ => openstack}/utilities/bundle.py      |  0
 zaza/{ => openstack}/utilities/ceph.py        |  2 +-
 zaza/{ => openstack}/utilities/cert.py        |  0
 zaza/{ => openstack}/utilities/cli.py         |  0
 zaza/{ => openstack}/utilities/exceptions.py  |  0
 .../utilities/file_assertions.py              |  0
 zaza/{ => openstack}/utilities/generic.py     | 14 +++----
 zaza/{ => openstack}/utilities/juju.py        |  2 +-
 zaza/{ => openstack}/utilities/openstack.py   |  4 +-
 zaza/{ => openstack}/utilities/os_versions.py |  0
 84 files changed, 188 insertions(+), 159 deletions(-)
 create mode 100644 zaza/openstack/__init__.py
 rename zaza/{ => openstack}/charm_tests/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/barbican_vault/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/barbican_vault/tests.py (95%)
 rename zaza/{ => openstack}/charm_tests/ceph/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/ceph/osd/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/ceph/osd/tests.py (96%)
 rename zaza/{ => openstack}/charm_tests/ceph/rbd_mirror/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/ceph/rbd_mirror/tests.py (95%)
 rename zaza/{ => openstack}/charm_tests/ceph/setup.py (100%)
 rename zaza/{ => openstack}/charm_tests/ceph/tests.py (98%)
 rename zaza/{ => openstack}/charm_tests/dragent/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/dragent/configure.py (92%)
 rename zaza/{ => openstack}/charm_tests/dragent/test.py (98%)
 rename zaza/{ => openstack}/charm_tests/dragent/tests.py (91%)
 rename zaza/{ => openstack}/charm_tests/glance/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/glance/setup.py (98%)
 rename zaza/{ => openstack}/charm_tests/glance/tests.py (95%)
 rename zaza/{ => openstack}/charm_tests/keystone/__init__.py (95%)
 rename zaza/{ => openstack}/charm_tests/keystone/setup.py (97%)
 rename zaza/{ => openstack}/charm_tests/keystone/tests.py (98%)
 rename zaza/{ => openstack}/charm_tests/masakari/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/masakari/setup.py (87%)
 rename zaza/{ => openstack}/charm_tests/masakari/tests.py (81%)
 rename zaza/{ => openstack}/charm_tests/neutron/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/neutron/setup.py (93%)
 rename zaza/{ => openstack}/charm_tests/neutron_openvswitch/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/neutron_openvswitch/setup.py (98%)
 rename zaza/{ => openstack}/charm_tests/neutron_openvswitch/tests.py (98%)
 rename zaza/{ => openstack}/charm_tests/noop/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/noop/setup.py (100%)
 rename zaza/{ => openstack}/charm_tests/noop/tests.py (100%)
 rename zaza/{ => openstack}/charm_tests/nova/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/nova/setup.py (93%)
 rename zaza/{ => openstack}/charm_tests/nova/tests.py (70%)
 rename zaza/{ => openstack}/charm_tests/nova/utils.py (100%)
 rename zaza/{ => openstack}/charm_tests/octavia/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/octavia/setup.py (88%)
 rename zaza/{ => openstack}/charm_tests/octavia/tests.py (95%)
 rename zaza/{ => openstack}/charm_tests/pacemaker_remote/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/pacemaker_remote/tests.py (85%)
 rename zaza/{ => openstack}/charm_tests/security/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/security/tests.py (97%)
 rename zaza/{ => openstack}/charm_tests/series_upgrade/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/series_upgrade/tests.py (98%)
 rename zaza/{ => openstack}/charm_tests/test_utils.py (99%)
 rename zaza/{ => openstack}/charm_tests/vault/__init__.py (100%)
 rename zaza/{ => openstack}/charm_tests/vault/setup.py (91%)
 rename zaza/{ => openstack}/charm_tests/vault/tests.py (94%)
 rename zaza/{ => openstack}/charm_tests/vault/utils.py (100%)
 rename zaza/{ => openstack}/configure/__init__.py (100%)
 rename zaza/{ => openstack}/configure/bgp_speaker.py (99%)
 rename zaza/{ => openstack}/configure/guest.py (97%)
 rename zaza/{ => openstack}/configure/hacluster.py (100%)
 rename zaza/{ => openstack}/configure/masakari.py (99%)
 rename zaza/{ => openstack}/configure/network.py (96%)
 rename zaza/{ => openstack}/utilities/__init__.py (100%)
 rename zaza/{ => openstack}/utilities/bundle.py (100%)
 rename zaza/{ => openstack}/utilities/ceph.py (98%)
 rename zaza/{ => openstack}/utilities/cert.py (100%)
 rename zaza/{ => openstack}/utilities/cli.py (100%)
 rename zaza/{ => openstack}/utilities/exceptions.py (100%)
 rename zaza/{ => openstack}/utilities/file_assertions.py (100%)
 rename zaza/{ => openstack}/utilities/generic.py (98%)
 rename zaza/{ => openstack}/utilities/juju.py (99%)
 rename zaza/{ => openstack}/utilities/openstack.py (99%)
 rename zaza/{ => openstack}/utilities/os_versions.py (100%)

diff --git a/doc/source/cli-utils.rst b/doc/source/cli-utils.rst
index 4a7e8d9..71f96b0 100644
--- a/doc/source/cli-utils.rst
+++ b/doc/source/cli-utils.rst
@@ -1,5 +1,5 @@
 CLI Utilities
 -------------
 
-.. automodule:: zaza.utilities.cli
+.. automodule:: zaza.openstack.utilities.cli
    :members:
diff --git a/doc/source/exception-utils.rst b/doc/source/exception-utils.rst
index 51d3a0b..8220f0f 100644
--- a/doc/source/exception-utils.rst
+++ b/doc/source/exception-utils.rst
@@ -1,5 +1,5 @@
 Utility Exceptions
 ------------------
 
-.. automodule:: zaza.utilities.exceptions
+.. automodule:: zaza.openstack.utilities.exceptions
    :members:
diff --git a/doc/source/generic-utils.rst b/doc/source/generic-utils.rst
index 4f29ac2..52402fe 100644
--- a/doc/source/generic-utils.rst
+++ b/doc/source/generic-utils.rst
@@ -1,5 +1,5 @@
 Generic Utilities
 -----------------
 
-.. automodule:: zaza.utilities.generic
+.. automodule:: zaza.openstack.utilities.generic
    :members:
diff --git a/doc/source/juju-utils.rst b/doc/source/juju-utils.rst
index c51131f..a58533a 100644
--- a/doc/source/juju-utils.rst
+++ b/doc/source/juju-utils.rst
@@ -1,5 +1,5 @@
 Juju Utilities
 --------------
 
-.. automodule:: zaza.utilities.juju
+.. automodule:: zaza.openstack.utilities.juju
    :members:
diff --git a/doc/source/openstack-utils.rst b/doc/source/openstack-utils.rst
index fc80733..8ba9d3b 100644
--- a/doc/source/openstack-utils.rst
+++ b/doc/source/openstack-utils.rst
@@ -1,5 +1,5 @@
 OpenStack Utilities
 -------------------
 
-.. automodule:: zaza.utilities.openstack
+.. automodule:: zaza.openstack.utilities.openstack
    :members:
diff --git a/doc/source/tls-cert-utils.rst b/doc/source/tls-cert-utils.rst
index 7c63217..07db36a 100644
--- a/doc/source/tls-cert-utils.rst
+++ b/doc/source/tls-cert-utils.rst
@@ -1,5 +1,5 @@
 TLS Certificate Utilities
 -------------------------
 
-.. automodule:: zaza.utilities.cert
+.. automodule:: zaza.openstack.utilities.cert
    :members:
diff --git a/setup.py b/setup.py
index 73d257e..a1ee7be 100644
--- a/setup.py
+++ b/setup.py
@@ -102,7 +102,7 @@ setup(
             'functest-test = zaza.charm_lifecycle.test:main',
             'current-apps = zaza.model:main',
             'tempest-config = zaza.tempest_config:main',
-            'remove-placement = zaza.utilities.bundle:main',
+            'remove-placement = zaza.openstack.utilities.bundle:main',
         ]
     },
     license='Apache-2.0: http://www.apache.org/licenses/LICENSE-2.0',
diff --git a/tests/tests.yaml b/tests/tests.yaml
index b3abec1..73f9e9a 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -6,6 +6,6 @@ target_deploy_status:
     workload-status: active
     workload-status-message: icmp ok, local hostname ok, dns ok
 configure:
-- zaza.charm_tests.noop.setup.basic_setup
+- zaza.openstack.charm_tests.noop.setup.basic_setup
 tests:
-- zaza.charm_tests.noop.tests.NoopTest
+- zaza.openstack.charm_tests.noop.tests.NoopTest
diff --git a/unit_tests/utilities/test_zaza_utilities_bundle.py b/unit_tests/utilities/test_zaza_utilities_bundle.py
index eb30477..10e0f67 100644
--- a/unit_tests/utilities/test_zaza_utilities_bundle.py
+++ b/unit_tests/utilities/test_zaza_utilities_bundle.py
@@ -15,7 +15,7 @@
 # import mock
 
 import unit_tests.utils as ut_utils
-import zaza.utilities.bundle as bundle
+import zaza.openstack.utilities.bundle as bundle
 
 import yaml
 
diff --git a/unit_tests/utilities/test_zaza_utilities_ceph.py b/unit_tests/utilities/test_zaza_utilities_ceph.py
index 126ef92..0855e41 100644
--- a/unit_tests/utilities/test_zaza_utilities_ceph.py
+++ b/unit_tests/utilities/test_zaza_utilities_ceph.py
@@ -1,7 +1,7 @@
 import unit_tests.utils as ut_utils
 import zaza.model as model
-import zaza.utilities.ceph as ceph_utils
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.utilities.ceph as ceph_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 
 
 class TestCephUtils(ut_utils.BaseTestCase):
diff --git a/unit_tests/utilities/test_zaza_utilities_cert.py b/unit_tests/utilities/test_zaza_utilities_cert.py
index d9e8566..a2ac276 100644
--- a/unit_tests/utilities/test_zaza_utilities_cert.py
+++ b/unit_tests/utilities/test_zaza_utilities_cert.py
@@ -15,7 +15,7 @@
 import mock
 
 import unit_tests.utils as ut_utils
-import zaza.utilities.cert as cert
+import zaza.openstack.utilities.cert as cert
 
 TEST_SSH_PRIVATE_KEY = """
 -----BEGIN RSA PRIVATE KEY-----
diff --git a/unit_tests/utilities/test_zaza_utilities_cli.py b/unit_tests/utilities/test_zaza_utilities_cli.py
index 221124f..8bb26b1 100644
--- a/unit_tests/utilities/test_zaza_utilities_cli.py
+++ b/unit_tests/utilities/test_zaza_utilities_cli.py
@@ -14,7 +14,7 @@
 
 import mock
 import unit_tests.utils as ut_utils
-from zaza.utilities import cli as cli_utils
+from zaza.openstack.utilities import cli as cli_utils
 
 
 class TestCLIUtils(ut_utils.BaseTestCase):
diff --git a/unit_tests/utilities/test_zaza_utilities_file_assertions.py b/unit_tests/utilities/test_zaza_utilities_file_assertions.py
index b40276c..5b19c8a 100644
--- a/unit_tests/utilities/test_zaza_utilities_file_assertions.py
+++ b/unit_tests/utilities/test_zaza_utilities_file_assertions.py
@@ -14,7 +14,7 @@
 
 import mock
 import unit_tests.utils as ut_utils
-import zaza.utilities.file_assertions as file_assertions
+import zaza.openstack.utilities.file_assertions as file_assertions
 
 
 class TestFileAssertionUtils(ut_utils.BaseTestCase):
@@ -22,7 +22,7 @@ class TestFileAssertionUtils(ut_utils.BaseTestCase):
         super(TestFileAssertionUtils, self).setUp()
         # Patch all run_on_unit calls
         self.patch(
-            'zaza.utilities.file_assertions.model.run_on_unit',
+            'zaza.openstack.utilities.file_assertions.model.run_on_unit',
             new_callable=mock.MagicMock(),
             name='run_on_unit'
         )
diff --git a/unit_tests/utilities/test_zaza_utilities_generic.py b/unit_tests/utilities/test_zaza_utilities_generic.py
index 3036238..b50e2b8 100644
--- a/unit_tests/utilities/test_zaza_utilities_generic.py
+++ b/unit_tests/utilities/test_zaza_utilities_generic.py
@@ -14,8 +14,8 @@
 
 import mock
 import unit_tests.utils as ut_utils
-from zaza.utilities import generic as generic_utils
-import zaza.utilities.exceptions as zaza_exceptions
+from zaza.openstack.utilities import generic as generic_utils
+import zaza.openstack.utilities.exceptions as zaza_exceptions
 
 FAKE_STATUS = {
     'can-upgrade-to': '',
@@ -43,7 +43,7 @@ class TestGenericUtils(ut_utils.BaseTestCase):
         super(TestGenericUtils, self).setUp()
         # Patch all subprocess calls
         self.patch(
-            'zaza.utilities.generic.subprocess',
+            'zaza.openstack.utilities.generic.subprocess',
             new_callable=mock.MagicMock(),
             name='subprocess'
         )
@@ -372,7 +372,7 @@ class TestGenericUtils(ut_utils.BaseTestCase):
 
     def test_get_process_id_list(self):
         self.patch(
-            "zaza.utilities.generic.model.run_on_unit",
+            "zaza.openstack.utilities.generic.model.run_on_unit",
             new_callable=mock.MagicMock(),
             name="_run"
         )
@@ -410,7 +410,7 @@ class TestGenericUtils(ut_utils.BaseTestCase):
 
     def test_get_unit_process_ids(self):
         self.patch(
-            "zaza.utilities.generic.get_process_id_list",
+            "zaza.openstack.utilities.generic.get_process_id_list",
             new_callable=mock.MagicMock(),
             name="_get_pids"
         )
diff --git a/unit_tests/utilities/test_zaza_utilities_juju.py b/unit_tests/utilities/test_zaza_utilities_juju.py
index 304120a..e70bef8 100644
--- a/unit_tests/utilities/test_zaza_utilities_juju.py
+++ b/unit_tests/utilities/test_zaza_utilities_juju.py
@@ -14,7 +14,7 @@
 
 import mock
 import unit_tests.utils as ut_utils
-from zaza.utilities import juju as juju_utils
+from zaza.openstack.utilities import juju as juju_utils
 
 
 class TestJujuUtils(ut_utils.BaseTestCase):
@@ -257,7 +257,7 @@ class TestJujuUtils(ut_utils.BaseTestCase):
 
     def test_get_machine_series(self):
         self.patch(
-            'zaza.utilities.juju.get_machine_status',
+            'zaza.openstack.utilities.juju.get_machine_status',
             new_callable=mock.MagicMock(),
             name='_get_machine_status'
         )
diff --git a/unit_tests/utilities/test_zaza_utilities_openstack.py b/unit_tests/utilities/test_zaza_utilities_openstack.py
index 6d24313..45565b1 100644
--- a/unit_tests/utilities/test_zaza_utilities_openstack.py
+++ b/unit_tests/utilities/test_zaza_utilities_openstack.py
@@ -19,8 +19,8 @@ import mock
 import tenacity
 
 import unit_tests.utils as ut_utils
-from zaza.utilities import openstack as openstack_utils
-from zaza.utilities import exceptions
+from zaza.openstack.utilities import openstack as openstack_utils
+from zaza.openstack.utilities import exceptions
 
 
 class TestOpenStackUtils(ut_utils.BaseTestCase):
@@ -444,7 +444,9 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
         image_mock = mock.MagicMock(id='9d1125af')
         glance_mock.images.create.return_value = image_mock
         m = mock.mock_open()
-        with mock.patch('zaza.utilities.openstack.open', m, create=False) as f:
+        with mock.patch(
+            'zaza.openstack.utilities.openstack.open', m, create=False
+        ) as f:
             openstack_utils.upload_image_to_glance(
                 glance_mock,
                 '/tmp/im1.img',
@@ -540,7 +542,9 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
 
     def test_write_private_key(self):
         m = mock.mock_open()
-        with mock.patch('zaza.utilities.openstack.open', m, create=False):
+        with mock.patch(
+            'zaza.openstack.utilities.openstack.open', m, create=False
+        ):
             openstack_utils.write_private_key('mykeys', 'keycontents')
         m.assert_called_once_with('tests/id_rsa_mykeys', 'w')
         handle = m()
@@ -550,7 +554,9 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
         self.patch_object(openstack_utils.os.path, "isfile",
                           return_value=True)
         m = mock.mock_open(read_data='myprivkey')
-        with mock.patch('zaza.utilities.openstack.open', m, create=True):
+        with mock.patch(
+            'zaza.openstack.utilities.openstack.open', m, create=True
+        ):
             self.assertEqual(
                 openstack_utils.get_private_key('mykeys'),
                 'myprivkey')
@@ -725,17 +731,17 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
 
     def test_get_current_openstack_release_pair(self):
         self.patch(
-            'zaza.utilities.openstack.get_current_os_versions',
+            'zaza.openstack.utilities.openstack.get_current_os_versions',
             new_callable=mock.MagicMock(),
             name='_get_os_version'
         )
         self.patch(
-            'zaza.utilities.juju.get_machines_for_application',
+            'zaza.openstack.utilities.juju.get_machines_for_application',
             new_callable=mock.MagicMock(),
             name='_get_machines'
         )
         self.patch(
-            'zaza.utilities.juju.get_machine_series',
+            'zaza.openstack.utilities.juju.get_machine_series',
             new_callable=mock.MagicMock(),
             name='_get_machine_series'
         )
@@ -771,7 +777,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
 
     def test_get_openstack_release(self):
         self.patch(
-            'zaza.utilities.openstack.get_current_os_release_pair',
+            'zaza.openstack.utilities.openstack.get_current_os_release_pair',
             new_callable=mock.MagicMock(),
             name='_get_os_rel_pair'
         )
diff --git a/zaza/__init__.py b/zaza/__init__.py
index 0bcb3f3..e10a793 100644
--- a/zaza/__init__.py
+++ b/zaza/__init__.py
@@ -14,6 +14,10 @@
 
 """Functions to support converting async function to a sync equivalent."""
 import asyncio
+from pkgutil import extend_path
+
+
+__path__ = extend_path(__path__, __name__)
 
 
 def run(*steps):
diff --git a/zaza/openstack/__init__.py b/zaza/openstack/__init__.py
new file mode 100644
index 0000000..37c946d
--- /dev/null
+++ b/zaza/openstack/__init__.py
@@ -0,0 +1,15 @@
+# Copyright 2018 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""OpenStack specific zaza functionality."""
diff --git a/zaza/charm_tests/__init__.py b/zaza/openstack/charm_tests/__init__.py
similarity index 100%
rename from zaza/charm_tests/__init__.py
rename to zaza/openstack/charm_tests/__init__.py
diff --git a/zaza/charm_tests/barbican_vault/__init__.py b/zaza/openstack/charm_tests/barbican_vault/__init__.py
similarity index 100%
rename from zaza/charm_tests/barbican_vault/__init__.py
rename to zaza/openstack/charm_tests/barbican_vault/__init__.py
diff --git a/zaza/charm_tests/barbican_vault/tests.py b/zaza/openstack/charm_tests/barbican_vault/tests.py
similarity index 95%
rename from zaza/charm_tests/barbican_vault/tests.py
rename to zaza/openstack/charm_tests/barbican_vault/tests.py
index 0684c77..6999e22 100644
--- a/zaza/charm_tests/barbican_vault/tests.py
+++ b/zaza/openstack/charm_tests/barbican_vault/tests.py
@@ -15,7 +15,7 @@
 """Encapsulate barbican-vault testing."""
 
 import zaza
-import zaza.charm_tests.vault.tests as vault_tests
+import zaza.openstack.charm_tests.vault.tests as vault_tests
 
 
 class BarbicanVaultUnsealVault(vault_tests.UnsealVault):
diff --git a/zaza/charm_tests/ceph/__init__.py b/zaza/openstack/charm_tests/ceph/__init__.py
similarity index 100%
rename from zaza/charm_tests/ceph/__init__.py
rename to zaza/openstack/charm_tests/ceph/__init__.py
diff --git a/zaza/charm_tests/ceph/osd/__init__.py b/zaza/openstack/charm_tests/ceph/osd/__init__.py
similarity index 100%
rename from zaza/charm_tests/ceph/osd/__init__.py
rename to zaza/openstack/charm_tests/ceph/osd/__init__.py
diff --git a/zaza/charm_tests/ceph/osd/tests.py b/zaza/openstack/charm_tests/ceph/osd/tests.py
similarity index 96%
rename from zaza/charm_tests/ceph/osd/tests.py
rename to zaza/openstack/charm_tests/ceph/osd/tests.py
index feafbb8..e3f7be1 100644
--- a/zaza/charm_tests/ceph/osd/tests.py
+++ b/zaza/openstack/charm_tests/ceph/osd/tests.py
@@ -17,7 +17,7 @@
 import logging
 import unittest
 
-import zaza.charm_tests.test_utils as test_utils
+import zaza.openstack.charm_tests.test_utils as test_utils
 import zaza.model as zaza_model
 
 
diff --git a/zaza/charm_tests/ceph/rbd_mirror/__init__.py b/zaza/openstack/charm_tests/ceph/rbd_mirror/__init__.py
similarity index 100%
rename from zaza/charm_tests/ceph/rbd_mirror/__init__.py
rename to zaza/openstack/charm_tests/ceph/rbd_mirror/__init__.py
diff --git a/zaza/charm_tests/ceph/rbd_mirror/tests.py b/zaza/openstack/charm_tests/ceph/rbd_mirror/tests.py
similarity index 95%
rename from zaza/charm_tests/ceph/rbd_mirror/tests.py
rename to zaza/openstack/charm_tests/ceph/rbd_mirror/tests.py
index 47e2e7e..fa664c3 100644
--- a/zaza/charm_tests/ceph/rbd_mirror/tests.py
+++ b/zaza/openstack/charm_tests/ceph/rbd_mirror/tests.py
@@ -17,13 +17,13 @@ import json
 import logging
 import re
 
-import zaza.charm_tests.test_utils as test_utils
+import zaza.openstack.charm_tests.test_utils as test_utils
 
 import zaza.model
-import zaza.utilities.ceph
-import zaza.utilities.openstack
+import zaza.openstack.utilities.ceph
+import zaza.openstack.utilities.openstack as openstack
 
-from zaza.charm_tests.glance.setup import LTS_IMAGE_NAME
+from zaza.openstack.charm_tests.glance.setup import LTS_IMAGE_NAME
 
 
 class CephRBDMirrorBase(test_utils.OpenStackBaseTest):
@@ -55,11 +55,11 @@ class CephRBDMirrorBase(test_utils.OpenStackBaseTest):
         :returns: Tuple with list of pools on each side.
         :rtype: tuple
         """
-        site_a_pools = zaza.utilities.ceph.get_ceph_pools(
+        site_a_pools = zaza.openstack.utilities.ceph.get_ceph_pools(
             zaza.model.get_lead_unit_name(
                 'ceph-mon', model_name=self.site_a_model),
             model_name=self.site_a_model)
-        site_b_pools = zaza.utilities.ceph.get_ceph_pools(
+        site_b_pools = zaza.openstack.utilities.ceph.get_ceph_pools(
             zaza.model.get_lead_unit_name(
                 'ceph-mon' + self.site_b_app_suffix,
                 model_name=self.site_b_model),
@@ -193,9 +193,9 @@ class CephRBDMirrorTest(CephRBDMirrorBase):
         site B and subsequently comparing the contents we get a full end to end
         test.
         """
-        session = zaza.utilities.openstack.get_overcloud_keystone_session()
-        glance = zaza.utilities.openstack.get_glance_session_client(session)
-        cinder = zaza.utilities.openstack.get_cinder_session_client(session)
+        session = openstack.get_overcloud_keystone_session()
+        glance = openstack.get_glance_session_client(session)
+        cinder = openstack.get_cinder_session_client(session)
 
         image = next(glance.images.list(name=LTS_IMAGE_NAME))
 
@@ -210,7 +210,7 @@ class CephRBDMirrorTest(CephRBDMirrorBase):
                 return
             volume = cinder.volumes.create(8, name='zaza', imageRef=image.id)
             try:
-                zaza.utilities.openstack.resource_reaches_status(
+                openstack.resource_reaches_status(
                     cinder.volumes, volume.id, msg='volume')
                 return volume
             except AssertionError:
@@ -219,7 +219,7 @@ class CephRBDMirrorTest(CephRBDMirrorBase):
                 return create_volume_from_image(cinder, image, retry=retry - 1)
         volume = create_volume_from_image(cinder, image)
 
-        site_a_hash = zaza.utilities.ceph.get_rbd_hash(
+        site_a_hash = zaza.openstack.utilities.ceph.get_rbd_hash(
             zaza.model.get_lead_unit_name('ceph-mon',
                                           model_name=self.site_a_model),
             'cinder-ceph',
@@ -230,7 +230,7 @@ class CephRBDMirrorTest(CephRBDMirrorBase):
             check_entries_behind_master=True,
             application_name=self.application_name + self.site_b_app_suffix,
             model_name=self.site_b_model)
-        site_b_hash = zaza.utilities.ceph.get_rbd_hash(
+        site_b_hash = zaza.openstack.utilities.ceph.get_rbd_hash(
             zaza.model.get_lead_unit_name('ceph-mon' + self.site_b_app_suffix,
                                           model_name=self.site_b_model),
             'cinder-ceph',
diff --git a/zaza/charm_tests/ceph/setup.py b/zaza/openstack/charm_tests/ceph/setup.py
similarity index 100%
rename from zaza/charm_tests/ceph/setup.py
rename to zaza/openstack/charm_tests/ceph/setup.py
diff --git a/zaza/charm_tests/ceph/tests.py b/zaza/openstack/charm_tests/ceph/tests.py
similarity index 98%
rename from zaza/charm_tests/ceph/tests.py
rename to zaza/openstack/charm_tests/ceph/tests.py
index 9431be5..66bf5bd 100644
--- a/zaza/charm_tests/ceph/tests.py
+++ b/zaza/openstack/charm_tests/ceph/tests.py
@@ -26,13 +26,13 @@ import tenacity
 
 from swiftclient.exceptions import ClientException
 
-import zaza.charm_tests.test_utils as test_utils
+import zaza.openstack.charm_tests.test_utils as test_utils
 import zaza.model as zaza_model
-import zaza.utilities.ceph as zaza_ceph
-import zaza.utilities.exceptions as zaza_exceptions
-import zaza.utilities.generic as zaza_utils
-import zaza.utilities.juju as zaza_juju
-import zaza.utilities.openstack as zaza_openstack
+import zaza.openstack.utilities.ceph as zaza_ceph
+import zaza.openstack.utilities.exceptions as zaza_exceptions
+import zaza.openstack.utilities.generic as zaza_utils
+import zaza.openstack.utilities.juju as zaza_juju
+import zaza.openstack.utilities.openstack as zaza_openstack
 
 
 class CephLowLevelTest(test_utils.OpenStackBaseTest):
diff --git a/zaza/charm_tests/dragent/__init__.py b/zaza/openstack/charm_tests/dragent/__init__.py
similarity index 100%
rename from zaza/charm_tests/dragent/__init__.py
rename to zaza/openstack/charm_tests/dragent/__init__.py
diff --git a/zaza/charm_tests/dragent/configure.py b/zaza/openstack/charm_tests/dragent/configure.py
similarity index 92%
rename from zaza/charm_tests/dragent/configure.py
rename to zaza/openstack/charm_tests/dragent/configure.py
index 82dabb2..6d6e075 100644
--- a/zaza/charm_tests/dragent/configure.py
+++ b/zaza/openstack/charm_tests/dragent/configure.py
@@ -16,11 +16,11 @@
 
 """Setup for BGP deployments."""
 
-from zaza.configure import (
+from zaza.openstack.configure import (
     network,
     bgp_speaker,
 )
-from zaza.utilities import (
+from zaza.openstack.utilities import (
     cli as cli_utils,
     generic as generic_utils,
     openstack as openstack_utils,
@@ -45,8 +45,8 @@ OVERCLOUD_NETWORK_CONFIG = {
 # The undercloud network configuration settings are substrate specific to
 # the environment where the tests are being executed. These settings may be
 # overridden by environment variables. See the doc string documentation for
-# zaza.utilities.generic_utils.get_undercloud_env_vars for the environment
-# variables required to be exported and available to zaza.
+# zaza.openstack.utilities.generic_utils.get_undercloud_env_vars for the
+# environment variables required to be exported and available to zaza.
 # These are default settings provided as an example.
 DEFAULT_UNDERCLOUD_NETWORK_CONFIG = {
     "start_floating_ip": "10.5.150.0",
diff --git a/zaza/charm_tests/dragent/test.py b/zaza/openstack/charm_tests/dragent/test.py
similarity index 98%
rename from zaza/charm_tests/dragent/test.py
rename to zaza/openstack/charm_tests/dragent/test.py
index 8deab71..de4e230 100644
--- a/zaza/charm_tests/dragent/test.py
+++ b/zaza/openstack/charm_tests/dragent/test.py
@@ -22,7 +22,7 @@ import sys
 import tenacity
 
 from zaza import model
-from zaza.utilities import (
+from zaza.openstack.utilities import (
     cli as cli_utils,
     juju as juju_utils,
     openstack as openstack_utils,
diff --git a/zaza/charm_tests/dragent/tests.py b/zaza/openstack/charm_tests/dragent/tests.py
similarity index 91%
rename from zaza/charm_tests/dragent/tests.py
rename to zaza/openstack/charm_tests/dragent/tests.py
index ec914c0..5b073b0 100644
--- a/zaza/charm_tests/dragent/tests.py
+++ b/zaza/openstack/charm_tests/dragent/tests.py
@@ -18,8 +18,8 @@
 
 import unittest
 
-from zaza.utilities import cli as cli_utils
-from zaza.charm_tests.dragent import test
+from zaza.openstack.utilities import cli as cli_utils
+from zaza.openstack.charm_tests.dragent import test
 
 
 class DRAgentTest(unittest.TestCase):
diff --git a/zaza/charm_tests/glance/__init__.py b/zaza/openstack/charm_tests/glance/__init__.py
similarity index 100%
rename from zaza/charm_tests/glance/__init__.py
rename to zaza/openstack/charm_tests/glance/__init__.py
diff --git a/zaza/charm_tests/glance/setup.py b/zaza/openstack/charm_tests/glance/setup.py
similarity index 98%
rename from zaza/charm_tests/glance/setup.py
rename to zaza/openstack/charm_tests/glance/setup.py
index d3dd821..c992917 100644
--- a/zaza/charm_tests/glance/setup.py
+++ b/zaza/openstack/charm_tests/glance/setup.py
@@ -15,7 +15,7 @@
 """Code for configuring glance."""
 
 import logging
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 
 CIRROS_IMAGE_NAME = "cirros"
 LTS_RELEASE = "bionic"
diff --git a/zaza/charm_tests/glance/tests.py b/zaza/openstack/charm_tests/glance/tests.py
similarity index 95%
rename from zaza/charm_tests/glance/tests.py
rename to zaza/openstack/charm_tests/glance/tests.py
index b679c52..001f17f 100644
--- a/zaza/charm_tests/glance/tests.py
+++ b/zaza/openstack/charm_tests/glance/tests.py
@@ -18,8 +18,8 @@
 
 import logging
 
-import zaza.utilities.openstack as openstack_utils
-import zaza.charm_tests.test_utils as test_utils
+import zaza.openstack.utilities.openstack as openstack_utils
+import zaza.openstack.charm_tests.test_utils as test_utils
 
 
 class GlanceTest(test_utils.OpenStackBaseTest):
diff --git a/zaza/charm_tests/keystone/__init__.py b/zaza/openstack/charm_tests/keystone/__init__.py
similarity index 95%
rename from zaza/charm_tests/keystone/__init__.py
rename to zaza/openstack/charm_tests/keystone/__init__.py
index 0052f6b..6f7de8e 100644
--- a/zaza/charm_tests/keystone/__init__.py
+++ b/zaza/openstack/charm_tests/keystone/__init__.py
@@ -14,8 +14,8 @@
 
 """Collection of code for setting up and testing keystone."""
 import zaza
-import zaza.charm_tests.test_utils as test_utils
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.charm_tests.test_utils as test_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 
 DEMO_TENANT = 'demoTenant'
 DEMO_DOMAIN = 'demoDomain'
diff --git a/zaza/charm_tests/keystone/setup.py b/zaza/openstack/charm_tests/keystone/setup.py
similarity index 97%
rename from zaza/charm_tests/keystone/setup.py
rename to zaza/openstack/charm_tests/keystone/setup.py
index 2e6b954..c2cc4ac 100644
--- a/zaza/charm_tests/keystone/setup.py
+++ b/zaza/openstack/charm_tests/keystone/setup.py
@@ -14,8 +14,8 @@
 
 """Code for setting up keystone."""
 
-import zaza.utilities.openstack as openstack_utils
-from zaza.charm_tests.keystone import (
+import zaza.openstack.utilities.openstack as openstack_utils
+from zaza.openstack.charm_tests.keystone import (
     BaseKeystoneTest,
     DEMO_TENANT,
     DEMO_DOMAIN,
diff --git a/zaza/charm_tests/keystone/tests.py b/zaza/openstack/charm_tests/keystone/tests.py
similarity index 98%
rename from zaza/charm_tests/keystone/tests.py
rename to zaza/openstack/charm_tests/keystone/tests.py
index bad2126..66727cc 100644
--- a/zaza/charm_tests/keystone/tests.py
+++ b/zaza/openstack/charm_tests/keystone/tests.py
@@ -21,12 +21,12 @@ import pprint
 import keystoneauth1
 
 import zaza.model
-import zaza.utilities.exceptions as zaza_exceptions
-import zaza.utilities.juju as juju_utils
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.utilities.exceptions as zaza_exceptions
+import zaza.openstack.utilities.juju as juju_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 
-import zaza.charm_tests.test_utils as test_utils
-from zaza.charm_tests.keystone import (
+import zaza.openstack.charm_tests.test_utils as test_utils
+from zaza.openstack.charm_tests.keystone import (
     BaseKeystoneTest,
     DEMO_DOMAIN,
     DEMO_TENANT,
diff --git a/zaza/charm_tests/masakari/__init__.py b/zaza/openstack/charm_tests/masakari/__init__.py
similarity index 100%
rename from zaza/charm_tests/masakari/__init__.py
rename to zaza/openstack/charm_tests/masakari/__init__.py
diff --git a/zaza/charm_tests/masakari/setup.py b/zaza/openstack/charm_tests/masakari/setup.py
similarity index 87%
rename from zaza/charm_tests/masakari/setup.py
rename to zaza/openstack/charm_tests/masakari/setup.py
index 53ca1be..5d044a5 100644
--- a/zaza/charm_tests/masakari/setup.py
+++ b/zaza/openstack/charm_tests/masakari/setup.py
@@ -14,9 +14,9 @@
 
 """Code for setting up masakari tests."""
 
-import zaza.configure.masakari
+import zaza.openstack.configure.masakari
 
 
 def create_segments():
     """Create simple segment setup."""
-    zaza.configure.masakari.create_segments()
+    zaza.openstack.configure.masakari.create_segments()
diff --git a/zaza/charm_tests/masakari/tests.py b/zaza/openstack/charm_tests/masakari/tests.py
similarity index 81%
rename from zaza/charm_tests/masakari/tests.py
rename to zaza/openstack/charm_tests/masakari/tests.py
index 36c8d23..3c2e6d7 100644
--- a/zaza/charm_tests/masakari/tests.py
+++ b/zaza/openstack/charm_tests/masakari/tests.py
@@ -22,12 +22,13 @@ import logging
 import novaclient
 
 import zaza.model
-import zaza.charm_tests.test_utils as test_utils
-import zaza.utilities.openstack as openstack_utils
-import zaza.utilities.juju as juju_utils
-import zaza.configure.guest
-import zaza.configure.hacluster
-import zaza.configure.masakari
+import zaza.openstack.charm_tests.test_utils as test_utils
+import openstack as openstack_utils
+import zaza.openstack.utilities.juju as juju_utils
+import zaza.openstack.utilities.openstack as openstack
+import zaza.openstack.configure.guest
+import zaza.openstack.configure.hacluster
+import zaza.openstack.configure.masakari
 
 
 class MasakariTest(test_utils.OpenStackBaseTest):
@@ -48,11 +49,11 @@ class MasakariTest(test_utils.OpenStackBaseTest):
         logging.info('Running teardown')
         for unit in zaza.model.get_units('nova-compute',
                                          model_name=cls.model_name):
-            zaza.configure.masakari.simulate_compute_host_recovery(
+            zaza.openstack.configure.masakari.simulate_compute_host_recovery(
                 unit.entity_id,
                 model_name=cls.model_name)
-        zaza.utilities.openstack.enable_all_nova_services(cls.nova_client)
-        zaza.configure.masakari.enable_hosts()
+        openstack.enable_all_nova_services(cls.nova_client)
+        zaza.openstack.configure.masakari.enable_hosts()
 
     def ensure_guest(self, vm_name):
         """Return the existing guest or boot a new one.
@@ -67,7 +68,7 @@ class MasakariTest(test_utils.OpenStackBaseTest):
             logging.info('Found existing guest')
         except novaclient.exceptions.NotFound:
             logging.info('Launching new guest')
-            guest = zaza.configure.guest.launch_instance(
+            guest = zaza.openstack.configure.guest.launch_instance(
                 'bionic',
                 use_boot_volume=True,
                 meta={'HA_Enabled': 'True'},
@@ -82,7 +83,7 @@ class MasakariTest(test_utils.OpenStackBaseTest):
         :returns: Hypervisor name and juju unit name
         :rtype: (str, str)
         """
-        current_hypervisor = zaza.utilities.openstack.get_hypervisor_for_guest(
+        current_hypervisor = openstack.get_hypervisor_for_guest(
             self.nova_client,
             vm_name)
         unit_name = juju_utils.get_unit_name_from_host_name(
@@ -112,14 +113,15 @@ class MasakariTest(test_utils.OpenStackBaseTest):
     def test_instance_failover(self):
         """Test masakari managed guest migration."""
         # Launch guest
-        self.assertTrue(zaza.configure.hacluster.check_all_nodes_online(
-            'masakari'))
+        self.assertTrue(
+            zaza.openstack.configure.hacluster.check_all_nodes_online(
+                'masakari'))
         vm_name = 'zaza-test-instance-failover'
         self.ensure_guest(vm_name)
 
         # Locate hypervisor hosting guest and shut it down
         current_hypervisor, unit_name = self.get_guests_compute_info(vm_name)
-        zaza.configure.masakari.simulate_compute_host_failure(
+        zaza.openstack.configure.masakari.simulate_compute_host_failure(
             unit_name,
             model_name=self.model_name)
 
@@ -127,17 +129,17 @@ class MasakariTest(test_utils.OpenStackBaseTest):
         logging.info('Waiting for guest to move away from {}'.format(
             current_hypervisor))
         # wait_for_server_migration will throw an exception if migration fails
-        zaza.utilities.openstack.wait_for_server_migration(
+        openstack.wait_for_server_migration(
             self.nova_client,
             vm_name,
             current_hypervisor)
 
         # Bring things back
-        zaza.configure.masakari.simulate_compute_host_recovery(
+        zaza.openstack.configure.masakari.simulate_compute_host_recovery(
             unit_name,
             model_name=self.model_name)
-        zaza.utilities.openstack.enable_all_nova_services(self.nova_client)
-        zaza.configure.masakari.enable_hosts()
+        openstack.enable_all_nova_services(self.nova_client)
+        zaza.openstack.configure.masakari.enable_hosts()
 
     def test_instance_restart_on_fail(self):
         """Test singlee guest crash and recovery."""
@@ -154,13 +156,13 @@ class MasakariTest(test_utils.OpenStackBaseTest):
             vm.updated,
             "%Y-%m-%dT%H:%M:%SZ")
         logging.info('Simulating vm crash of {}'.format(vm_name))
-        zaza.configure.masakari.simulate_guest_crash(
+        zaza.openstack.configure.masakari.simulate_guest_crash(
             guest_pid,
             unit_name,
             model_name=self.model_name)
         logging.info('Waiting for {} to be updated and become active'.format(
             vm_name))
-        zaza.utilities.openstack.wait_for_server_update_and_active(
+        openstack.wait_for_server_update_and_active(
             self.nova_client,
             vm_name,
             inital_update_time)
diff --git a/zaza/charm_tests/neutron/__init__.py b/zaza/openstack/charm_tests/neutron/__init__.py
similarity index 100%
rename from zaza/charm_tests/neutron/__init__.py
rename to zaza/openstack/charm_tests/neutron/__init__.py
diff --git a/zaza/charm_tests/neutron/setup.py b/zaza/openstack/charm_tests/neutron/setup.py
similarity index 93%
rename from zaza/charm_tests/neutron/setup.py
rename to zaza/openstack/charm_tests/neutron/setup.py
index be9ae72..edacd22 100644
--- a/zaza/charm_tests/neutron/setup.py
+++ b/zaza/openstack/charm_tests/neutron/setup.py
@@ -16,10 +16,10 @@
 
 """Setup for Neutron deployments."""
 
-from zaza.configure import (
+from zaza.openstack.configure import (
     network,
 )
-from zaza.utilities import (
+from zaza.openstack.utilities import (
     cli as cli_utils,
     generic as generic_utils,
     juju as juju_utils,
@@ -45,8 +45,8 @@ OVERCLOUD_NETWORK_CONFIG = {
 # The undercloud network configuration settings are substrate specific to
 # the environment where the tests are being executed. These settings may be
 # overridden by environment variables. See the doc string documentation for
-# zaza.utilities.generic_utils.get_undercloud_env_vars for the environment
-# variables required to be exported and available to zaza.
+# zaza.openstack.utilities.generic_utils.get_undercloud_env_vars for the
+# environment variables required to be exported and available to zaza.
 # These are default settings provided as an example.
 DEFAULT_UNDERCLOUD_NETWORK_CONFIG = {
     "start_floating_ip": "10.5.150.0",
diff --git a/zaza/charm_tests/neutron_openvswitch/__init__.py b/zaza/openstack/charm_tests/neutron_openvswitch/__init__.py
similarity index 100%
rename from zaza/charm_tests/neutron_openvswitch/__init__.py
rename to zaza/openstack/charm_tests/neutron_openvswitch/__init__.py
diff --git a/zaza/charm_tests/neutron_openvswitch/setup.py b/zaza/openstack/charm_tests/neutron_openvswitch/setup.py
similarity index 98%
rename from zaza/charm_tests/neutron_openvswitch/setup.py
rename to zaza/openstack/charm_tests/neutron_openvswitch/setup.py
index 0bdedda..b09f112 100644
--- a/zaza/charm_tests/neutron_openvswitch/setup.py
+++ b/zaza/openstack/charm_tests/neutron_openvswitch/setup.py
@@ -19,7 +19,7 @@ import pprint
 
 import zaza
 
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 
 
 def overlay_network():
diff --git a/zaza/charm_tests/neutron_openvswitch/tests.py b/zaza/openstack/charm_tests/neutron_openvswitch/tests.py
similarity index 98%
rename from zaza/charm_tests/neutron_openvswitch/tests.py
rename to zaza/openstack/charm_tests/neutron_openvswitch/tests.py
index f56ea8a..3841eca 100644
--- a/zaza/charm_tests/neutron_openvswitch/tests.py
+++ b/zaza/openstack/charm_tests/neutron_openvswitch/tests.py
@@ -21,7 +21,7 @@ import logging
 import unittest
 
 import zaza
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 
 
 class NeutronOpenvSwitchOverlayTest(unittest.TestCase):
diff --git a/zaza/charm_tests/noop/__init__.py b/zaza/openstack/charm_tests/noop/__init__.py
similarity index 100%
rename from zaza/charm_tests/noop/__init__.py
rename to zaza/openstack/charm_tests/noop/__init__.py
diff --git a/zaza/charm_tests/noop/setup.py b/zaza/openstack/charm_tests/noop/setup.py
similarity index 100%
rename from zaza/charm_tests/noop/setup.py
rename to zaza/openstack/charm_tests/noop/setup.py
diff --git a/zaza/charm_tests/noop/tests.py b/zaza/openstack/charm_tests/noop/tests.py
similarity index 100%
rename from zaza/charm_tests/noop/tests.py
rename to zaza/openstack/charm_tests/noop/tests.py
diff --git a/zaza/charm_tests/nova/__init__.py b/zaza/openstack/charm_tests/nova/__init__.py
similarity index 100%
rename from zaza/charm_tests/nova/__init__.py
rename to zaza/openstack/charm_tests/nova/__init__.py
diff --git a/zaza/charm_tests/nova/setup.py b/zaza/openstack/charm_tests/nova/setup.py
similarity index 93%
rename from zaza/charm_tests/nova/setup.py
rename to zaza/openstack/charm_tests/nova/setup.py
index 7981739..c556c97 100644
--- a/zaza/charm_tests/nova/setup.py
+++ b/zaza/openstack/charm_tests/nova/setup.py
@@ -14,11 +14,11 @@
 
 """Code for configureing nova."""
 
-import zaza.utilities.openstack as openstack_utils
-from zaza.utilities import (
+import zaza.openstack.utilities.openstack as openstack_utils
+from zaza.openstack.utilities import (
     cli as cli_utils,
 )
-import zaza.charm_tests.nova.utils as nova_utils
+import zaza.openstack.charm_tests.nova.utils as nova_utils
 
 
 def create_flavors(nova_client=None):
diff --git a/zaza/charm_tests/nova/tests.py b/zaza/openstack/charm_tests/nova/tests.py
similarity index 70%
rename from zaza/charm_tests/nova/tests.py
rename to zaza/openstack/charm_tests/nova/tests.py
index f36fed5..ec580c7 100644
--- a/zaza/charm_tests/nova/tests.py
+++ b/zaza/openstack/charm_tests/nova/tests.py
@@ -19,18 +19,19 @@
 import logging
 import unittest
 
-import zaza.charm_tests.glance.setup as glance_setup
-import zaza.configure.guest
+import zaza.openstack.charm_tests.glance.setup as glance_setup
+import zaza.openstack.configure.guest
 
 
 class BaseGuestCreateTest(unittest.TestCase):
-    """Deprecated: Use zaza.configure.guest.launch_instance."""
+    """Deprecated: Use zaza.openstack.configure.guest.launch_instance."""
 
     def launch_instance(self, instance_key):
-        """Deprecated: Use zaza.configure.guest.launch_instance."""
+        """Deprecated: Use zaza.openstack.configure.guest.launch_instance."""
         logging.info('BaseGuestCreateTest.launch_instance is deprecated '
-                     'please use zaza.configure.guest.launch_instance')
-        zaza.configure.guest.launch_instance(instance_key)
+                     'please use '
+                     'zaza.openstack.configure.guest.launch_instance')
+        zaza.openstack.configure.guest.launch_instance(instance_key)
 
 
 class CirrosGuestCreateTest(BaseGuestCreateTest):
@@ -38,7 +39,7 @@ class CirrosGuestCreateTest(BaseGuestCreateTest):
 
     def test_launch_small_instance(self):
         """Launch a cirros instance and test connectivity."""
-        zaza.configure.guest.launch_instance(
+        zaza.openstack.configure.guest.launch_instance(
             glance_setup.CIRROS_IMAGE_NAME)
 
 
@@ -47,5 +48,5 @@ class LTSGuestCreateTest(BaseGuestCreateTest):
 
     def test_launch_small_instance(self):
         """Launch a Bionic instance and test connectivity."""
-        zaza.configure.guest.launch_instance(
+        zaza.openstack.configure.guest.launch_instance(
             glance_setup.LTS_IMAGE_NAME)
diff --git a/zaza/charm_tests/nova/utils.py b/zaza/openstack/charm_tests/nova/utils.py
similarity index 100%
rename from zaza/charm_tests/nova/utils.py
rename to zaza/openstack/charm_tests/nova/utils.py
diff --git a/zaza/charm_tests/octavia/__init__.py b/zaza/openstack/charm_tests/octavia/__init__.py
similarity index 100%
rename from zaza/charm_tests/octavia/__init__.py
rename to zaza/openstack/charm_tests/octavia/__init__.py
diff --git a/zaza/charm_tests/octavia/setup.py b/zaza/openstack/charm_tests/octavia/setup.py
similarity index 88%
rename from zaza/charm_tests/octavia/setup.py
rename to zaza/openstack/charm_tests/octavia/setup.py
index 561531f..9fc487a 100644
--- a/zaza/charm_tests/octavia/setup.py
+++ b/zaza/openstack/charm_tests/octavia/setup.py
@@ -18,10 +18,10 @@ import os
 import base64
 import logging
 
-import zaza.utilities.cert
+import zaza.openstack.utilities.cert as cert
 import zaza.charm_lifecycle.utils
-import zaza.charm_tests.test_utils
-import zaza.charm_tests.glance.setup as glance_setup
+import zaza.openstack.charm_tests.test_utils
+import zaza.openstack.charm_tests.glance.setup as glance_setup
 
 
 def add_amphora_image(image_url=None):
@@ -51,14 +51,14 @@ def configure_octavia():
         'configure-resources',
         action_params={})
     # Generate certificates for controller/load balancer instance communication
-    (issuing_cakey, issuing_cacert) = zaza.utilities.cert.generate_cert(
+    (issuing_cakey, issuing_cacert) = cert.generate_cert(
         'OSCI Zaza Issuer',
         password='zaza',
         generate_ca=True)
-    (controller_cakey, controller_cacert) = zaza.utilities.cert.generate_cert(
+    (controller_cakey, controller_cacert) = cert.generate_cert(
         'OSCI Zaza Octavia Controller',
         generate_ca=True)
-    (controller_key, controller_cert) = zaza.utilities.cert.generate_cert(
+    (controller_key, controller_cert) = cert.generate_cert(
         '*.serverstack',
         issuer_name='OSCI Zaza Octavia Controller',
         signing_key=controller_cakey)
@@ -83,7 +83,7 @@ def configure_octavia():
     test_config = zaza.charm_lifecycle.utils.get_charm_config()
     del test_config['target_deploy_status']['octavia']
 
-    _singleton = zaza.charm_tests.test_utils.OpenStackBaseTest()
+    _singleton = zaza.openstack.charm_tests.test_utils.OpenStackBaseTest()
     _singleton.setUpClass()
     with _singleton.config_change(cert_config, cert_config):
         # wait for configuration to be applied then return
diff --git a/zaza/charm_tests/octavia/tests.py b/zaza/openstack/charm_tests/octavia/tests.py
similarity index 95%
rename from zaza/charm_tests/octavia/tests.py
rename to zaza/openstack/charm_tests/octavia/tests.py
index 6261394..d2f8cdb 100644
--- a/zaza/charm_tests/octavia/tests.py
+++ b/zaza/openstack/charm_tests/octavia/tests.py
@@ -17,8 +17,8 @@
 import logging
 import tenacity
 
-import zaza.charm_tests.test_utils as test_utils
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.charm_tests.test_utils as test_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 
 
 class CharmOperationTest(test_utils.OpenStackBaseTest):
diff --git a/zaza/charm_tests/pacemaker_remote/__init__.py b/zaza/openstack/charm_tests/pacemaker_remote/__init__.py
similarity index 100%
rename from zaza/charm_tests/pacemaker_remote/__init__.py
rename to zaza/openstack/charm_tests/pacemaker_remote/__init__.py
diff --git a/zaza/charm_tests/pacemaker_remote/tests.py b/zaza/openstack/charm_tests/pacemaker_remote/tests.py
similarity index 85%
rename from zaza/charm_tests/pacemaker_remote/tests.py
rename to zaza/openstack/charm_tests/pacemaker_remote/tests.py
index 29219fb..f0d0b4d 100644
--- a/zaza/charm_tests/pacemaker_remote/tests.py
+++ b/zaza/openstack/charm_tests/pacemaker_remote/tests.py
@@ -18,7 +18,7 @@
 
 import unittest
 
-import zaza.configure.hacluster
+import zaza.openstack.configure.hacluster
 
 
 class PacemakerRemoteTest(unittest.TestCase):
@@ -26,4 +26,5 @@ class PacemakerRemoteTest(unittest.TestCase):
 
     def test_check_nodes_online(self):
         """Test that all nodes are online."""
-        self.assertTrue(zaza.configure.hacluster.check_all_nodes_online('api'))
+        self.assertTrue(
+            zaza.openstack.configure.hacluster.check_all_nodes_online('api'))
diff --git a/zaza/charm_tests/security/__init__.py b/zaza/openstack/charm_tests/security/__init__.py
similarity index 100%
rename from zaza/charm_tests/security/__init__.py
rename to zaza/openstack/charm_tests/security/__init__.py
diff --git a/zaza/charm_tests/security/tests.py b/zaza/openstack/charm_tests/security/tests.py
similarity index 97%
rename from zaza/charm_tests/security/tests.py
rename to zaza/openstack/charm_tests/security/tests.py
index bc203f6..741b53b 100644
--- a/zaza/charm_tests/security/tests.py
+++ b/zaza/openstack/charm_tests/security/tests.py
@@ -20,7 +20,7 @@ import unittest
 
 import zaza.model as model
 import zaza.charm_lifecycle.utils as utils
-from zaza.utilities.file_assertions import (
+from zaza.openstack.utilities.file_assertions import (
     assert_path_glob,
     assert_single_file,
 )
diff --git a/zaza/charm_tests/series_upgrade/__init__.py b/zaza/openstack/charm_tests/series_upgrade/__init__.py
similarity index 100%
rename from zaza/charm_tests/series_upgrade/__init__.py
rename to zaza/openstack/charm_tests/series_upgrade/__init__.py
diff --git a/zaza/charm_tests/series_upgrade/tests.py b/zaza/openstack/charm_tests/series_upgrade/tests.py
similarity index 98%
rename from zaza/charm_tests/series_upgrade/tests.py
rename to zaza/openstack/charm_tests/series_upgrade/tests.py
index 5f81139..5c088e9 100644
--- a/zaza/charm_tests/series_upgrade/tests.py
+++ b/zaza/openstack/charm_tests/series_upgrade/tests.py
@@ -21,11 +21,11 @@ import os
 import unittest
 
 from zaza import model
-from zaza.utilities import (
+from zaza.openstack.utilities import (
     cli as cli_utils,
     generic as generic_utils,
 )
-from zaza.charm_tests.nova.tests import LTSGuestCreateTest
+from zaza.openstack.charm_tests.nova.tests import LTSGuestCreateTest
 
 
 class SeriesUpgradeTest(unittest.TestCase):
diff --git a/zaza/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py
similarity index 99%
rename from zaza/charm_tests/test_utils.py
rename to zaza/openstack/charm_tests/test_utils.py
index e92e62e..e67699f 100644
--- a/zaza/charm_tests/test_utils.py
+++ b/zaza/openstack/charm_tests/test_utils.py
@@ -19,7 +19,7 @@ import zaza.model
 
 import zaza.model as model
 import zaza.charm_lifecycle.utils as lifecycle_utils
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 
 
 def skipIfNotHA(service_name):
diff --git a/zaza/charm_tests/vault/__init__.py b/zaza/openstack/charm_tests/vault/__init__.py
similarity index 100%
rename from zaza/charm_tests/vault/__init__.py
rename to zaza/openstack/charm_tests/vault/__init__.py
diff --git a/zaza/charm_tests/vault/setup.py b/zaza/openstack/charm_tests/vault/setup.py
similarity index 91%
rename from zaza/charm_tests/vault/setup.py
rename to zaza/openstack/charm_tests/vault/setup.py
index 5f239ee..c40e6cb 100644
--- a/zaza/charm_tests/vault/setup.py
+++ b/zaza/openstack/charm_tests/vault/setup.py
@@ -18,10 +18,10 @@ import requests
 import tempfile
 
 import zaza.charm_lifecycle.utils as lifecycle_utils
-import zaza.charm_tests.vault.utils as vault_utils
+import zaza.openstack.charm_tests.vault.utils as vault_utils
 import zaza.model
-import zaza.utilities.cert
-import zaza.utilities.openstack
+import zaza.openstack.utilities.cert
+import zaza.openstack.utilities.openstack
 
 
 def basic_setup(cacert=None, unseal_and_authorize=False):
@@ -70,10 +70,10 @@ def auto_inititialize(cacert=None):
 
     action = vault_utils.run_get_csr()
     intermediate_csr = action.data['results']['output']
-    (cakey, cacertificate) = zaza.utilities.cert.generate_cert(
+    (cakey, cacertificate) = zaza.openstack.utilities.cert.generate_cert(
         'DivineAuthority',
         generate_ca=True)
-    intermediate_cert = zaza.utilities.cert.sign_csr(
+    intermediate_cert = zaza.openstack.utilities.cert.sign_csr(
         intermediate_csr,
         cakey.decode(),
         cacertificate.decode(),
@@ -100,7 +100,7 @@ def validate_ca(cacertificate, application="keystone", port=5000):
     """
     zaza.model.block_until_file_has_contents(
         application,
-        zaza.utilities.openstack.KEYSTONE_REMOTE_CACERT,
+        zaza.openstack.utilities.openstack.KEYSTONE_REMOTE_CACERT,
         cacertificate.decode().strip())
     test_config = lifecycle_utils.get_charm_config()
     zaza.model.wait_for_application_states(
diff --git a/zaza/charm_tests/vault/tests.py b/zaza/openstack/charm_tests/vault/tests.py
similarity index 94%
rename from zaza/charm_tests/vault/tests.py
rename to zaza/openstack/charm_tests/vault/tests.py
index fb2b208..85c729a 100644
--- a/zaza/charm_tests/vault/tests.py
+++ b/zaza/openstack/charm_tests/vault/tests.py
@@ -24,10 +24,10 @@ import tempfile
 
 import requests
 import zaza.charm_lifecycle.utils as lifecycle_utils
-import zaza.charm_tests.test_utils as test_utils
-import zaza.charm_tests.vault.utils as vault_utils
-import zaza.utilities.cert
-import zaza.utilities.openstack
+import zaza.openstack.charm_tests.test_utils as test_utils
+import zaza.openstack.charm_tests.vault.utils as vault_utils
+import zaza.openstack.utilities.cert
+import zaza.openstack.utilities.openstack
 import zaza.model
 
 
@@ -96,10 +96,10 @@ class VaultTest(BaseVaultTest):
         action = vault_utils.run_get_csr()
 
         intermediate_csr = action.data['results']['output']
-        (cakey, cacert) = zaza.utilities.cert.generate_cert(
+        (cakey, cacert) = zaza.openstack.utilities.cert.generate_cert(
             'DivineAuthority',
             generate_ca=True)
-        intermediate_cert = zaza.utilities.cert.sign_csr(
+        intermediate_cert = zaza.openstack.utilities.cert.sign_csr(
             intermediate_csr,
             cakey.decode(),
             cacert.decode(),
@@ -113,7 +113,7 @@ class VaultTest(BaseVaultTest):
         del test_config['target_deploy_status']['vault']
         zaza.model.block_until_file_has_contents(
             'keystone',
-            zaza.utilities.openstack.KEYSTONE_REMOTE_CACERT,
+            zaza.openstack.utilities.openstack.KEYSTONE_REMOTE_CACERT,
             cacert.decode().strip())
         zaza.model.wait_for_application_states(
             states=test_config.get('target_deploy_status', {}))
diff --git a/zaza/charm_tests/vault/utils.py b/zaza/openstack/charm_tests/vault/utils.py
similarity index 100%
rename from zaza/charm_tests/vault/utils.py
rename to zaza/openstack/charm_tests/vault/utils.py
diff --git a/zaza/configure/__init__.py b/zaza/openstack/configure/__init__.py
similarity index 100%
rename from zaza/configure/__init__.py
rename to zaza/openstack/configure/__init__.py
diff --git a/zaza/configure/bgp_speaker.py b/zaza/openstack/configure/bgp_speaker.py
similarity index 99%
rename from zaza/configure/bgp_speaker.py
rename to zaza/openstack/configure/bgp_speaker.py
index f5a54da..2f5dbb9 100755
--- a/zaza/configure/bgp_speaker.py
+++ b/zaza/openstack/configure/bgp_speaker.py
@@ -20,7 +20,7 @@ import argparse
 import logging
 import sys
 import neutronclient
-from zaza.utilities import (
+from zaza.openstack.utilities import (
     cli as cli_utils,
     openstack as openstack_utils,
     juju as juju_utils,
diff --git a/zaza/configure/guest.py b/zaza/openstack/configure/guest.py
similarity index 97%
rename from zaza/configure/guest.py
rename to zaza/openstack/configure/guest.py
index ad0cd18..ddd271a 100644
--- a/zaza/configure/guest.py
+++ b/zaza/openstack/configure/guest.py
@@ -19,8 +19,8 @@
 import logging
 import time
 
-import zaza.utilities.openstack as openstack_utils
-import zaza.charm_tests.nova.utils as nova_utils
+import zaza.openstack.utilities.openstack as openstack_utils
+import zaza.openstack.charm_tests.nova.utils as nova_utils
 
 boot_tests = {
     'cirros': {
diff --git a/zaza/configure/hacluster.py b/zaza/openstack/configure/hacluster.py
similarity index 100%
rename from zaza/configure/hacluster.py
rename to zaza/openstack/configure/hacluster.py
diff --git a/zaza/configure/masakari.py b/zaza/openstack/configure/masakari.py
similarity index 99%
rename from zaza/configure/masakari.py
rename to zaza/openstack/configure/masakari.py
index fe7de24..9d48e03 100644
--- a/zaza/configure/masakari.py
+++ b/zaza/openstack/configure/masakari.py
@@ -21,7 +21,7 @@ and recovery.
 import logging
 
 import zaza.model
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 
 ROUND_ROBIN = 'round-robin'
 
diff --git a/zaza/configure/network.py b/zaza/openstack/configure/network.py
similarity index 96%
rename from zaza/configure/network.py
rename to zaza/openstack/configure/network.py
index 93c6f27..68965d9 100755
--- a/zaza/configure/network.py
+++ b/zaza/openstack/configure/network.py
@@ -41,9 +41,9 @@ The undercloud network configuration settings are substrate specific to the
 environment where the tests are being executed. They primarily focus on the
 provider network settings. These settings may be overridden by environment
 variables. See the doc string documentation for
-zaza.utilities.generic_utils.get_undercloud_env_vars for the environment
-variables required to be exported and available to zaza. Here is an example of
-undercloud settings:
+zaza.openstack.utilities.generic_utils.get_undercloud_env_vars for the
+environment variables required to be exported and available to zaza. Here is
+an example of undercloud settings:
 EXAMPLE_DEFAULT_UNDERCLOUD_NETWORK_CONFIG = {
     "start_floating_ip": "10.5.150.0",
     "end_floating_ip": "10.5.150.254",
@@ -67,10 +67,10 @@ As a python module:
     network_config.update(EXAMPLE_DEFAULT_UNDERCLOUD_NETWORK_CONFIG)
     # Environment specific settings
     network_config.update(
-        zaza.utilities.generic_utils.get_undercloud_env_vars())
+        zaza.openstack.utilities.generic_utils.get_undercloud_env_vars())
 
     # Configure the SDN network
-    zaza.configure.network.setup_sdn(network_config)
+    zaza.openstack.configure.network.setup_sdn(network_config)
 
 
 As a script from CLI with a YAML file of configuration:
@@ -82,7 +82,7 @@ import argparse
 import logging
 import sys
 
-from zaza.utilities import (
+from zaza.openstack.utilities import (
     cli as cli_utils,
     generic as generic_utils,
     juju as juju_utils,
diff --git a/zaza/utilities/__init__.py b/zaza/openstack/utilities/__init__.py
similarity index 100%
rename from zaza/utilities/__init__.py
rename to zaza/openstack/utilities/__init__.py
diff --git a/zaza/utilities/bundle.py b/zaza/openstack/utilities/bundle.py
similarity index 100%
rename from zaza/utilities/bundle.py
rename to zaza/openstack/utilities/bundle.py
diff --git a/zaza/utilities/ceph.py b/zaza/openstack/utilities/ceph.py
similarity index 98%
rename from zaza/utilities/ceph.py
rename to zaza/openstack/utilities/ceph.py
index 36ede46..2c54512 100644
--- a/zaza/utilities/ceph.py
+++ b/zaza/openstack/utilities/ceph.py
@@ -2,7 +2,7 @@
 
 import logging
 
-import zaza.utilities.openstack as openstack_utils
+import zaza.openstack.utilities.openstack as openstack_utils
 import zaza.model as zaza_model
 
 
diff --git a/zaza/utilities/cert.py b/zaza/openstack/utilities/cert.py
similarity index 100%
rename from zaza/utilities/cert.py
rename to zaza/openstack/utilities/cert.py
diff --git a/zaza/utilities/cli.py b/zaza/openstack/utilities/cli.py
similarity index 100%
rename from zaza/utilities/cli.py
rename to zaza/openstack/utilities/cli.py
diff --git a/zaza/utilities/exceptions.py b/zaza/openstack/utilities/exceptions.py
similarity index 100%
rename from zaza/utilities/exceptions.py
rename to zaza/openstack/utilities/exceptions.py
diff --git a/zaza/utilities/file_assertions.py b/zaza/openstack/utilities/file_assertions.py
similarity index 100%
rename from zaza/utilities/file_assertions.py
rename to zaza/openstack/utilities/file_assertions.py
diff --git a/zaza/utilities/generic.py b/zaza/openstack/utilities/generic.py
similarity index 98%
rename from zaza/utilities/generic.py
rename to zaza/openstack/utilities/generic.py
index e9e9e4c..50566f7 100644
--- a/zaza/utilities/generic.py
+++ b/zaza/openstack/utilities/generic.py
@@ -20,9 +20,9 @@ import subprocess
 import yaml
 
 from zaza import model
-from zaza.utilities import juju as juju_utils
-from zaza.utilities import exceptions as zaza_exceptions
-from zaza.utilities.os_versions import UBUNTU_OPENSTACK_RELEASE
+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
 
 
 def dict_to_yaml(dict_data):
@@ -102,8 +102,8 @@ def get_undercloud_env_vars():
     Note: *Overcloud* settings should be declared by the test caller and should
     not be overridden here.
 
-    Return a dictionary compatible with zaza.configure.network functions'
-    expected key structure.
+    Return a dictionary compatible with zaza.openstack.configure.network
+    functions' expected key structure.
 
     Example exported environment variables:
     export default_gateway="172.17.107.1"
@@ -135,8 +135,8 @@ def get_undercloud_env_vars():
         _vars['start_floating_ip'] = os.environ.get('FIP_RANGE').split(':')[0]
         _vars['end_floating_ip'] = os.environ.get('FIP_RANGE').split(':')[1]
 
-    # Env var naming consistent with zaza.configure.network functions takes
-    # priority. Override backward compatible settings.
+    # Env var naming consistent with zaza.openstack.configure.network
+    # functions takes priority. Override backward compatible settings.
     _keys = ['default_gateway',
              'start_floating_ip',
              'end_floating_ip',
diff --git a/zaza/utilities/juju.py b/zaza/openstack/utilities/juju.py
similarity index 99%
rename from zaza/utilities/juju.py
rename to zaza/openstack/utilities/juju.py
index b4d758a..0c46b7e 100644
--- a/zaza/utilities/juju.py
+++ b/zaza/openstack/utilities/juju.py
@@ -22,7 +22,7 @@ from zaza import (
     model,
     controller,
 )
-from zaza.utilities import generic as generic_utils
+from zaza.openstack.utilities import generic as generic_utils
 
 
 def get_application_status(application=None, unit=None):
diff --git a/zaza/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
similarity index 99%
rename from zaza/utilities/openstack.py
rename to zaza/openstack/utilities/openstack.py
index 6dc48e1..a8a184e 100644
--- a/zaza/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -35,7 +35,7 @@ from keystoneauth1.identity import (
     v3,
     v2,
 )
-import zaza.utilities.cert as cert
+import zaza.openstack.utilities.cert as cert
 from novaclient import client as novaclient_client
 from neutronclient.v2_0 import client as neutronclient
 from neutronclient.common import exceptions as neutronexceptions
@@ -57,7 +57,7 @@ import tenacity
 import urllib
 
 from zaza import model
-from zaza.utilities import (
+from zaza.openstack.utilities import (
     exceptions,
     generic as generic_utils,
     juju as juju_utils,
diff --git a/zaza/utilities/os_versions.py b/zaza/openstack/utilities/os_versions.py
similarity index 100%
rename from zaza/utilities/os_versions.py
rename to zaza/openstack/utilities/os_versions.py