From 45d6ab8ffec6ff4b26500df7049ce4092b15f00c Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 11 Aug 2011 15:30:43 -0400
Subject: fixing id parsing

---
 nova/api/openstack/common.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index dfdd62201..23614d598 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -169,10 +169,13 @@ def get_id_from_href(href):
     Returns: 123
 
     """
-    if re.match(r'\d+$', str(href)):
-        return int(href)
     try:
-        return int(urlparse.urlsplit(href).path.split('/')[-1])
+        href = str(href)
+
+        if re.match(r'\d+$', href):
+            return int(href)
+        else:
+            return int(urlparse.urlsplit(href).path.split('/')[-1])
     except ValueError, e:
         LOG.debug(_("Error extracting id from href: %s") % href)
         raise ValueError(_('could not parse id from href'))
-- 
cgit