From 1f349440f9f1dae44e765eb90c5c285fc71f1a54 Mon Sep 17 00:00:00 2001
From: Dan Smith <dansmith@redhat.com>
Date: Tue, 22 Apr 2014 11:21:12 -0700
Subject: [PATCH] Fix a typo in compute/manager::remove_volume_connection()

A typo made in the placement of a paren in a recent refactoring
resulted in definitely broken code. Unfortunately, this was not
in a tested path and so went unnoticed. This adds a test and fixes
the problem.

Change-Id: Id24169894ffda6da0301d1dc38b2f2bb29ebbd58
---
 nova/compute/manager.py                |  7 ++++---
 nova/tests/compute/test_compute_mgr.py | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index ca1e0a848b24..4030a9988724 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -4363,9 +4363,10 @@ class ComputeManager(manager.Manager):
         try:
             bdm = block_device_obj.BlockDeviceMapping.get_by_volume_id(
                     context, volume_id)
-            self._detach_volume(context,
-                                instance_obj.Instance._from_db_object(
-                                    context, instance, bdm))
+            inst_obj = instance_obj.Instance._from_db_object(
+                context, instance_obj.Instance(),
+                instance)
+            self._detach_volume(context, inst_obj, bdm)
             connector = self.driver.get_volume_connector(instance)
             self.volume_api.terminate_connection(context, volume_id, connector)
         except exception.NotFound:
diff --git a/nova/tests/compute/test_compute_mgr.py b/nova/tests/compute/test_compute_mgr.py
index 4ade10e59184..2608fad0d6d8 100644
--- a/nova/tests/compute/test_compute_mgr.py
+++ b/nova/tests/compute/test_compute_mgr.py
@@ -1194,6 +1194,20 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
             self.assertFalse(allow_reboot)
             self.assertEqual(reboot_type, 'HARD')
 
+    @mock.patch('nova.objects.block_device.BlockDeviceMapping.'
+                'get_by_volume_id')
+    @mock.patch('nova.compute.manager.ComputeManager._detach_volume')
+    @mock.patch('nova.objects.instance.Instance._from_db_object')
+    def test_remove_volume_connection(self, inst_from_db, detach, bdm_get):
+        bdm = mock.sentinel.bdm
+        inst_obj = mock.sentinel.inst_obj
+        bdm_get.return_value = bdm
+        inst_from_db.return_value = inst_obj
+        with mock.patch.object(self.compute, 'volume_api'):
+            self.compute.remove_volume_connection(self.context, 'vol',
+                                                  {'uuid': 'fake-inst'})
+        detach.assert_called_once_with(self.context, inst_obj, bdm)
+
 
 class ComputeManagerBuildInstanceTestCase(test.NoDBTestCase):
     def setUp(self):