diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-11 15:30:43 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-11 15:30:43 -0400 |
| commit | 45d6ab8ffec6ff4b26500df7049ce4092b15f00c (patch) | |
| tree | 6ae8616667cb9f3fa38dbed9af7ec64c9016b651 /nova/api | |
| parent | fe0bde67193ce76376e72a7263b89240a63722a8 (diff) | |
| download | nova-45d6ab8ffec6ff4b26500df7049ce4092b15f00c.tar.gz nova-45d6ab8ffec6ff4b26500df7049ce4092b15f00c.tar.xz nova-45d6ab8ffec6ff4b26500df7049ce4092b15f00c.zip | |
fixing id parsing
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/common.py | 9 |
1 files changed, 6 insertions, 3 deletions
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')) |