From 2e600bdf71ef302de5d91bb5f9b9b989478e3b1c Mon Sep 17 00:00:00 2001
From: Trent Lloyd <trent.lloyd@canonical.com>
Date: Tue, 13 Jun 2023 12:42:41 +0800
Subject: [PATCH] Add missing octopus -> pacific upgrade path

The octopus -> pacific upgrade path is missing from the stable/pacific
branch, which results in an error and failure to upgrade.

Invalid upgrade path from octopus to octopus. Valid paths are: ['firefly
-> hammer', 'hammer -> jewel', 'jewel -> luminous', 'luminous -> mimic',
'mimic -> nautilus', 'nautilus -> octopus']

Change-Id: I07f0b34e80978189ca03ab7bad956e5ce5da4201
---
 charms_ceph/utils.py     | 4 ++++
 unit_tests/test_utils.py | 1 +
 2 files changed, 5 insertions(+)

diff --git a/charms_ceph/utils.py b/charms_ceph/utils.py
index 791b11a..25566cd 100644
--- a/charms_ceph/utils.py
+++ b/charms_ceph/utils.py
@@ -3167,6 +3167,7 @@ UPGRADE_PATHS = collections.OrderedDict([
     ('luminous', 'mimic'),
     ('mimic', 'nautilus'),
     ('nautilus', 'octopus'),
+    ('octopus', 'pacific'),
 ])
 
 # Map UCA codenames to ceph codenames
@@ -3184,6 +3185,9 @@ UCA_CODENAME_MAP = {
     'stein': 'mimic',
     'train': 'nautilus',
     'ussuri': 'octopus',
+    'victoria': 'octopus',
+    'wallaby': 'pacific',
+    'xena': 'pacific',
 }
 
 
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index be27232..515d4b0 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -1037,6 +1037,7 @@ class CephTestCase(unittest.TestCase):
             'luminous -> mimic',
             'mimic -> nautilus',
             'nautilus -> octopus',
+            'octopus -> pacific',
         ])
         self.assertEqual(utils.pretty_print_upgrade_paths(), expected)