summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-05-02 19:58:49 +0000
committerGerrit Code Review <review@openstack.org>2023-05-02 19:58:49 +0000
commit0e6ac2609a1d683005c97d4442f5a3f07e496bab (patch)
tree910ed47d9d39724412ce88cf52a37a25eb156bd7
parentf9cb98515ca9710475e80019fa3e0bd73c0f9660 (diff)
parent0b8f074e4b4f12a1cd18eccbd74b1f6ffc82883d (diff)
downloadcinder-0e6ac2609a1d683005c97d4442f5a3f07e496bab.tar.gz
Merge "Powerstore: Move from distutils.version to packaging.version"
-rw-r--r--cinder/volume/drivers/dell_emc/powerstore/utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cinder/volume/drivers/dell_emc/powerstore/utils.py b/cinder/volume/drivers/dell_emc/powerstore/utils.py
index 52c74a587..dd02fe93c 100644
--- a/cinder/volume/drivers/dell_emc/powerstore/utils.py
+++ b/cinder/volume/drivers/dell_emc/powerstore/utils.py
@@ -15,12 +15,12 @@
"""Utilities for Dell EMC PowerStore Cinder driver."""
-from distutils import version
import functools
import re
from oslo_log import log as logging
from oslo_utils import units
+from packaging import version
from cinder.common import constants
from cinder import exception
@@ -186,4 +186,4 @@ def is_group_a_cg_snapshot_type(func):
def version_gte(ver1, ver2):
- return version.LooseVersion(ver1) >= version.LooseVersion(ver2)
+ return version.parse(ver1) >= version.parse(ver2)