openstack/python-openstackclient
Code Issues Proposed changes

Merge "compute: Workaround bug #2089821"

Browse Source
This commit is contained in:
Zuul 2024-12-10 14:03:49 +00:00 committed by Gerrit Code Review
commit 83de58fa33
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstackclient/compute/v2/server.py
View File

@ -714,7 +714,8 @@ class AddServerSecurityGroup(command.Command):
for security_group in security_groups:
try:
compute_client.add_security_group_to_server(
server, security_group
server,
{'name': security_group},
)
except sdk_exceptions.HttpException as e:
errors += 1
@ -4097,7 +4098,8 @@ class RemoveServerSecurityGroup(command.Command):
for security_group in security_groups:
try:
compute_client.remove_security_group_from_server(
server, security_group
server,
{'name': security_group},
)
except sdk_exceptions.HttpException as e:
errors += 1

8
openstackclient/tests/unit/compute/v2/test_server.py
View File

@ -1165,7 +1165,7 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2):
self.server.id, ignore_missing=False
)
self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(
self.server, 'fake_sg'
self.server, {'name': 'fake_sg'}
)
mock_find_nova_net_sg.assert_called_once_with(
self.compute_sdk_client, 'fake_sg'
@ -1186,7 +1186,7 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2):
self.server.id, ignore_missing=False
)
self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(
self.server, 'fake_sg'
self.server, {'name': 'fake_sg'}
)
self.assertIsNone(result)
@ -7454,7 +7454,7 @@ class TestServerRemoveSecurityGroup(TestServer):
self.server.id, ignore_missing=False
)
self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(
self.server, 'fake_sg'
self.server, {'name': 'fake_sg'}
)
mock_find_nova_net_sg.assert_called_once_with(
self.compute_sdk_client, 'fake_sg'
@ -7475,7 +7475,7 @@ class TestServerRemoveSecurityGroup(TestServer):
self.server.id, ignore_missing=False
)
self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(
self.server, 'fake_sg'
self.server, {'name': 'fake_sg'}
)
self.assertIsNone(result)