Fixed BWD lunpervdi clean up issue.

diff --git a/exec/testcases/xenserver/tc/lunpervdi.py b/exec/testcases/xenserver/tc/lunpervdi.py
index b2f6f4eeb4d3647ac86dd7180ce3bcb1035aac0b..a347dcc03c348249e9defeb169f4030fea8c5df4 100755 (executable)
--- a/exec/testcases/xenserver/tc/lunpervdi.py
+++ b/exec/testcases/xenserver/tc/lunpervdi.py
@@ -995,7 +995,7 @@ class TC18372(LunPerVDI):
 
         step("Cleaning up")  
         self.pool.disableHA()
-        hba.forget() # which eventually release the LUN as well.
+        hba.remove()
 
 class TC18373(LunPerVDI):
     """Verify whether DR feature works with LUN/VDI SR"""

diff --git a/exec/xenrt/lib/xenserver/sr.py b/exec/xenrt/lib/xenserver/sr.py
index a4433614d0ab5c89c6ac68f8b037a7eecd2b6a36..20a5b26619be78033e881b1e853871be7001ab9a 100644 (file)
--- a/exec/xenrt/lib/xenserver/sr.py
+++ b/exec/xenrt/lib/xenserver/sr.py
@@ -1378,19 +1378,19 @@ class HBAStorageRepository(StorageRepository):
             slave.enableMultipathing()
 
     def destroy(self, release=True):
-        StorageRepository.destroy(self)
+        super(HBAStorageRepository, self).destroy()
         if release and self.lun:
             self.lun.release()
             self.lun = None
 
     def forget(self, release=True):
-        StorageRepository.forget(self)
+        super(HBAStorageRepository, self).forget()
         if release and self.lun:
             self.lun.release()
             self.lun = None
 
     def remove(self, release=True):
-        StorageRepository.remove(self)
+        super(HBAStorageRepository, self).remove()
         if release and self.lun:
             self.lun.release()
             self.lun = None