From 73e1126bc05e22688ff9ccfa62ebaa5a1c6412ea Mon Sep 17 00:00:00 2001
From: Armando Migliaccio <armando.migliaccio@citrix.com>
Date: Thu, 16 Dec 2010 18:44:42 +0000
Subject: [PATCH] reviewed the FIXMEs, and spotted an uncaught exception in
 volume_utils...yay!

---
 nova/tests/virt_unittest.py   |  2 --
 nova/tests/xenapi/stubs.py    | 24 +++++++++---------------
 nova/tests/xenapi_unittest.py |  5 ++---
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/nova/tests/virt_unittest.py b/nova/tests/virt_unittest.py
index 52843b70..d49383fb 100644
--- a/nova/tests/virt_unittest.py
+++ b/nova/tests/virt_unittest.py
@@ -25,8 +25,6 @@ from nova import utils
 from nova.api.ec2 import cloud
 from nova.auth import manager
 from nova.virt import libvirt_conn
-from nova.virt.xenapi import fake
-from nova.virt.xenapi import volume_utils
 
 FLAGS = flags.FLAGS
 flags.DECLARE('instances_path', 'nova.compute.manager')
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 52518938..11dd535d 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -58,21 +58,12 @@ class FakeSessionForVolumeTests(fake.SessionBase):
     def __init__(self, uri):
         super(FakeSessionForVolumeTests, self).__init__(uri)
 
-    def VBD_plug(self, _1, _2):
-        #FIXME(armando):make proper plug
-        pass
-
-    def PBD_unplug(self, _1, _2):
-        #FIXME(armando):make proper unplug
-        pass
-
-    def SR_forget(self, _1, _2):
-        #FIXME(armando):make proper forget
-        pass
+    def VBD_plug(self, _1, ref):
+        rec = fake.get_record('VBD', ref)
+        rec['currently-attached'] = True
 
     def VDI_introduce(self, _1, uuid, _2, _3, _4, _5,
                       _6, _7, _8, _9, _10, _11):
-        #FIXME(armando):make proper introduce
         valid_vdi = False
         refs = fake.get_all('VDI')
         for ref in refs:
@@ -93,6 +84,9 @@ class FakeSessionForVolumeFailedTests(FakeSessionForVolumeTests):
         # This is for testing failure
         raise fake.Failure([['INVALID_VDI', 'session', self._session]])
 
-    def VBD_plug(self, _1, _2):
-        # This is for testing failure
-        raise fake.Failure([['INVALID_VBD', 'session', self._session]])
+    def PBD_unplug(self, _1, ref):
+        rec = fake.get_record('PBD', ref)
+        rec['currently-attached'] = False
+
+    def SR_forget(self, _1, ref):
+        pass
diff --git a/nova/tests/xenapi_unittest.py b/nova/tests/xenapi_unittest.py
index c2612a4c..839d6aa4 100644
--- a/nova/tests/xenapi_unittest.py
+++ b/nova/tests/xenapi_unittest.py
@@ -141,14 +141,13 @@ class XenAPIVolumeTestCase(test.TrialTestCase):
         result = conn.attach_volume(instance.name, volume['ec2_id'],
                                     '/dev/sdc')
 
-        def check(exc):
+        def check_exception(exc):
             """ handler """
             if exc:
                 pass
             else:
                 self.fail('Oops, no exception has been raised!')
-
-        result.addErrback(check)
+        result.addErrback(check_exception)
         return result
 
     def tearDown(self):