diff options
| author | Matt Riedemann <mriedem.os@gmail.com> | 2019-10-24 13:58:12 -0400 |
|---|---|---|
| committer | Eric Fried <openstack@fried.cc> | 2019-10-31 16:48:29 +0000 |
| commit | 4b393681d98e6a78248f6fa36e576a9f09c4ee34 (patch) | |
| tree | bac2a4a0ec11b26855c6ab807a5b8d18110c17a6 /openstackclient/tests/unit/common | |
| parent | f1d742f32adeb662a3fdf8fa3ef3bc391e71ed81 (diff) | |
| download | python-openstackclient-4b393681d98e6a78248f6fa36e576a9f09c4ee34.tar.gz | |
Use SDK to get compute API extensions
python-novaclient 16.0.0 removed the deprecated
list_extensions module [1] so this changes the
extensions command to use openstacksdk to get the
compute API extensions.
The functional test ExtensionTests.test_extension_list_compute
ensures this works.
[1] https://review.opendev.org/686516/
Change-Id: I9894bc395c0474aaa6494ac4534862efe4ea7984
Story: #2006769
Task: #37284
Diffstat (limited to 'openstackclient/tests/unit/common')
| -rw-r--r-- | openstackclient/tests/unit/common/test_extension.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/openstackclient/tests/unit/common/test_extension.py b/openstackclient/tests/unit/common/test_extension.py index eefa814c..87c62da4 100644 --- a/openstackclient/tests/unit/common/test_extension.py +++ b/openstackclient/tests/unit/common/test_extension.py @@ -36,13 +36,9 @@ class TestExtension(utils.TestCommand): self.identity_extensions_mock = identity_client.extensions self.identity_extensions_mock.reset_mock() - compute_client = compute_fakes.FakeComputev2Client( - endpoint=fakes.AUTH_URL, - token=fakes.AUTH_TOKEN, - ) - self.app.client_manager.compute = compute_client - compute_client.list_extensions = mock.Mock() - self.compute_extensions_mock = compute_client.list_extensions + sdk_connection = mock.Mock() + self.app.client_manager.sdk_connection = sdk_connection + self.compute_extensions_mock = sdk_connection.compute.extensions self.compute_extensions_mock.reset_mock() volume_client = volume_fakes.FakeVolumeClient( @@ -80,8 +76,7 @@ class TestExtensionList(TestExtension): self.identity_extensions_mock.list.return_value = [ self.identity_extension] - self.compute_extensions_mock.show_all.return_value = [ - self.compute_extension] + self.compute_extensions_mock.return_value = [self.compute_extension] self.volume_extensions_mock.show_all.return_value = [ self.volume_extension] self.network_extensions_mock.return_value = [self.network_extension] @@ -131,7 +126,7 @@ class TestExtensionList(TestExtension): ) self._test_extension_list_helper(arglist, verifylist, datalist) self.identity_extensions_mock.list.assert_called_with() - self.compute_extensions_mock.show_all.assert_called_with() + self.compute_extensions_mock.assert_called_with() self.volume_extensions_mock.show_all.assert_called_with() self.network_extensions_mock.assert_called_with() @@ -178,7 +173,7 @@ class TestExtensionList(TestExtension): ) self._test_extension_list_helper(arglist, verifylist, datalist, True) self.identity_extensions_mock.list.assert_called_with() - self.compute_extensions_mock.show_all.assert_called_with() + self.compute_extensions_mock.assert_called_with() self.volume_extensions_mock.show_all.assert_called_with() self.network_extensions_mock.assert_called_with() @@ -248,7 +243,7 @@ class TestExtensionList(TestExtension): self.compute_extension.description, ), ) self._test_extension_list_helper(arglist, verifylist, datalist) - self.compute_extensions_mock.show_all.assert_called_with() + self.compute_extensions_mock.assert_called_with() def test_extension_list_compute_and_network(self): arglist = [ @@ -272,7 +267,7 @@ class TestExtensionList(TestExtension): ), ) self._test_extension_list_helper(arglist, verifylist, datalist) - self.compute_extensions_mock.show_all.assert_called_with() + self.compute_extensions_mock.assert_called_with() self.network_extensions_mock.assert_called_with() def test_extension_list_volume(self): |