Merge branch 'dev' into staging

simple_vm_client/openstack_connector/openstack_connector.py

@@ -1316,6 +1316,23 @@ def stop_server(self, openstack_id: str) -> None:
             logger.exception(f"Stop Server {openstack_id} failed!")
             raise OpenStackConflictException(message=e.message)
 
+    def _delete_security_groups_if_not_used(self, security_groups: list[SecurityGroup]):
+        if security_groups is not None:
+            for sg in security_groups:
+                sec = self.openstack_connection.get_security_group(
+                    name_or_id=sg["name"]
+                )
+                if sg[
+                    "name"
+                ] != self.DEFAULT_SECURITY_GROUP_NAME and not self.is_security_group_in_use(
+                    security_group_id=sec.id
+                ):
+                    logger.info(f"Delete security group {sec}")
+                    try:
+                        self.openstack_connection.delete_security_group(sec)
+                    except ResourceNotFound:
+                        logger.info(f"Could not delete security group {sec.id}")
+
     def _remove_security_groups_from_server(self, server: Server) -> None:
         security_groups = server.security_groups
 
@@ -1363,9 +1380,13 @@ def delete_server(self, openstack_id: str) -> None:
                 )
 
             self._validate_server_for_deletion(server=server)
-            self._remove_security_groups_from_server(server=server)
+
+            logger.info(f"Start deleting Server {openstack_id}")
             self.openstack_connection.compute.delete_server(server.id, force=True)
 
+            security_groups = server.security_groups
+            self._delete_security_groups_if_not_used(security_groups)
+
         except ConflictException as e:
             logger.exception(f"Delete Server {openstack_id} failed!")