From d89e05461be0e307cb23eb450a5f9c72776ba03d Mon Sep 17 00:00:00 2001 From: Shyamsundar Ranganathan Date: Mon, 20 Jul 2020 08:32:43 -0400 Subject: [PATCH] mgr/volumes: Remove enum usage in code for Py2 support SubvolumeFeatures uses an enum for the feature list, this is replaced with a constant instead. Signed-off-by: Shyamsundar Ranganathan --- .../mgr/volumes/fs/operations/versions/subvolume_base.py | 4 +--- src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py index b53417be482e5..5175afef8da9b 100644 --- a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py +++ b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_base.py @@ -2,7 +2,6 @@ import os import uuid import errno import logging -from enum import Enum, unique from hashlib import md5 import cephfs @@ -14,8 +13,7 @@ from ...exception import MetadataMgrException, VolumeException log = logging.getLogger(__name__) -@unique -class SubvolumeFeatures(Enum): +class SubvolumeFeatures(): FEATURE_SNAPSHOT_CLONE = "snapshot-clone" FEATURE_SNAPSHOT_AUTOPROTECT = "snapshot-autoprotect" diff --git a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py index 1b147c93a2ac3..aecad5c0b324a 100644 --- a/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py +++ b/src/pybind/mgr/volumes/fs/operations/versions/subvolume_v1.py @@ -36,7 +36,7 @@ class SubvolumeV1(SubvolumeBase, SubvolumeTemplate): @property def features(self): - return [SubvolumeFeatures.FEATURE_SNAPSHOT_CLONE.value, SubvolumeFeatures.FEATURE_SNAPSHOT_AUTOPROTECT.value] + return [SubvolumeFeatures.FEATURE_SNAPSHOT_CLONE, SubvolumeFeatures.FEATURE_SNAPSHOT_AUTOPROTECT] def create(self, size, isolate_nspace, pool, mode, uid, gid): subvolume_type = SubvolumeBase.SUBVOLUME_TYPE_NORMAL -- 2.47.3