From a993849928758f27b607fb571e1c7e04ca375bc6 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 27 Jul 2021 11:04:00 +0900 Subject: [PATCH] Use Block Storage API v3 instead of API v2 Block Storage API v2 was deprecated during Pike cycle and is being removed during Xena cycle, and current v3 API should be used instead. Change-Id: Ia5247742b31f5f07186ef908588f0972d3ac609f --- watcher/common/cinder_helper.py | 2 +- watcher/decision_engine/model/collector/cinder.py | 4 ++-- watcher/decision_engine/strategy/strategies/zone_migration.py | 2 +- .../strategy/strategies/test_zone_migration.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/watcher/common/cinder_helper.py b/watcher/common/cinder_helper.py index 126bc8e7c..848dfe12e 100644 --- a/watcher/common/cinder_helper.py +++ b/watcher/common/cinder_helper.py @@ -17,7 +17,7 @@ import time from oslo_log import log from cinderclient import exceptions as cinder_exception -from cinderclient.v2.volumes import Volume +from cinderclient.v3.volumes import Volume from watcher._i18n import _ from watcher.common import clients from watcher.common import exception diff --git a/watcher/decision_engine/model/collector/cinder.py b/watcher/decision_engine/model/collector/cinder.py index 3a5bfe17d..f498d156f 100644 --- a/watcher/decision_engine/model/collector/cinder.py +++ b/watcher/decision_engine/model/collector/cinder.py @@ -205,7 +205,7 @@ class CinderModelBuilder(base.BaseModelBuilder): """Build a storage node from a Cinder storage node :param node: A storage node - :type node: :py:class:`~cinderclient.v2.services.Service` + :type node: :py:class:`~cinderclient.v3.services.Service` """ # node.host is formatted as host@backendname since ocata, # or may be only host as of ocata @@ -233,7 +233,7 @@ class CinderModelBuilder(base.BaseModelBuilder): """Build a storage pool from a Cinder storage pool :param pool: A storage pool - :type pool: :py:class:`~cinderclient.v2.pools.Pool` + :type pool: :py:class:`~cinderclient.v3.pools.Pool` :raises: exception.InvalidPoolAttributeValue """ # build up the storage pool. diff --git a/watcher/decision_engine/strategy/strategies/zone_migration.py b/watcher/decision_engine/strategy/strategies/zone_migration.py index 9a9e25740..227a8a93c 100644 --- a/watcher/decision_engine/strategy/strategies/zone_migration.py +++ b/watcher/decision_engine/strategy/strategies/zone_migration.py @@ -16,7 +16,7 @@ from dateutil.parser import parse from oslo_log import log -from cinderclient.v2.volumes import Volume +from cinderclient.v3.volumes import Volume from novaclient.v2.servers import Server from watcher._i18n import _ from watcher.common import cinder_helper diff --git a/watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py b/watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py index 6a9b820a1..4e6ecfbbc 100644 --- a/watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py +++ b/watcher/tests/decision_engine/strategy/strategies/test_zone_migration.py @@ -144,7 +144,7 @@ class TestZoneMigration(TestBaseStrategy): @staticmethod def fake_volume(**kwargs): - volume = mock.MagicMock(spec=cinderclient.v2.volumes.Volume) + volume = mock.MagicMock(spec=cinderclient.v3.volumes.Volume) volume.id = kwargs.get('id', utils.generate_uuid()) volume.name = kwargs.get('name', 'fake_name') volume.status = kwargs.get('status', 'available')