From: Eric Harney <eharney@redhat.com>
Date: Fri, 24 May 2013 15:44:13 +0000 (-0400)
Subject: Don't throw ValueError for invalid volume id
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6c80ab5bdbf221b62faf0084c18d54daf3f2afa1;p=openstack-build%2Fcinder-build.git

Don't throw ValueError for invalid volume id

If a user runs something like "cinder-manage volume delete a1234",
a ValueError is thrown because it fails to cast to int.
Catch this and treat the parameter as an id which will result in a
later VolumeNotFound error rather than breaking this way.

Change-Id: I95a9b9d7628cebe4b6d855ea925b0ad3a5f1c4c4
---

diff --git a/bin/cinder-manage b/bin/cinder-manage
index 63f638fc4..8e0de60b6 100755
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
@@ -108,7 +108,10 @@ def param2id(object_id):
         # FIXME(ja): mapping occurs in nova?
         pass
     else:
-        return int(object_id)
+        try:
+            return int(object_id)
+        except ValueError:
+            return object_id
 
 
 class ShellCommands(object):