Merge ~smigiel-dariusz/cloud-upgrade-planner:unittest_cleanup into cloud-upgrade-planner:master

[Dariusz Smigiel]

Unit tests clean up

Separated tests into corresponding files with a clear distinction wrt module functions.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision b20a7cb2f155a4759068e0cc6f65c9df94df0058

diff --git a/cloud_upgrade_planner/cloud.py b/cloud_upgrade_planner/cloud.py
index 3f11723..e29bc4d 100644
--- a/cloud_upgrade_planner/cloud.py
+++ b/cloud_upgrade_planner/cloud.py
@@ -43,6 +43,7 @@ from fabric2 import Config, Connection
 from paramiko.ssh_exception import SSHException
 
 from cloud_upgrade_planner.logging import Logger
+from cloud_upgrade_planner.common import parse_yaml
 
 
 class Cloud:
@@ -128,15 +129,6 @@ class Cloud:
                     return None
                 return result.stdout
 
-    def run_unit_command(self, target, command):
-        """Run a command on a Juju unit and return the output."""
-
-    @staticmethod
-    def parse_yaml(yaml_string):
-        """Parse YAML using PyYAML."""
-        data = yaml.safe_load_all(yaml_string)
-        return list(data)
-
     def get_openstack_servers(self, controller, model, parsed_data=None):
         """Get a list of openstack servers."""
         if self.cloud_type != "openstack":
@@ -172,7 +164,7 @@ class Cloud:
                     for host in range(num_nova_compute_units // 3)
                     for _ in range(24)
                 ])
-            servers = self.parse_yaml(server_data)
+            servers = parse_yaml(server_data)
 
         self.logger.info("[%s] Processing openstack server data",  self.name)
 
@@ -187,7 +179,7 @@ class Cloud:
         """Get a list of Juju controllers."""
         controller_output = self.run_command("juju controllers --format yaml")
         if controller_output:
-            controllers = self.parse_yaml(controller_output)
+            controllers = parse_yaml(controller_output)
 
             if len(controllers) > 0:
                 self.logger.debug("Juju controller list: {}".format(controllers[0]))
@@ -221,7 +213,7 @@ class Cloud:
                     "juju models -c {} --format yaml".format(controller)
                 )
                 self.logger.debug("Getting models from: {}".format(models_data))
-                models = self.parse_yaml(models_data)
+                models = parse_yaml(models_data)
                 if len(models) > 0:
                     if "models" in models[0]:
                         for model in models[0]["models"]:
@@ -259,7 +251,7 @@ class Cloud:
             status_data = self.run_command(
                 "juju status -m {}:{} --format yaml".format(controller, model)
             )
-            status = self.parse_yaml(status_data)
+            status = parse_yaml(status_data)
 
         self.logger.info(
             "[{}] Processing Juju status for model {} on controller {}".format(
@@ -339,7 +331,7 @@ class Cloud:
             bundle_data = self.run_command(
                 "juju export-bundle -m {}:{}".format(controller, model)
             )
-            bundles = self.parse_yaml(bundle_data)
+            bundles = parse_yaml(bundle_data)
 
         self.logger.info(
             "[{}] Processing Juju bundle export for model {} on controller {}".format(
@@ -438,4 +430,4 @@ class Cloud:
         # process bundle
         self.get_juju_bundle(self.controller, self.model, parsed_data=juju_bundle)
         # process openstack_servers
-        self.get_openstack_servers(self.controller, self.model, parsed_data=openstack_servers)
\ No newline at end of file
+        self.get_openstack_servers(self.controller, self.model, parsed_data=openstack_servers)
diff --git a/cloud_upgrade_planner/common.py b/cloud_upgrade_planner/common.py
index a31016e..e076f09 100644
--- a/cloud_upgrade_planner/common.py
+++ b/cloud_upgrade_planner/common.py
@@ -3,6 +3,12 @@ import sys
 import yaml
 
 
+def parse_yaml(yaml_string):
+    """Parse YAML using PyYAML."""
+    data = yaml.safe_load_all(yaml_string)
+    return list(data)
+
+
 def find_units_for_app(app, model_apps):
     return list(model_apps[app]['units'].keys())
 
diff --git a/cloud_upgrade_planner/openstack_managed_upgrade.py b/cloud_upgrade_planner/openstack.py
similarity index 100%
rename from cloud_upgrade_planner/openstack_managed_upgrade.py
rename to cloud_upgrade_planner/openstack.py
diff --git a/cloud_upgrade_planner/ubuntu_series_upgrade_for_openstack.py b/cloud_upgrade_planner/ubuntu.py
similarity index 100%
rename from cloud_upgrade_planner/ubuntu_series_upgrade_for_openstack.py
rename to cloud_upgrade_planner/ubuntu.py
diff --git a/setup.py b/setup.py
index a9ecfa7..83f1692 100644
--- a/setup.py
+++ b/setup.py
@@ -48,8 +48,8 @@ setuptools.setup(
         "console_scripts": [
             "cloud-upgrade-planner=cloud_upgrade_planner.cli:main",
             "update-charm-revisions=cloud_upgrade_planner.cli:refresh",
-            "ubuntu-series-upgrade-for-openstack=cloud_upgrade_planner.ubuntu_series_upgrade_for_openstack:main",
-            "openstack-managed-upgrade=cloud_upgrade_planner.openstack_managed_upgrade:main",
+            "ubuntu-series-upgrade-for-openstack=cloud_upgrade_planner.ubuntu:main",
+            "openstack-managed-upgrade=cloud_upgrade_planner.openstack:main",
         ]
     },
     setup_requires=["setuptools_scm"],
diff --git a/tests/conftest.py b/tests/conftest.py
index ec178d4..ccedfc5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -12,6 +12,7 @@ import mock
 import os
 import pytest
 import sys
+import yaml
 
 # bring in top level library to path
 test_path = os.path.dirname(os.path.abspath(__file__))
@@ -23,6 +24,207 @@ from cloud_upgrade_planner.cloud import Cloud
 from cloud_upgrade_planner.charms import Charms
 
 
+JUJU_FILE_MOCK = """
+applications:
+  aodh-mysql-router:
+    can-upgrade-to: cs:mysql-router-11
+    charm: cs:mysql-router-6
+  easyrsa:
+    can-upgrade-to: cs:~containers/easyrsa-408
+    charm: cs:~containers/easyrsa-345
+    units:
+      easyrsa/0:
+        leader: true
+        machine: 7/lxd/3
+  hacluster-neutron:
+    can-upgrade-to: cs:hacluster-78
+    charm: cs:hacluster-74
+  hacluster-nova:
+    can-upgrade-to: cs:hacluster-78
+    charm: cs:hacluster-74
+  hacluster-vault:
+    can-upgrade-to: cs:hacluster-78
+    charm: cs:hacluster-74
+  landscape-client:
+    charm: cs:landscape-client-35
+  juju-lint:
+    charm: local:focal/juju-lint-1
+    units:
+      juju-lint/0:
+        leader: true
+        machine: 8/lxd/15
+  memcached:
+    charm: cs:memcached-34
+    units:
+      memcached/1:
+        leader: true
+        machine: 5/lxd/4
+  mysql-innodb-cluster:
+    can-upgrade-to: cs:mysql-innodb-cluster-11
+    charm: cs:mysql-innodb-cluster-5
+    units:
+      mysql-innodb-cluster/0:
+        machine: 3/lxd/8
+        subordinates:
+          landscape-client/65: true
+      mysql-innodb-cluster/1:
+        leader: true
+        machine: 4/lxd/8
+        subordinates:
+          landscape-client/66: true
+      mysql-innodb-cluster/2:
+        machine: 5/lxd/8
+        subordinates:
+          landscape-client/67: true
+  neutron-api:
+    can-upgrade-to: cs:neutron-api-299
+    charm: cs:neutron-api-292
+    units:
+      neutron-api/0:
+        machine: 6/lxd/5
+        subordinates:
+          hacluster-neutron/0: true
+          landscape-client/69: true
+          neutron-api-mysql-router/0: true
+      neutron-api/1:
+        machine: 7/lxd/6
+        subordinates:
+          hacluster-neutron/1: true
+          landscape-client/68: true
+          neutron-api-mysql-router/1: true
+      neutron-api/2:
+        leader: true
+        machine: 8/lxd/5
+        subordinates:
+          hacluster-neutron/2: true
+          landscape-client/70: true
+          neutron-api-mysql-router/2: true
+  nova-cloud-controller:
+    can-upgrade-to: cs:nova-cloud-controller-358
+    charm: cs:nova-cloud-controller-353
+    units:
+      nova-cloud-controller/0:
+        machine: 6/lxd/6
+        subordinates:
+          hacluster-nova/0: true
+          landscape-client/72: true
+          nova-cloud-controller-mysql-router/0: true
+      nova-cloud-controller/1:
+        machine: 7/lxd/7
+        subordinates:
+          hacluster-nova/2: true
+          landscape-client/73: true
+          nova-cloud-controller-mysql-router/2: true
+      nova-cloud-controller/2:
+        leader: true
+        machine: 8/lxd/6
+        subordinates:
+          hacluster-nova/1: true
+          landscape-client/71: true
+          nova-cloud-controller-mysql-router/1: true
+  nova-cloud-controller-mysql-router:
+    can-upgrade-to: cs:mysql-router-11
+    charm: cs:mysql-router-6
+  nova-compute-kvm:
+    can-upgrade-to: cs:nova-compute-334
+    charm: cs:nova-compute-325
+    units:
+      nova-compute-kvm/1:
+        machine: '10'
+        subordinates:
+          landscape-client/19: true
+      nova-compute-kvm/10:
+        machine: '19'
+        subordinates:
+          landscape-client/10: true
+      nova-compute-kvm/11:
+        machine: '20'
+        subordinates:
+          landscape-client/20: true
+      nova-compute-kvm/12:
+        machine: '21'
+        subordinates:
+          landscape-client/11: true
+      nova-compute-kvm/13:
+        machine: '22'
+        subordinates:
+          landscape-client/4: true
+      nova-compute-kvm/7:
+        leader: true
+        machine: '16'
+        subordinates:
+          landscape-client/7: true
+      nova-compute-kvm/9:
+        machine: '18'
+        subordinates:
+          landscape-client/16: true
+  rabbitmq-server:
+    can-upgrade-to: cs:~llama-charmers-next/rabbitmq-server-6
+    charm: cs:~llama-charmers-next/rabbitmq-server-5
+    units:
+      rabbitmq-server/4:
+        machine: 6/lxd/12
+      rabbitmq-server/5:
+        leader: true
+        machine: 7/lxd/12
+      rabbitmq-server/6:
+        machine: 8/lxd/11
+  vault:
+    can-upgrade-to: cs:vault-50
+    charm: cs:vault-44
+    units:
+      vault/0:
+        machine: '0'
+        subordinates:
+          hacluster-vault/1: true
+          landscape-client/24: true
+      vault/1:
+        leader: true
+        machine: '1'
+        subordinates:
+          hacluster-vault/2: true
+          landscape-client/23: true
+      vault/2:
+        machine: '2'
+        subordinates:
+          hacluster-vault/0: true
+          landscape-client/22: true
+"""
+
+SVC2CHARM = {
+    "aodh-mysql-router": "mysql-router",
+    "easyrsa": "easyrsa",
+    "hacluster-neutron": "hacluster",
+    "hacluster-nova": "hacluster",
+    "hacluster-vault": "hacluster",
+    "juju-lint": "juju-lint",
+    "landscape-client": "landscape-client",
+    "memcached": "memcached",
+    "mysql-innodb-cluster": "mysql-innodb-cluster",
+    "neutron-api": "neutron-api",
+    "nova-cloud-controller": "nova-cloud-controller",
+    "nova-cloud-controller-mysql-router": "mysql-router",
+    "nova-compute-kvm": "nova-compute",
+    "rabbitmq-server": "rabbitmq-server",
+    "vault": "vault",
+}
+
+
[e-mail]
+def juju_file_mock():
+    return JUJU_FILE_MOCK
+
+
[e-mail]
+def juju_file_dict():
+    return yaml.safe_load(JUJU_FILE_MOCK)["applications"]
+
+
[e-mail]
+def svc2charm():
+    return SVC2CHARM
+
+
 @pytest.fixture
 def mocked_pkg_resources(monkeypatch):
     """Mock the pkg_resources library."""
diff --git a/tests/test_cli.py b/tests/test_cli.py
index dc482ce..156d417 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -7,7 +7,7 @@ def test_plan_upgrade_from_file(cli):
     expected_result = {
         "groups": 26,
         "total_task": 64,
-        "total_duration": 3276,
+        "total_duration": 3234.0,
         "total_data_down": 2,
         "total_control_down": 810
     }
diff --git a/tests/test_cloud.py b/tests/test_cloud.py
index 5476d3e..09a1e5b 100644
--- a/tests/test_cloud.py
+++ b/tests/test_cloud.py
@@ -3,10 +3,6 @@ import subprocess
 import mock
 
 
-def test_cloud_parse_yaml(cloud):
-    assert cloud.parse_yaml("{}") == [{}]
-
-
 def test_get_openstack_servers(cloud):
     cloud.cloud_state["test-cloud"] = {
         "models": {
diff --git a/tests/test_common.py b/tests/test_common.py
new file mode 100644
index 0000000..c4b661b
--- /dev/null
+++ b/tests/test_common.py
@@ -0,0 +1,141 @@
+import pytest
+from unittest.mock import patch, mock_open, call
+import yaml
+
+from cloud_upgrade_planner import common as c
+
+
+class TestCommon:
+    @pytest.mark.parametrize(
+        "app,expected",
+        [
+            ("memcached", "memcached/1"),
+            ("mysql-innodb-cluster", "mysql-innodb-cluster/1"),
+            ("neutron-api", "neutron-api/2"),
+        ],
+    )
+    def test_find_leader_for_app(self, app, expected, juju_file_dict):
+        output = c.find_leader_for_app(app, juju_file_dict)
+        assert output == expected
+
+    def test_get_model_apps_missing_file(self):
+        with pytest.raises(SystemExit):
+            c.get_model_apps("")
+
+    def test_get_model_apps_provided_file(self, juju_file_mock, juju_file_dict):
+        with patch("builtins.open", new_callable=mock_open, read_data=juju_file_mock):
+            output = c.get_model_apps("test")
+            assert output == juju_file_dict
+
+    @pytest.mark.parametrize(
+        "charms,expected",
+        [
+            (
+                ["mysql-router", "nova-compute", "hacluster", "vault"],
+                [
+                    "aodh-mysql-router",
+                    "nova-cloud-controller-mysql-router",
+                    "nova-compute-kvm",
+                    "hacluster-neutron",
+                    "hacluster-nova",
+                    "hacluster-vault",
+                    "vault",
+                ],
+            ),
+            (["non-existing-charm"], []),
+        ],
+    )
+    def test_find_charms_apps_in_model(self, charms, expected, juju_file_dict, svc2charm):
+        output = c.find_charms_apps_in_model(charms, juju_file_dict, svc2charm)
+        assert output == expected
+
+    @pytest.mark.parametrize(
+        "app,expected",
+        [
+            (
+                "nova-compute-kvm",
+                [
+                    "nova-compute-kvm/1",
+                    "nova-compute-kvm/10",
+                    "nova-compute-kvm/11",
+                    "nova-compute-kvm/12",
+                    "nova-compute-kvm/13",
+                    "nova-compute-kvm/7",
+                    "nova-compute-kvm/9",
+                ],
+            ),
+            (
+                "mysql-innodb-cluster",
+                [
+                    "mysql-innodb-cluster/0",
+                    "mysql-innodb-cluster/1",
+                    "mysql-innodb-cluster/2",
+                ],
+            ),
+        ],
+    )
+    def test_find_units_for_app(self, app, expected, juju_file_dict):
+        output = c.find_units_for_app(app, juju_file_dict)
+        assert output == expected
+
+    @pytest.mark.parametrize(
+        "charm,expected",
+        [
+            ("neutron-api", ["neutron-api"]),
+            ("nova-compute", ["nova-compute-kvm"]),
+            (
+                "mysql-router",
+                ["aodh-mysql-router", "nova-cloud-controller-mysql-router"],
+            ),
+        ],
+    )
+    def test_find_apps_from_charm(self, charm, expected, juju_file_dict):
+        output = c.find_apps_from_charm(charm, juju_file_dict)
+        assert output == expected
+
+    def test_find_units_for_app_not_in_phase(self, juju_file_dict):
+        with pytest.raises(KeyError):
+            c.find_units_for_app("nova-cloud-controller-mysql-router", juju_file_dict)
+
+    def test_find_units_for_app_missing(self, juju_file_dict):
+        with pytest.raises(KeyError):
+            c.find_units_for_app("appx", juju_file_dict)
+
+    @pytest.mark.parametrize(
+        "app,unit,expected",
+        [
+            ("nova-compute-kvm", "nova-compute-kvm/9", "18"),
+            ("memcached", "memcached/1", "5/lxd/4"),
+        ],
+    )
+    def test_find_machine_from_unit(self, app, unit, expected, juju_file_dict):
+        output = c.find_machine_from_unit(app, unit, juju_file_dict)
+        assert output == expected
+
+    def test_render_app_to_charm_dict(self, juju_file_dict, svc2charm):
+        output = c.render_app_to_charm_dict(juju_file_dict)
+        assert output == svc2charm
+
+    @pytest.mark.parametrize(
+        "app,expected",
+        [
+            ("aodh-mysql-router", True),
+            ("memcached", False),
+        ],
+    )
+    def test_available_upgrade(self, app, expected, juju_file_dict):
+        output = c.available_upgrade(app, juju_file_dict)
+        assert output == expected
+
+    @pytest.mark.parametrize(
+        "app,unit,expected",
+        [
+            ("nova-cloud-controller", "nova-cloud-controller/1", "hacluster-nova/2"),
+            ("neutron-api", "neutron-api/2", "hacluster-neutron/2"),
+            ("nova-compute-kvm", "nova-compute-kvm/1", None),  # missing HA
+            ("memcached", "memcached/1", None),  # missing subordinates
+        ],
+    )
+    def test_find_hacluster_for_unit(self, app, unit, expected, juju_file_dict):
+        output = c.find_hacluster_for_unit(app, unit, juju_file_dict)
+        assert output == expected
diff --git a/tests/test_openstack.py b/tests/test_openstack.py
new file mode 100644
index 0000000..82283fb
--- /dev/null
+++ b/tests/test_openstack.py
@@ -0,0 +1,85 @@
+from unittest.mock import patch, mock_open, call
+
+from cloud_upgrade_planner import openstack as o
+
+
+class TestOpenstackManagedUpgrade:
+    @patch("builtins.print")
+    @patch(
+        "cloud_upgrade_planner.common.find_units_for_app",
+        return_value=["neutron-api/0", "neutron-api/1", "neutron-api/2"],
+    )
+    @patch(
+        "cloud_upgrade_planner.common.find_leader_for_app", return_value="neutron-api/2"
+    )
+    def test_plan_action_managed_phase_app(self, mock_leader, mock_units, mock_stdout, juju_file_dict):
+        o.plan_action_managed_phase_app("test-app", juju_file_dict, "test-release")
+        calls = [
+            call(
+                "      juju config test-app action-managed-upgrade=true openstack-origin=test-release"
+            ),
+            call("      {}".format(o.WATCH_COMMAND)),
+            call("      juju run-action --wait neutron-api/2 openstack-upgrade"),
+            call("      juju run-action --wait neutron-api/0 openstack-upgrade"),
+            call("      juju run-action --wait neutron-api/1 openstack-upgrade"),
+        ]
+        assert mock_stdout.mock_calls == calls
+
+    @patch("builtins.print")
+    def test_plan_charm_upgrade_local_path(self, mock_stdout, juju_file_dict, svc2charm):
+        output = o.plan_charm_upgrade("juju-lint", juju_file_dict, svc2charm)
+        calls = [
+            call(
+                "\n          WARNING!!! Application juju-lint has local charm path local:focal/juju-lint-1\n          Suggesting switch to latest promulgated cs: version.\n          Please ensure updates in local charm are in upstream charm before\n          running upgrade-charm on this application.\n        "
+            ),
+            call("      juju upgrade-charm juju-lint --switch cs:juju-lint"),
+            call(
+                "      watch \"juju status|egrep 'blocked|waiting|maint|error|hook|lost|executing'\"\n\n"
+            ),
+        ]
+        assert mock_stdout.mock_calls == calls
+
+    @patch("builtins.print")
+    def test_plan_charm_upgrade_cs_path(self, mock_stdout, juju_file_dict, svc2charm):
+        output = o.plan_charm_upgrade("neutron-api", juju_file_dict, svc2charm)
+        calls = [
+            call("      juju upgrade-charm neutron-api"),
+            call(
+                "      watch \"juju status|egrep 'blocked|waiting|maint|error|hook|lost|executing'\"\n\n"
+            ),
+        ]
+        assert mock_stdout.mock_calls == calls
+
+    @patch("builtins.print")
+    def test_plan_charm_upgrade_tilde(self, mock_stdout, juju_file_dict, svc2charm):
+        output = o.plan_charm_upgrade("easyrsa", juju_file_dict, svc2charm)
+        calls = [
+            call(
+                "\n          WARNING!!! Application easyrsa from unrecognized path cs:~containers/easyrsa-345\n          Suggesting switch to latest promulgated cs: version.\n          Please ensure updates in the above branched charm are in the latest\n          promulgated charm before running upgrade-charm on this application.\n        "
+            ),
+            call("      juju upgrade-charm easyrsa --switch cs:easyrsa"),
+            call(
+                "      watch \"juju status|egrep 'blocked|waiting|maint|error|hook|lost|executing'\"\n\n"
+            ),
+        ]
+        assert mock_stdout.mock_calls == calls
+
+    @patch("builtins.print")
+    def test_plan_charm_upgrade_deferred(self, mock_stdout, juju_file_mock, juju_file_dict, svc2charm):
+        with patch("builtins.open", new_callable=mock_open, read_data=juju_file_mock) as defer_file:
+            calls = [
+                call(
+                    "\n          WARNING!!! Application rabbitmq-server from unrecognized path cs:~llama-charmers-next/rabbitmq-server-5\n          Suggesting switch to latest promulgated cs: version.\n          Please ensure updates in the above branched charm are in the latest\n          promulgated charm before running upgrade-charm on this application.\n        "
+                ),
+                call("rabbitmq-server:\n  enable-auto-restarts: False", file=defer_file()),
+                call(
+                    "      juju upgrade-charm rabbitmq-server --switch cs:rabbitmq-server --config deferred_restart_config_rabbitmq-server.yaml"
+                ),
+                call(
+                    "      watch \"juju status|egrep 'blocked|waiting|maint|error|hook|lost|executing'\"\n\n"
+                ),
+            ]
+            output = o.plan_charm_upgrade("rabbitmq-server", juju_file_dict, svc2charm)
+            assert mock_stdout.mock_calls == calls
+
+
diff --git a/tests/test_ubuntu_series_upgrade_for_openstack.py b/tests/test_ubuntu.py
similarity index 50%
rename from tests/test_ubuntu_series_upgrade_for_openstack.py
rename to tests/test_ubuntu.py
index 8d80437..72307dd 100644
--- a/tests/test_ubuntu_series_upgrade_for_openstack.py
+++ b/tests/test_ubuntu.py
@@ -1,413 +1,7 @@
 import pytest
 from unittest.mock import patch, mock_open, call
-import yaml
 
-from cloud_upgrade_planner import common as c
-from cloud_upgrade_planner import openstack_managed_upgrade as o
-from cloud_upgrade_planner import ubuntu_series_upgrade_for_openstack as u
-
-
-JUJU_FILE_MOCK = """
-applications:
-  aodh-mysql-router:
-    can-upgrade-to: cs:mysql-router-11
-    charm: cs:mysql-router-6
-  easyrsa:
-    can-upgrade-to: cs:~containers/easyrsa-408
-    charm: cs:~containers/easyrsa-345
-    units:
-      easyrsa/0:
-        leader: true
-        machine: 7/lxd/3
-  hacluster-neutron:
-    can-upgrade-to: cs:hacluster-78
-    charm: cs:hacluster-74
-  hacluster-nova:
-    can-upgrade-to: cs:hacluster-78
-    charm: cs:hacluster-74
-  hacluster-vault:
-    can-upgrade-to: cs:hacluster-78
-    charm: cs:hacluster-74
-  landscape-client:
-    charm: cs:landscape-client-35
-  juju-lint:
-    charm: local:focal/juju-lint-1
-    units:
-      juju-lint/0:
-        leader: true
-        machine: 8/lxd/15
-  memcached:
-    charm: cs:memcached-34
-    units:
-      memcached/1:
-        leader: true
-        machine: 5/lxd/4
-  mysql-innodb-cluster:
-    can-upgrade-to: cs:mysql-innodb-cluster-11
-    charm: cs:mysql-innodb-cluster-5
-    units:
-      mysql-innodb-cluster/0:
-        machine: 3/lxd/8
-        subordinates:
-          landscape-client/65: true
-      mysql-innodb-cluster/1:
-        leader: true
-        machine: 4/lxd/8
-        subordinates:
-          landscape-client/66: true
-      mysql-innodb-cluster/2:
-        machine: 5/lxd/8
-        subordinates:
-          landscape-client/67: true
-  neutron-api:
-    can-upgrade-to: cs:neutron-api-299
-    charm: cs:neutron-api-292
-    units:
-      neutron-api/0:
-        machine: 6/lxd/5
-        subordinates:
-          hacluster-neutron/0: true
-          landscape-client/69: true
-          neutron-api-mysql-router/0: true
-      neutron-api/1:
-        machine: 7/lxd/6
-        subordinates:
-          hacluster-neutron/1: true
-          landscape-client/68: true
-          neutron-api-mysql-router/1: true
-      neutron-api/2:
-        leader: true
-        machine: 8/lxd/5
-        subordinates:
-          hacluster-neutron/2: true
-          landscape-client/70: true
-          neutron-api-mysql-router/2: true
-  nova-cloud-controller:
-    can-upgrade-to: cs:nova-cloud-controller-358
-    charm: cs:nova-cloud-controller-353
-    units:
-      nova-cloud-controller/0:
-        machine: 6/lxd/6
-        subordinates:
-          hacluster-nova/0: true
-          landscape-client/72: true
-          nova-cloud-controller-mysql-router/0: true
-      nova-cloud-controller/1:
-        machine: 7/lxd/7
-        subordinates:
-          hacluster-nova/2: true
-          landscape-client/73: true
-          nova-cloud-controller-mysql-router/2: true
-      nova-cloud-controller/2:
-        leader: true
-        machine: 8/lxd/6
-        subordinates:
-          hacluster-nova/1: true
-          landscape-client/71: true
-          nova-cloud-controller-mysql-router/1: true
-  nova-cloud-controller-mysql-router:
-    can-upgrade-to: cs:mysql-router-11
-    charm: cs:mysql-router-6
-  nova-compute-kvm:
-    can-upgrade-to: cs:nova-compute-334
-    charm: cs:nova-compute-325
-    units:
-      nova-compute-kvm/1:
-        machine: '10'
-        subordinates:
-          landscape-client/19: true
-      nova-compute-kvm/10:
-        machine: '19'
-        subordinates:
-          landscape-client/10: true
-      nova-compute-kvm/11:
-        machine: '20'
-        subordinates:
-          landscape-client/20: true
-      nova-compute-kvm/12:
-        machine: '21'
-        subordinates:
-          landscape-client/11: true
-      nova-compute-kvm/13:
-        machine: '22'
-        subordinates:
-          landscape-client/4: true
-      nova-compute-kvm/7:
-        leader: true
-        machine: '16'
-        subordinates:
-          landscape-client/7: true
-      nova-compute-kvm/9:
-        machine: '18'
-        subordinates:
-          landscape-client/16: true
-  rabbitmq-server:
-    can-upgrade-to: cs:~llama-charmers-next/rabbitmq-server-6
-    charm: cs:~llama-charmers-next/rabbitmq-server-5
-    units:
-      rabbitmq-server/4:
-        machine: 6/lxd/12
-      rabbitmq-server/5:
-        leader: true
-        machine: 7/lxd/12
-      rabbitmq-server/6:
-        machine: 8/lxd/11
-  vault:
-    can-upgrade-to: cs:vault-50
-    charm: cs:vault-44
-    units:
-      vault/0:
-        machine: '0'
-        subordinates:
-          hacluster-vault/1: true
-          landscape-client/24: true
-      vault/1:
-        leader: true
-        machine: '1'
-        subordinates:
-          hacluster-vault/2: true
-          landscape-client/23: true
-      vault/2:
-        machine: '2'
-        subordinates:
-          hacluster-vault/0: true
-          landscape-client/22: true
-"""
-JUJU_FILE_DICT = yaml.safe_load(JUJU_FILE_MOCK)["applications"]
-
-SVC2CHARM = {
-    "aodh-mysql-router": "mysql-router",
-    "easyrsa": "easyrsa",
-    "hacluster-neutron": "hacluster",
-    "hacluster-nova": "hacluster",
-    "hacluster-vault": "hacluster",
-    "juju-lint": "juju-lint",
-    "landscape-client": "landscape-client",
-    "memcached": "memcached",
-    "mysql-innodb-cluster": "mysql-innodb-cluster",
-    "neutron-api": "neutron-api",
-    "nova-cloud-controller": "nova-cloud-controller",
-    "nova-cloud-controller-mysql-router": "mysql-router",
-    "nova-compute-kvm": "nova-compute",
-    "rabbitmq-server": "rabbitmq-server",
-    "vault": "vault",
-}
-
-
-class TestCommon:
-    @pytest.mark.parametrize(
-        "app,expected",
-        [
-            ("memcached", "memcached/1"),
-            ("mysql-innodb-cluster", "mysql-innodb-cluster/1"),
-            ("neutron-api", "neutron-api/2"),
-        ],
-    )
-    def test_find_leader_for_app(self, app, expected):
-        output = c.find_leader_for_app(app, JUJU_FILE_DICT)
-        assert output == expected
-
-    def test_get_model_apps_missing_file(self):
-        with pytest.raises(SystemExit):
-            c.get_model_apps("")
-
-    @patch("builtins.open", new_callable=mock_open, read_data=JUJU_FILE_MOCK)
-    def test_get_model_apps_provided_file(self, juju_file):
-        output = c.get_model_apps("test")
-        assert output == JUJU_FILE_DICT
-
-    @pytest.mark.parametrize(
-        "charms,expected",
-        [
-            (
-                ["mysql-router", "nova-compute", "hacluster", "vault"],
-                [
-                    "aodh-mysql-router",
-                    "nova-cloud-controller-mysql-router",
-                    "nova-compute-kvm",
-                    "hacluster-neutron",
-                    "hacluster-nova",
-                    "hacluster-vault",
-                    "vault",
-                ],
-            ),
-            (["non-existing-charm"], []),
-        ],
-    )
-    def test_find_charms_apps_in_model(self, charms, expected):
-        output = c.find_charms_apps_in_model(charms, JUJU_FILE_DICT, SVC2CHARM)
-        assert output == expected
-
-    @pytest.mark.parametrize(
-        "app,expected",
-        [
-            (
-                "nova-compute-kvm",
-                [
-                    "nova-compute-kvm/1",
-                    "nova-compute-kvm/10",
-                    "nova-compute-kvm/11",
-                    "nova-compute-kvm/12",
-                    "nova-compute-kvm/13",
-                    "nova-compute-kvm/7",
-                    "nova-compute-kvm/9",
-                ],
-            ),
-            (
-                "mysql-innodb-cluster",
-                [
-                    "mysql-innodb-cluster/0",
-                    "mysql-innodb-cluster/1",
-                    "mysql-innodb-cluster/2",
-                ],
-            ),
-        ],
-    )
-    def test_find_units_for_app(self, app, expected):
-        output = c.find_units_for_app(app, JUJU_FILE_DICT)
-        assert output == expected
-
-    @pytest.mark.parametrize(
-        "charm,expected",
-        [
-            ("neutron-api", ["neutron-api"]),
-            ("nova-compute", ["nova-compute-kvm"]),
-            (
-                "mysql-router",
-                ["aodh-mysql-router", "nova-cloud-controller-mysql-router"],
-            ),
-        ],
-    )
-    def test_find_apps_from_charm(self, charm, expected):
-        output = c.find_apps_from_charm(charm, JUJU_FILE_DICT)
-        assert output == expected
-
-    def test_find_units_for_app_not_in_phase(self):
-        with pytest.raises(KeyError):
-            c.find_units_for_app("nova-cloud-controller-mysql-router", JUJU_FILE_DICT)
-
-    def test_find_units_for_app_missing(self):
-        with pytest.raises(KeyError):
-            c.find_units_for_app("appx", JUJU_FILE_DICT)
-
-    @pytest.mark.parametrize(
-        "app,unit,expected",
-        [
-            ("nova-compute-kvm", "nova-compute-kvm/9", "18"),
-            ("memcached", "memcached/1", "5/lxd/4"),
-        ],
-    )
-    def test_find_machine_from_unit(self, app, unit, expected):
-        output = c.find_machine_from_unit(app, unit, JUJU_FILE_DICT)
-        assert output == expected
-
-    def test_render_app_to_charm_dict(self):
-        output = c.render_app_to_charm_dict(JUJU_FILE_DICT)
-        assert output == SVC2CHARM
-
-    @pytest.mark.parametrize(
-        "app,expected",
-        [
-            ("aodh-mysql-router", True),
-            ("memcached", False),
-        ],
-    )
-    def test_available_upgrade(self, app, expected):
-        output = c.available_upgrade(app, JUJU_FILE_DICT)
-        assert output == expected
-
-    @pytest.mark.parametrize(
-        "app,unit,expected",
-        [
-            ("nova-cloud-controller", "nova-cloud-controller/1", "hacluster-nova/2"),
-            ("neutron-api", "neutron-api/2", "hacluster-neutron/2"),
-            ("nova-compute-kvm", "nova-compute-kvm/1", None),  # missing HA
-            ("memcached", "memcached/1", None),  # missing subordinates
-        ],
-    )
-    def test_find_hacluster_for_unit(self, app, unit, expected):
-        output = c.find_hacluster_for_unit(app, unit, JUJU_FILE_DICT)
-        assert output == expected
-
-
-class TestOpenstackManagedUpgrade:
-    @patch("builtins.print")
-    @patch(
-        "cloud_upgrade_planner.common.find_units_for_app",
-        return_value=["neutron-api/0", "neutron-api/1", "neutron-api/2"],
-    )
-    @patch(
-        "cloud_upgrade_planner.common.find_leader_for_app", return_value="neutron-api/2"
-    )
-    def test_plan_action_managed_phase_app(self, mock_leader, mock_units, mock_stdout):
-        o.plan_action_managed_phase_app("test-app", JUJU_FILE_DICT, "test-release")
-        calls = [
-            call(
-                "      juju config test-app action-managed-upgrade=true openstack-origin=test-release"
-            ),
-            call("      {}".format(o.WATCH_COMMAND)),
-            call("      juju run-action --wait neutron-api/2 openstack-upgrade"),
-            call("      juju run-action --wait neutron-api/0 openstack-upgrade"),
-            call("      juju run-action --wait neutron-api/1 openstack-upgrade"),
-        ]
-        assert mock_stdout.mock_calls == calls
-
-    @patch("builtins.print")
-    def test_plan_charm_upgrade_local_path(self, mock_stdout):
-        output = o.plan_charm_upgrade("juju-lint", JUJU_FILE_DICT, SVC2CHARM)
-        calls = [
-            call(
-                "\n          WARNING!!! Application juju-lint has local charm path local:focal/juju-lint-1\n          Suggesting switch to latest promulgated cs: version.\n          Please ensure updates in local charm are in upstream charm before\n          running upgrade-charm on this application.\n        "
-            ),
-            call("      juju upgrade-charm juju-lint --switch cs:juju-lint"),
-            call(
-                "      watch \"juju status|egrep 'blocked|waiting|maint|error|hook|lost|executing'\"\n\n"
-            ),
-        ]
-        assert mock_stdout.mock_calls == calls
-
-    @patch("builtins.print")
-    def test_plan_charm_upgrade_cs_path(self, mock_stdout):
-        output = o.plan_charm_upgrade("neutron-api", JUJU_FILE_DICT, SVC2CHARM)
-        calls = [
-            call("      juju upgrade-charm neutron-api"),
-            call(
-                "      watch \"juju status|egrep 'blocked|waiting|maint|error|hook|lost|executing'\"\n\n"
-            ),
-        ]
-        assert mock_stdout.mock_calls == calls
-
-    @patch("builtins.print")
-    def test_plan_charm_upgrade_tilde(self, mock_stdout):
-        output = o.plan_charm_upgrade("easyrsa", JUJU_FILE_DICT, SVC2CHARM)
-        calls = [
-            call(
-                "\n          WARNING!!! Application easyrsa from unrecognized path cs:~containers/easyrsa-345\n          Suggesting switch to latest promulgated cs: version.\n          Please ensure updates in the above branched charm are in the latest\n          promulgated charm before running upgrade-charm on this application.\n        "
-            ),
-            call("      juju upgrade-charm easyrsa --switch cs:easyrsa"),
-            call(
-                "      watch \"juju status|egrep 'blocked|waiting|maint|error|hook|lost|executing'\"\n\n"
-            ),
-        ]
-        assert mock_stdout.mock_calls == calls
-
-    @patch("builtins.print")
-    @patch("builtins.open", new_callable=mock_open, read_data=JUJU_FILE_MOCK)
-    def test_plan_charm_upgrade_deferred(self, defer_file, mock_stdout):
-        output = o.plan_charm_upgrade("rabbitmq-server", JUJU_FILE_DICT, SVC2CHARM)
-        calls = [
-            call(
-                "\n          WARNING!!! Application rabbitmq-server from unrecognized path cs:~llama-charmers-next/rabbitmq-server-5\n          Suggesting switch to latest promulgated cs: version.\n          Please ensure updates in the above branched charm are in the latest\n          promulgated charm before running upgrade-charm on this application.\n        "
-            ),
-            call("rabbitmq-server:\n  enable-auto-restarts: False", file=defer_file()),
-            call(
-                "      juju upgrade-charm rabbitmq-server --switch cs:rabbitmq-server --config deferred_restart_config_rabbitmq-server.yaml"
-            ),
-            call(
-                "      watch \"juju status|egrep 'blocked|waiting|maint|error|hook|lost|executing'\"\n\n"
-            ),
-        ]
-        assert mock_stdout.mock_calls == calls
+from cloud_upgrade_planner import ubuntu as u
 
 
 class TestUbuntuSeriesUpgrade:
@@ -415,36 +9,36 @@ class TestUbuntuSeriesUpgrade:
         with pytest.raises(SystemExit):
             u.main()
 
-    @patch("cloud_upgrade_planner.ubuntu_series_upgrade_for_openstack.plan_sequential")
-    @patch("cloud_upgrade_planner.ubuntu_series_upgrade_for_openstack.plan_parallel")
+    @patch("cloud_upgrade_planner.ubuntu.plan_sequential")
+    @patch("cloud_upgrade_planner.ubuntu.plan_parallel")
     @patch(
         "cloud_upgrade_planner.common.find_apps_from_charm", return_value=["app"]
     )
-    @patch("builtins.open", new_callable=mock_open, read_data=JUJU_FILE_MOCK)
     def test_main_with_juju_file(
-        self, juju_file, mock_apps_from_charm, mock_parallel, mock_sequential
+        self, mock_apps_from_charm, mock_parallel, mock_sequential, juju_file_dict, juju_file_mock
     ):
-        u.main()
+        with patch("builtins.open", new_callable=mock_open, read_data=juju_file_mock):
+            u.main()
 
         charm_calls = []
         for phase in range(2):
             for app in u.PHASE_APPS[phase]:
-                charm_calls.append(call(app, JUJU_FILE_DICT))
+                charm_calls.append(call(app, juju_file_dict))
         mock_apps_from_charm.assert_has_calls(charm_calls)
 
         parallel_apps_no = len(u.PHASE_APPS[1])
         mock_parallel.assert_called_once_with(
-            JUJU_FILE_DICT, ["app"] * parallel_apps_no, []
+            juju_file_dict, ["app"] * parallel_apps_no, []
         )
 
         sequential_apps_no = len(u.PHASE_APPS[0]) + len(u.PHASE_APPS[2])
-        seq_calls = [call(JUJU_FILE_DICT, "app", []) for _ in range(sequential_apps_no)]
+        seq_calls = [call(juju_file_dict, "app", []) for _ in range(sequential_apps_no)]
         mock_sequential.assert_has_calls(seq_calls)
 
     @patch("builtins.print")
-    @patch("builtins.open", new_callable=mock_open, read_data=JUJU_FILE_MOCK)
-    def test_main_output(self, juju_file, mock_stdout):
-        u.main()
+    def test_main_output(self, mock_stdout, juju_file_mock):
+        with patch("builtins.open", new_callable=mock_open, read_data=juju_file_mock):
+            u.main()
         calls = [
             call(u.PRE_UPGRADE_STEPS),
             call("Phase 0\n========"),