From 8ac235288bfab4b9311c50599d861fc5df53fe33 Mon Sep 17 00:00:00 2001
From: Liang Chen <cbjchen@cn.ibm.com>
Date: Fri, 31 May 2013 17:41:30 +0800
Subject: [PATCH] a minor fix to volume.py

There seems a typo with the exception name and the comment.

Change-Id: I5c0abe48c81a69e4b879b080236899031bb40e97
---
 heat/engine/resources/volume.py |  4 ++--
 heat/tests/test_volume.py       | 39 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/heat/engine/resources/volume.py b/heat/engine/resources/volume.py
index fea76fce..66a78deb 100644
--- a/heat/engine/resources/volume.py
+++ b/heat/engine/resources/volume.py
@@ -166,7 +166,7 @@ class VolumeAttachTask(object):
 
 
 class VolumeDetachTask(object):
-    """A task for attaching a volume to a Nova server."""
+    """A task for detaching a volume from a Nova server."""
 
     def __init__(self, stack, server_id, volume_id):
         """
@@ -194,7 +194,7 @@ class VolumeDetachTask(object):
 
         try:
             vol = self.clients.cinder().volumes.get(self.volume_id)
-        except clients.cinder_exceptions.NotFound:
+        except clients.cinderclient.exceptions.NotFound:
             logger.warning('%s - volume not found' % str(self))
             return
 
diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py
index 9a490bb2..61f0761c 100644
--- a/heat/tests/test_volume.py
+++ b/heat/tests/test_volume.py
@@ -318,6 +318,45 @@ class VolumeTest(HeatTestCase):
 
         self.m.VerifyAll()
 
+    def test_volume_detach_non_exist(self):
+        fv = FakeVolume('creating', 'available')
+        fva = FakeVolume('in-use', 'available')
+        stack_name = 'test_volume_detach_stack'
+
+        # volume create
+        clients.OpenStackClients.cinder().MultipleTimes().AndReturn(
+            self.cinder_fc)
+        self.cinder_fc.volumes.create(
+            size=u'1', availability_zone='nova',
+            display_description='%s.DataVolume' % stack_name,
+            display_name='%s.DataVolume' % stack_name).AndReturn(fv)
+
+        # create script
+        clients.OpenStackClients.nova().MultipleTimes().AndReturn(self.fc)
+        self.fc.volumes.create_server_volume(
+            device=u'/dev/vdc',
+            server_id=u'WikiDatabase',
+            volume_id=u'vol-123').AndReturn(fva)
+
+        self.cinder_fc.volumes.get('vol-123').AndReturn(fva)
+
+        # delete script
+        self.cinder_fc.volumes.get('vol-123').AndRaise(
+            clients.cinderclient.exceptions.NotFound('Not found'))
+
+        self.m.ReplayAll()
+
+        t = template_format.parse(volume_template)
+        t['Resources']['DataVolume']['Properties']['AvailabilityZone'] = 'nova'
+        stack = parse_stack(t, stack_name=stack_name)
+
+        scheduler.TaskRunner(stack['DataVolume'].create)()
+        rsrc = self.create_attachment(t, stack, 'MountPoint')
+
+        self.assertEqual(rsrc.delete(), None)
+
+        self.m.VerifyAll()
+
     @skipIf(volume_backups is None, 'unable to import volume_backups')
     def test_snapshot(self):
         stack_name = 'test_volume_stack'
-- 
2.45.2