Merge "compute: Workaround bug #2089821"

Zuul · openstack-gerrit · commit 83de58fa335d · 2024-12-10T14:03:49.000Z
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
@@ -714,7 +714,8 @@ def take_action(self, parsed_args):
         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 @@ def take_action(self, parsed_args):
         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
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -1165,7 +1165,7 @@ def test_server_add_security_group__nova_network(self):
             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 @@ def test_server_add_security_group(self):
             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 @@ def test_server_remove_security_group__nova_network(self):
             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 @@ def test_server_remove_security_group(self):
             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)
 

Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,7 @@ def test_server_add_security_group__nova_network(self):`
`1165`	`1165`	`self.server.id, ignore_missing=False`
`1166`	`1166`	`)`
`1167`	`1167`	`self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(`
`1168`		`- self.server, 'fake_sg'`
	`1168`	`+ self.server, {'name': 'fake_sg'}`
`1169`	`1169`	`)`
`1170`	`1170`	`mock_find_nova_net_sg.assert_called_once_with(`
`1171`	`1171`	`self.compute_sdk_client, 'fake_sg'`
`@@ -1186,7 +1186,7 @@ def test_server_add_security_group(self):`
`1186`	`1186`	`self.server.id, ignore_missing=False`
`1187`	`1187`	`)`
`1188`	`1188`	`self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(`
`1189`		`- self.server, 'fake_sg'`
	`1189`	`+ self.server, {'name': 'fake_sg'}`
`1190`	`1190`	`)`
`1191`	`1191`	`self.assertIsNone(result)`
`1192`	`1192`
`@@ -7454,7 +7454,7 @@ def test_server_remove_security_group__nova_network(self):`
`7454`	`7454`	`self.server.id, ignore_missing=False`
`7455`	`7455`	`)`
`7456`	`7456`	`self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(`
`7457`		`- self.server, 'fake_sg'`
	`7457`	`+ self.server, {'name': 'fake_sg'}`
`7458`	`7458`	`)`
`7459`	`7459`	`mock_find_nova_net_sg.assert_called_once_with(`
`7460`	`7460`	`self.compute_sdk_client, 'fake_sg'`
`@@ -7475,7 +7475,7 @@ def test_server_remove_security_group(self):`
`7475`	`7475`	`self.server.id, ignore_missing=False`
`7476`	`7476`	`)`
`7477`	`7477`	`self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(`
`7478`		`- self.server, 'fake_sg'`
	`7478`	`+ self.server, {'name': 'fake_sg'}`
`7479`	`7479`	`)`
`7480`	`7480`	`self.assertIsNone(result)`
`7481`	`7481`