compute: Workaround bug #2089821

stephenfin · stephenfin · commit 22b30b99ce0e · 2024-12-09T13:56:58.000Z
By passing a dict instead of a single value, we force SDK to populate
the correct attribute on the object.

Change-Id: I9f4c5964dc0546215474c92db567966ffad68a1a
Signed-off-by: Stephen Finucane &lt;stephenfin@redhat.com&gt;
Related-bug: #2089821
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
@@ -4083,7 +4084,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)
 
@@ -7400,7 +7400,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'
@@ -7421,7 +7421,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`
`@@ -7400,7 +7400,7 @@ def test_server_remove_security_group__nova_network(self):`
`7400`	`7400`	`self.server.id, ignore_missing=False`
`7401`	`7401`	`)`
`7402`	`7402`	`self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(`
`7403`		`- self.server, 'fake_sg'`
	`7403`	`+ self.server, {'name': 'fake_sg'}`
`7404`	`7404`	`)`
`7405`	`7405`	`mock_find_nova_net_sg.assert_called_once_with(`
`7406`	`7406`	`self.compute_sdk_client, 'fake_sg'`
`@@ -7421,7 +7421,7 @@ def test_server_remove_security_group(self):`
`7421`	`7421`	`self.server.id, ignore_missing=False`
`7422`	`7422`	`)`
`7423`	`7423`	`self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(`
`7424`		`- self.server, 'fake_sg'`
	`7424`	`+ self.server, {'name': 'fake_sg'}`
`7425`	`7425`	`)`
`7426`	`7426`	`self.assertIsNone(result)`
`7427`	`7427`