Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f9cc901

Browse filesBrowse files
stephenfinIlia Petrov
authored andcommitted
compute: Workaround bug #2089821
By passing a dict instead of a single value, we force SDK to populate the correct attribute on the object. Also fixed conflicts in openstackclient/compute/v2/server.py added by ece30e8 Change-Id: I9f4c5964dc0546215474c92db567966ffad68a1a Signed-off-by: Stephen Finucane <stephenfin@redhat.com> Related-bug: #2089821 (cherry picked from commit 22b30b9)
1 parent 8390467 commit f9cc901
Copy full SHA for f9cc901

2 files changed

+10-6Lines changed: 10 additions & 6 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎openstackclient/compute/v2/server.py‎

Copy file name to clipboardExpand all lines: openstackclient/compute/v2/server.py
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,10 @@ def take_action(self, parsed_args):
701701
security_group = compute_v2.find_security_group(
702702
compute_client, parsed_args.group
703703
)['name']
704-
compute_client.add_security_group_to_server(server, security_group)
704+
compute_client.add_security_group_to_server(
705+
server,
706+
{'name': security_group},
707+
)
705708

706709

707710
class AddServerVolume(command.ShowOne):
@@ -4039,7 +4042,8 @@ def take_action(self, parsed_args):
40394042
compute_client, parsed_args.group
40404043
)['name']
40414044
compute_client.remove_security_group_from_server(
4042-
server, security_group
4045+
server,
4046+
{'name': security_group},
40434047
)
40444048

40454049

Collapse file

‎openstackclient/tests/unit/compute/v2/test_server.py‎

Copy file name to clipboardExpand all lines: openstackclient/tests/unit/compute/v2/test_server.py
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,7 @@ def test_server_add_security_group__nova_network(self):
11861186
self.server.id, ignore_missing=False
11871187
)
11881188
self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(
1189-
self.server, 'fake_sg'
1189+
self.server, {'name': 'fake_sg'}
11901190
)
11911191
mock_find_nova_net_sg.assert_called_once_with(
11921192
self.compute_sdk_client, 'fake_sg'
@@ -1207,7 +1207,7 @@ def test_server_add_security_group(self):
12071207
self.server.id, ignore_missing=False
12081208
)
12091209
self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(
1210-
self.server, 'fake_sg'
1210+
self.server, {'name': 'fake_sg'}
12111211
)
12121212
self.assertIsNone(result)
12131213

@@ -7394,7 +7394,7 @@ def test_server_remove_security_group__nova_network(self):
73947394
self.server.id, ignore_missing=False
73957395
)
73967396
self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(
7397-
self.server, 'fake_sg'
7397+
self.server, {'name': 'fake_sg'}
73987398
)
73997399
mock_find_nova_net_sg.assert_called_once_with(
74007400
self.compute_sdk_client, 'fake_sg'
@@ -7415,7 +7415,7 @@ def test_server_remove_security_group(self):
74157415
self.server.id, ignore_missing=False
74167416
)
74177417
self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(
7418-
self.server, 'fake_sg'
7418+
self.server, {'name': 'fake_sg'}
74197419
)
74207420
self.assertIsNone(result)
74217421

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.