openstack/cinder
Code Issues Proposed changes

Merge "Remove cyclical import in dell_emc powerstore driver"

Browse Source
This commit is contained in:
Zuul 2024-07-11 00:42:25 +00:00 committed by Gerrit Code Review
commit 3d654c7f79
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/volume/drivers/dell_emc/powerstore/driver.py
View File

@ -34,7 +34,6 @@ POWERSTORE_OPTS = options.POWERSTORE_OPTS
CONF = cfg.CONF CONF = cfg.CONF
CONF.register_opts(POWERSTORE_OPTS, group=configuration.SHARED_CONF_GROUP) CONF.register_opts(POWERSTORE_OPTS, group=configuration.SHARED_CONF_GROUP)
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
POWERSTORE_PP_KEY = "powerstore:protection_policy"
@interface.volumedriver @interface.volumedriver
@ -75,7 +74,7 @@ class PowerStoreDriver(driver.VolumeDriver):
properties = {} properties = {}
self._set_property( self._set_property(
properties, properties,
POWERSTORE_PP_KEY, utils.POWERSTORE_PP_KEY,
"PowerStore Protection Policy.", "PowerStore Protection Policy.",
_("Specifies the PowerStore Protection Policy for a " _("Specifies the PowerStore Protection Policy for a "
"volume type. Protection Policy is assigned to a volume during " "volume type. Protection Policy is assigned to a volume during "

4
cinder/volume/drivers/dell_emc/powerstore/utils.py
View File

@ -26,7 +26,6 @@ from cinder.common import constants
from cinder import exception from cinder import exception
from cinder.i18n import _ from cinder.i18n import _
from cinder.objects import fields from cinder.objects import fields
from cinder.volume.drivers.dell_emc.powerstore import driver
from cinder.volume import volume_utils from cinder.volume import volume_utils
@ -36,6 +35,7 @@ CHAP_DEFAULT_SECRET_LENGTH = 60
PROTOCOL_FC = constants.FC PROTOCOL_FC = constants.FC
PROTOCOL_ISCSI = constants.ISCSI PROTOCOL_ISCSI = constants.ISCSI
PROTOCOL_NVME = "NVMe" PROTOCOL_NVME = "NVMe"
POWERSTORE_PP_KEY = "powerstore:protection_policy"
def bytes_to_gib(size_in_bytes): def bytes_to_gib(size_in_bytes):
@ -167,7 +167,7 @@ def get_protection_policy_from_volume(volume):
:return: Protection policy name :return: Protection policy name
""" """
return volume.volume_type.extra_specs.get(driver.POWERSTORE_PP_KEY) return volume.volume_type.extra_specs.get(POWERSTORE_PP_KEY)
def is_group_a_cg_snapshot_type(func): def is_group_a_cg_snapshot_type(func):