Addressing Dan's review comments

diff --git a/exec/testcases/xenserver/tc/maxima.py b/exec/testcases/xenserver/tc/maxima.py
index 7a85681681244f5969e878d7df2a4192a3235fd5..f14ca24495a0d08e2e631cb02275f42afe016c46 100755 (executable)
--- a/exec/testcases/xenserver/tc/maxima.py
+++ b/exec/testcases/xenserver/tc/maxima.py
@@ -398,14 +398,6 @@ class _VDIPerVM(xenrt.TestCase):
         self.vdis = []
         self.cli = None
         
-    def vbdTypeCDDestroy(self):
-        cd_vbds = self.host.minimalList("vbd-list",args="vm-uuid=%s type=CD" % 
-                                                       (self.guest.getUUID()))
-        for vbd in cd_vbds:
-            if self.host.genParamGet("vbd",vbd,"currently-attached") == "true":
-                self.cli.execute("vbd-unplug", "uuid=%s" % (vbd))
-                self.cli.execute("vbd-destroy", "uuid=%s" % (vbd))
-    
     def prepare(self, arglist=None):
         # Get a host to install on
         self.host = self.getDefaultHost()
@@ -505,11 +497,6 @@ class _VDIPerVM(xenrt.TestCase):
                 self.cli.execute("vdi-destroy uuid=%s" % (vdi))
             except:
                 xenrt.TEC().warning("Exception destroying VDI %s" % (vdi))
-        # Delete Virtual CD drive
-        try:
-            self.vbdTypeCDDestroy()
-        except:
-            xenrt.TEC().warning("Exception destroying Virtual CD")
         del self.vdis[:]
 
 class TC18842(_VDIPerVM):

diff --git a/exec/xenrt/lib/xenserver/guest.py b/exec/xenrt/lib/xenserver/guest.py
index 8c63e4e80179286a5a4604bd712787374a1d0ed2..0d4ee26dff6b7af223c691e5f8183687c4888f4a 100755 (executable)
--- a/exec/xenrt/lib/xenserver/guest.py
+++ b/exec/xenrt/lib/xenserver/guest.py
@@ -2114,7 +2114,7 @@ exit /B 1
                 args.append("cd-name=\"%s\"" % (isoname))
                 cli.execute("vm-cd-insert", string.join(args))
 
-    def removeCD(self, device=None):
+    def removeCD(self):
         """Remove the CD device from the VM."""
         cli = self.getCLIInstance()
         
@@ -2125,8 +2125,6 @@ exit /B 1
                 args.append("uuid=%s" % (self.getUUID()))
                 cli.execute("vm-cd-eject", string.join(args))
         
-       
-        
 
     def createVIF(self, eth=None, bridge=None, mac=None, plug=False):
         if bridge:
@@ -4111,7 +4109,7 @@ exit /B 1
         self.enlightenedDrivers=True
         self.execguest("umount /mnt")
         xenrt.sleep(10)
-        self.removeCD(device=device)
+        self.removeCD()
         
         if reboot or ((self.distro and (self.distro.startswith("centos4") or self.distro.startswith("rhel4"))) and updateKernel):
             # RHEL/CentOS 4.x update the kernel, so need to be rebooted