update test about cinderclient v1

Cinderclient removed support for Cinder v1 API
Closes-Bug: #1844094
https://review.opendev.org/#/c/653813/

Change-Id: I58c026f66ff210983367d0c98096347f7207c9fd
This commit is contained in:
licanwei
2019-09-16 15:18:32 +08:00
parent 696d5d1fb5
commit 31460ac412

View File

@@ -13,7 +13,7 @@
from ceilometerclient import client as ceclient from ceilometerclient import client as ceclient
import ceilometerclient.v2.client as ceclient_v2 import ceilometerclient.v2.client as ceclient_v2
from cinderclient import client as ciclient from cinderclient import client as ciclient
from cinderclient.v1 import client as ciclient_v1 from cinderclient.v3 import client as ciclient_v3
from glanceclient import client as glclient from glanceclient import client as glclient
from gnocchiclient import client as gnclient from gnocchiclient import client as gnclient
from gnocchiclient.v1 import client as gnclient_v1 from gnocchiclient.v1 import client as gnclient_v1
@@ -248,11 +248,11 @@ class TestClients(base.TestCase):
@mock.patch.object(clients.OpenStackClients, 'session') @mock.patch.object(clients.OpenStackClients, 'session')
def test_clients_cinder_diff_vers(self, mock_session): def test_clients_cinder_diff_vers(self, mock_session):
CONF.set_override('api_version', '1', group='cinder_client') CONF.set_override('api_version', '3', group='cinder_client')
osc = clients.OpenStackClients() osc = clients.OpenStackClients()
osc._cinder = None osc._cinder = None
osc.cinder() osc.cinder()
self.assertEqual(ciclient_v1.Client, type(osc.cinder())) self.assertEqual(ciclient_v3.Client, type(osc.cinder()))
@mock.patch.object(clients.OpenStackClients, 'session') @mock.patch.object(clients.OpenStackClients, 'session')
def test_clients_cinder_diff_endpoint(self, mock_session): def test_clients_cinder_diff_endpoint(self, mock_session):