From ae4330a8823fdca3259c982b25983a85c0515873 Mon Sep 17 00:00:00 2001
From: zhencliu <zhencliu@redhat.com>
Date: Tue, 18 Aug 2020 10:00:03 +0800
Subject: [PATCH] Remove images in two ways

Signed-off-by: Zhenchao Liu <zhencliu@redhat.com>
---
 provider/blockdev_base.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/provider/blockdev_base.py b/provider/blockdev_base.py
index bfa1452a..3fdd5e5b 100644
--- a/provider/blockdev_base.py
+++ b/provider/blockdev_base.py
@@ -210,6 +210,10 @@ class BlockdevBaseTest(object):
         """
         for img in set(self.trash):
             try:
+                # A QemuImg object
                 img.remove()
+            except AttributeError:
+                # A StorageVolume object
+                sp_admin.remove_volume(img)
             except Exception as e:
                 logging.warn(str(e))
-- 
GitLab