From 6c80ab5bdbf221b62faf0084c18d54daf3f2afa1 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Fri, 24 May 2013 11:44:13 -0400 Subject: [PATCH] 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 --- bin/cinder-manage | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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): -- 2.45.2