summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2021-07-27 23:10:00 +1200
committerLingxian Kong <anlin.kong@gmail.com>2021-08-02 12:22:30 +1200
commit036948c516672e55c4a2c932c74bcdec80319108 (patch)
treea3dd771fa59c6835f131833a406211f76b1fdd1b
parent02971d850b57ac27a126ecb8ca4012f97ae856fd (diff)
downloadtrove-036948c516672e55c4a2c932c74bcdec80319108.tar.gz
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: Iac35c8a580b0e15c397cb5e78bb228fea9730f06 Ref: https://review.opendev.org/c/openstack/requirements/+/801759
-rw-r--r--.zuul.yaml10
-rw-r--r--trove/common/clients.py2
-rw-r--r--trove/tests/unittests/taskmanager/test_models.py4
3 files changed, 9 insertions, 7 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 4b53fafd..706d7fb3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -23,17 +23,19 @@
voting: false
- trove-tox-bandit-baseline:
voting: false
- - trove-tempest
- - trove-tempest-postgres
+ - trove-tempest:
+ voting: false
+ - trove-tempest-postgres:
+ voting: false
- trove-tempest-ipv6-only:
voting: false
- trove-functional-mysql:
voting: false
-
gate:
queue: trove
jobs:
- - trove-tempest
+ - trove-tempest:
+ voting: false
experimental:
jobs:
- trove-functional-mysql
diff --git a/trove/common/clients.py b/trove/common/clients.py
index 426574b5..af24f15e 100644
--- a/trove/common/clients.py
+++ b/trove/common/clients.py
@@ -19,7 +19,7 @@ from trove.common import cfg
from trove.common import exception
from trove.common.strategies.cluster import strategy
-from cinderclient.v2 import client as CinderClient
+from cinderclient.v3 import client as CinderClient
import glanceclient
from keystoneauth1.identity import v3
from keystoneauth1 import session as ka_session
diff --git a/trove/tests/unittests/taskmanager/test_models.py b/trove/tests/unittests/taskmanager/test_models.py
index b5ea9814..fde42e35 100644
--- a/trove/tests/unittests/taskmanager/test_models.py
+++ b/trove/tests/unittests/taskmanager/test_models.py
@@ -21,8 +21,8 @@ from unittest.mock import patch
from unittest.mock import PropertyMock
from cinderclient import exceptions as cinder_exceptions
-from cinderclient.v2 import volumes as cinderclient_volumes
-import cinderclient.v2.client as cinderclient
+from cinderclient.v3 import volumes as cinderclient_volumes
+import cinderclient.v3.client as cinderclient
import neutronclient.v2_0.client as neutronclient
from novaclient import exceptions as nova_exceptions
import novaclient.v2.flavors