compute: Workaround bug #2089821

stephenfin · Ilia Petrov · commit f9cc9013ae72 · 2025-10-15T16:30:50.000+03:00
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)
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
@@ -701,7 +701,10 @@ def take_action(self, parsed_args):
             security_group = compute_v2.find_security_group(
                 compute_client, parsed_args.group
             )['name']
-        compute_client.add_security_group_to_server(server, security_group)
+        compute_client.add_security_group_to_server(
+            server,
+            {'name': security_group},
+        )
 
 
 class AddServerVolume(command.ShowOne):
@@ -4039,7 +4042,8 @@ def take_action(self, parsed_args):
                 compute_client, parsed_args.group
             )['name']
         compute_client.remove_security_group_from_server(
-            server, security_group
+            server,
+            {'name': security_group},
         )
 
 
diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -1186,7 +1186,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'
@@ -1207,7 +1207,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)
 
@@ -7394,7 +7394,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'
@@ -7415,7 +7415,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
`@@ -1186,7 +1186,7 @@ def test_server_add_security_group__nova_network(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`	`mock_find_nova_net_sg.assert_called_once_with(`
`1192`	`1192`	`self.compute_sdk_client, 'fake_sg'`
`@@ -1207,7 +1207,7 @@ def test_server_add_security_group(self):`
`1207`	`1207`	`self.server.id, ignore_missing=False`
`1208`	`1208`	`)`
`1209`	`1209`	`self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(`
`1210`		`- self.server, 'fake_sg'`
	`1210`	`+ self.server, {'name': 'fake_sg'}`
`1211`	`1211`	`)`
`1212`	`1212`	`self.assertIsNone(result)`
`1213`	`1213`
`@@ -7394,7 +7394,7 @@ def test_server_remove_security_group__nova_network(self):`
`7394`	`7394`	`self.server.id, ignore_missing=False`
`7395`	`7395`	`)`
`7396`	`7396`	`self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(`
`7397`		`- self.server, 'fake_sg'`
	`7397`	`+ self.server, {'name': 'fake_sg'}`
`7398`	`7398`	`)`
`7399`	`7399`	`mock_find_nova_net_sg.assert_called_once_with(`
`7400`	`7400`	`self.compute_sdk_client, 'fake_sg'`
`@@ -7415,7 +7415,7 @@ def test_server_remove_security_group(self):`
`7415`	`7415`	`self.server.id, ignore_missing=False`
`7416`	`7416`	`)`
`7417`	`7417`	`self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(`
`7418`		`- self.server, 'fake_sg'`
	`7418`	`+ self.server, {'name': 'fake_sg'}`
`7419`	`7419`	`)`
`7420`	`7420`	`self.assertIsNone(result)`
`7421`	`7421`