Forget operation on SR inherently release the associated LUN

diff --git a/exec/testcases/xenserver/tc/install.py b/exec/testcases/xenserver/tc/install.py
index 89ff5830cadca2b5d7d7d1751ae1d08e70858e71..9aa1459ab00ba1baadb1e6cd9e330febde8bbf5f 100755 (executable)
--- a/exec/testcases/xenserver/tc/install.py
+++ b/exec/testcases/xenserver/tc/install.py
@@ -182,8 +182,8 @@ class TC9352(_HostInstall):
     def postRun(self):
         if self.iscsiSR:
             self.iscsiSR.release()
-        if self.fcLun:
-            self.fcLun.release()
+        if self.fcSR:
+            self.fcSR.forget() # which eventually release the LUN as well.
                 
 class TC12059(TC9352):
     """Install to a server with a boot disk on a SAN via Emulex HBAs with multipath root disk and single path SR"""

diff --git a/exec/testcases/xenserver/tc/lunpervdi.py b/exec/testcases/xenserver/tc/lunpervdi.py
index 43e1d35443cd3415257790519345b920e1024fa6..b2f6f4eeb4d3647ac86dd7180ce3bcb1035aac0b 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()
-        lun.release()
+        hba.forget() # which eventually release the LUN as well.
 
 class TC18373(LunPerVDI):
     """Verify whether DR feature works with LUN/VDI SR"""