From cec24d76a0748b04d521442e4a3c8d9b87db41e0 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Sat, 28 Oct 2023 18:20:14 +0000
Subject: [PATCH 1/3] Add test to report installed proposed packages

For SRUs to Ubuntu and the Cloud Archive, bugs need to be updated
with testing results and package versions tested. This will enable
getting the package versions from charm units in an automated way.
---
 zaza/openstack/charm_tests/status/tests.py | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 zaza/openstack/charm_tests/status/tests.py

diff --git a/zaza/openstack/charm_tests/status/tests.py b/zaza/openstack/charm_tests/status/tests.py
new file mode 100644
index 000000000..30db3d6fd
--- /dev/null
+++ b/zaza/openstack/charm_tests/status/tests.py
@@ -0,0 +1,40 @@
+# Copyright 2023 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.
+
+"""Code for running status tests."""
+
+import logging
+import subprocess
+import unittest
+
+import zaza
+import zaza.openstack.charm_tests.test_utils as test_utils
+
+class ProposedPackageReport(test_utils.OpenStackBaseTest):
+    """Proposed packages report status test class."""
+
+    def test_100_report_proposed_packages(self):
+        """Report proposed packages installed on each unit."""
+
+        machines = []
+        cmd = 'apt list --installed'
+        for application in zaza.model.get_status().applications:
+            for unit in zaza.model.get_units(application):
+                installed = zaza.model.run_on_unit(unit.entity_id, cmd)
+                proposed = []
+                for pkg in installed['Stdout'].split('\n'):
+                    if 'proposed' in pkg:
+                        proposed.append(pkg)
+            logging.info("\n\nProposed packages installed on {}:\n{}".format(
+                unit.entity_id, "\n".join(proposed)))

From 227ceb2bb83e3e0c2d1498df0d5ae464908153e6 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Mon, 30 Oct 2023 13:25:04 +0000
Subject: [PATCH 2/3] Minor update to fix track on upgrade test

This should fix "Upgrading keystone to 2022.2/stable" resulting
in 'no releases found for channel "2022.2/stable"'.

Instead, keystone should be upgraded to zed/stable.
---
 zaza/openstack/charm_tests/charm_upgrade/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zaza/openstack/charm_tests/charm_upgrade/tests.py b/zaza/openstack/charm_tests/charm_upgrade/tests.py
index f2df62e36..4151dc796 100644
--- a/zaza/openstack/charm_tests/charm_upgrade/tests.py
+++ b/zaza/openstack/charm_tests/charm_upgrade/tests.py
@@ -52,7 +52,7 @@ def test_200_run_charm_upgrade(self):
                 os_version, os_codename = (
                     upgrade_utils.determine_next_openstack_release(
                         charm_track))
-                if os_versions.CompareOpenStack(os_codename) >= 'zed':
+                if os_versions.CompareOpenStack(os_codename) > 'zed':
                     new_charm_track = os_version
                 else:
                     new_charm_track = os_codename

From 3c545ad861767ecc70fbd83b46707bf7d600cced Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Mon, 30 Oct 2023 13:42:46 +0000
Subject: [PATCH 3/3] Fix pep8 failures

---
 zaza/openstack/charm_tests/status/tests.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/zaza/openstack/charm_tests/status/tests.py b/zaza/openstack/charm_tests/status/tests.py
index 30db3d6fd..6210d63f5 100644
--- a/zaza/openstack/charm_tests/status/tests.py
+++ b/zaza/openstack/charm_tests/status/tests.py
@@ -15,19 +15,16 @@
 """Code for running status tests."""
 
 import logging
-import subprocess
-import unittest
 
 import zaza
 import zaza.openstack.charm_tests.test_utils as test_utils
 
+
 class ProposedPackageReport(test_utils.OpenStackBaseTest):
     """Proposed packages report status test class."""
 
     def test_100_report_proposed_packages(self):
         """Report proposed packages installed on each unit."""
-
-        machines = []
         cmd = 'apt list --installed'
         for application in zaza.model.get_status().applications:
             for unit in zaza.model.get_units(application):