From fe667352c3e25c744a989ca45f4f9ed472778ae3 Mon Sep 17 00:00:00 2001
From: Armando Migliaccio <armando.migliaccio@citrix.com>
Date: Mon, 13 Dec 2010 18:43:24 +0000
Subject: removing imports that should have not been there

---
 nova/tests/virt_unittest.py |  3 ++-
 nova/virt/xenapi/fake.py    | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nova/tests/virt_unittest.py b/nova/tests/virt_unittest.py
index 611022632..1095662c3 100644
--- a/nova/tests/virt_unittest.py
+++ b/nova/tests/virt_unittest.py
@@ -317,7 +317,8 @@ class XenAPIVolumeTestCase(test.TrialTestCase):
         self.assertEqual(sr_ref, self.session.SR.FAKE_REF)
 
     def test_destroy_iscsi_storage(self):
-        pass
+        sr_ref = self.session.SR.FAKE_REF
+        self.helper.destroy_iscsi_storage_blocking(self.session, sr_ref)
 
     def test_introduce_vdi_raise_no_exception(self):
         sr_ref = self.session.SR.FAKE_REF
diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py
index 3a01f9c3d..2fed28609 100644
--- a/nova/virt/xenapi/fake.py
+++ b/nova/virt/xenapi/fake.py
@@ -1,6 +1,4 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-from twisted.web.domhelpers import _get
-from aptdaemon.defer import defer
 
 # Copyright (c) 2010 Citrix Systems, Inc.
 #
@@ -89,8 +87,10 @@ class FakeXenAPIObject(object):
             return self._create
         elif name == 'get_record':
             return self._record
-        elif name == 'introduce':
-            return self._introduce
+        elif name == 'introduce' or\
+        name == 'forget' or\
+        name == 'unplug':
+            return self._fake_action
         elif name.startswith('get_'):
             getter = 'get_%s' % self.name
             if name == getter:
@@ -110,7 +110,7 @@ class FakeXenAPIObject(object):
         self._check_fail()
         return FakeXenAPIRecord()
 
-    def _introduce(self, *args):
+    def _fake_action(self, *args):
         self._check_fail()
         pass
 
-- 
cgit