From a093a17bb3e78093cf731c6d10bd77552001e998 Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 13 Sep 2018 07:35:43 -0700 Subject: [PATCH] Classes for different upgrade scenarios --- zaza/charm_tests/series_upgrade/tests.py | 32 +++++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/zaza/charm_tests/series_upgrade/tests.py b/zaza/charm_tests/series_upgrade/tests.py index c61d48a..a15025a 100644 --- a/zaza/charm_tests/series_upgrade/tests.py +++ b/zaza/charm_tests/series_upgrade/tests.py @@ -36,6 +36,8 @@ class SeriesUpgradeTest(unittest.TestCase): """Run setup for Series Upgrades.""" cli_utils.setup_logging() cls.lts = LTSGuestCreateTest() + cls.from_series = None + cls.to_series = None def validate_pre_series_upgrade_cloud(self): """Validate pre series upgrade.""" @@ -55,8 +57,6 @@ class SeriesUpgradeTest(unittest.TestCase): files = [src_workaround_script, 'corosync', 'corosync.conf'] applications = model.get_status().applications - from_series = "trusty" - to_series = "xenial" for application in applications: # Defaults origin = "openstack-origin" @@ -83,8 +83,8 @@ class SeriesUpgradeTest(unittest.TestCase): application, pause_non_leader_primary=pause_non_leader_primary, pause_non_leader_subordinate=pause_non_leader_subordinate, - from_series=from_series, - to_series=to_series, + from_series=self.from_series, + to_series=self.to_series, origin=origin, workaround_script=workaround_script, files=files) @@ -95,5 +95,29 @@ class SeriesUpgradeTest(unittest.TestCase): self.lts.test_launch_small_instance() +class TrustyXenialSeriesUpgrade(SeriesUpgradeTest): + """Trusty to Xenial Series Upgrade.""" + + @classmethod + def setUpClass(cls): + """Run setup for Trusty to Xenial Series Upgrades.""" + cli_utils.setup_logging() + cls.lts = LTSGuestCreateTest() + cls.from_series = "trusty" + cls.to_series = "xenial" + + +class XenialBionicSeriesUpgrade(SeriesUpgradeTest): + """Xenial to Bionic Series Upgrade.""" + + @classmethod + def setUpClass(cls): + """Run setup for Xenial to Bionic Series Upgrades.""" + cli_utils.setup_logging() + cls.lts = LTSGuestCreateTest() + cls.from_series = "xenial" + cls.to_series = "bionic" + + if __name__ == "__main__": unittest.main()