diff --git a/ceph/utils.py b/ceph/utils.py index 6331f9c..7665630 100644 --- a/ceph/utils.py +++ b/ceph/utils.py @@ -2171,7 +2171,7 @@ UCA_CODENAME_MAP = { def pretty_print_upgrade_paths(): """Pretty print supported upgrade paths for ceph""" return ["{} -> {}".format(key, value) - for key, value in UPGRADE_PATHS.iteritems()] + for key, value in UPGRADE_PATHS.items()] def resolve_ceph_version(source): diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py index 627dc3b..2490d47 100644 --- a/unit_tests/test_utils.py +++ b/unit_tests/test_utils.py @@ -506,6 +506,11 @@ class CephTestCase(unittest.TestCase): with self.assertRaises(Exception): utils.osd_noout(True) + def test_pretty_print_upgrade_paths(self): + expected = (['firefly -> hammer', 'jewel -> luminous', + 'hammer -> jewel']) + self.assertEqual(utils.pretty_print_upgrade_paths(), expected) + class CephVersionTestCase(unittest.TestCase): @patch.object(utils, 'get_os_codename_install_source')