Skip to content

Commit 4b39368

Browse files
mriedemEric Fried
authored andcommitted
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
1 parent f1d742f commit 4b39368

2 files changed

Lines changed: 10 additions & 15 deletions

File tree

openstackclient/common/extension.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ def take_action(self, parsed_args):
8989
LOG.warning(message)
9090

9191
if parsed_args.compute or show_all:
92-
compute_client = self.app.client_manager.compute
92+
compute_client = self.app.client_manager.sdk_connection.compute
9393
try:
94-
data += compute_client.list_extensions.show_all()
94+
data += compute_client.extensions()
9595
except Exception:
9696
message = _("Extensions list not supported by Compute API")
9797
LOG.warning(message)

openstackclient/tests/unit/common/test_extension.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,9 @@ def setUp(self):
3636
self.identity_extensions_mock = identity_client.extensions
3737
self.identity_extensions_mock.reset_mock()
3838

39-
compute_client = compute_fakes.FakeComputev2Client(
40-
endpoint=fakes.AUTH_URL,
41-
token=fakes.AUTH_TOKEN,
42-
)
43-
self.app.client_manager.compute = compute_client
44-
compute_client.list_extensions = mock.Mock()
45-
self.compute_extensions_mock = compute_client.list_extensions
39+
sdk_connection = mock.Mock()
40+
self.app.client_manager.sdk_connection = sdk_connection
41+
self.compute_extensions_mock = sdk_connection.compute.extensions
4642
self.compute_extensions_mock.reset_mock()
4743

4844
volume_client = volume_fakes.FakeVolumeClient(
@@ -80,8 +76,7 @@ def setUp(self):
8076

8177
self.identity_extensions_mock.list.return_value = [
8278
self.identity_extension]
83-
self.compute_extensions_mock.show_all.return_value = [
84-
self.compute_extension]
79+
self.compute_extensions_mock.return_value = [self.compute_extension]
8580
self.volume_extensions_mock.show_all.return_value = [
8681
self.volume_extension]
8782
self.network_extensions_mock.return_value = [self.network_extension]
@@ -131,7 +126,7 @@ def test_extension_list_no_options(self):
131126
)
132127
self._test_extension_list_helper(arglist, verifylist, datalist)
133128
self.identity_extensions_mock.list.assert_called_with()
134-
self.compute_extensions_mock.show_all.assert_called_with()
129+
self.compute_extensions_mock.assert_called_with()
135130
self.volume_extensions_mock.show_all.assert_called_with()
136131
self.network_extensions_mock.assert_called_with()
137132

@@ -178,7 +173,7 @@ def test_extension_list_long(self):
178173
)
179174
self._test_extension_list_helper(arglist, verifylist, datalist, True)
180175
self.identity_extensions_mock.list.assert_called_with()
181-
self.compute_extensions_mock.show_all.assert_called_with()
176+
self.compute_extensions_mock.assert_called_with()
182177
self.volume_extensions_mock.show_all.assert_called_with()
183178
self.network_extensions_mock.assert_called_with()
184179

@@ -248,7 +243,7 @@ def test_extension_list_compute(self):
248243
self.compute_extension.description,
249244
), )
250245
self._test_extension_list_helper(arglist, verifylist, datalist)
251-
self.compute_extensions_mock.show_all.assert_called_with()
246+
self.compute_extensions_mock.assert_called_with()
252247

253248
def test_extension_list_compute_and_network(self):
254249
arglist = [
@@ -272,7 +267,7 @@ def test_extension_list_compute_and_network(self):
272267
),
273268
)
274269
self._test_extension_list_helper(arglist, verifylist, datalist)
275-
self.compute_extensions_mock.show_all.assert_called_with()
270+
self.compute_extensions_mock.assert_called_with()
276271
self.network_extensions_mock.assert_called_with()
277272

278273
def test_extension_list_volume(self):

0 commit comments

Comments
 (0)