Add the mapping for Reef

Change-Id: Id29d9a5ebc55b7fef716406527648fbd98278ffd

charms_ceph/broker.py

@@ -907,7 +907,7 @@ def process_requests_v1(reqs):
             log(msg, level=ERROR)
             return {'exit-code': 1, 'stderr': msg}
 
-    if type(ret) == dict and 'exit-code' in ret:
+    if isinstance(ret, dict) and 'exit-code' in ret:
         return ret
 
     return {'exit-code': 0}

charms_ceph/utils.py

@@ -3231,6 +3231,7 @@ UPGRADE_PATHS = collections.OrderedDict([
     ('nautilus', 'octopus'),
     ('octopus', 'pacific'),
     ('pacific', 'quincy'),
+    ('quincy', 'reef'),
 ])
 
 # Map UCA codenames to Ceph codenames
@@ -3254,7 +3255,7 @@ UCA_CODENAME_MAP = {
     'yoga': 'quincy',
     'zed': 'quincy',
     'antelope': 'quincy',
-    'bobcat': 'quincy',
+    'bobcat': 'reef',
 }
 
 

unit_tests/test_utils.py

@@ -1085,6 +1085,7 @@ class CephTestCase(unittest.TestCase):
             'nautilus -> octopus',
             'octopus -> pacific',
             'pacific -> quincy',
+            'quincy -> reef',
         ])
         self.assertEqual(utils.pretty_print_upgrade_paths(), expected)