Fixes Bug #810149 that had an incomplete regex

openstack/nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Stephanie Reese

2011年07月15日 06:52:32 +00:00

committed by Tarmac

parent 168a2184b4 0aeec37c27

commit ad700b0ece

3 changed files with 35 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1
Authors

View File

@@ -87,6 +87,7 @@ Sandy Walsh <sandy.walsh@rackspace.com>

Sateesh Chodapuneedi <sateesh.chodapuneedi@citrix.com>

Scott Moser <smoser@ubuntu.com>

Soren Hansen <soren.hansen@rackspace.com>

Stephanie Reese <reese.sm@gmail.com>

Thierry Carrez <thierry@openstack.org>

Todd Willey <todd@ansolabs.com>

Trey Morris <trey.morris@rackspace.com>

13
nova/api/openstack/common.py

View File

@@ -137,15 +137,22 @@ def get_id_from_href(href):

def remove_version_from_href(href):

"""Removes the api version from the href.

"""Removes the first api version from the href.

Given: 'http://www.nova.com/v1.1/123'

Returns: 'http://www.nova.com/123'

Given: 'http://www.nova.com/v1.1'

Returns: 'http://www.nova.com'

"""

try:

#matches /v#.#

new_href = re.sub(r'[/][v][0-9]*.[0-9]*', '', href)

#removes the first instance that matches /v#.#/

new_href = re.sub(r'[/][v][0-9]+\.[0-9]+[/]', '/', href, count=1)

#if no version was found, try finding /v#.# at the end of the string

if new_href == href:

new_href = re.sub(r'[/][v][0-9]+\.[0-9]+$', '', href, count=1)

except:

LOG.debug(_("Error removing version from href: %s") % href)

msg = _('could not parse version from href')

24
nova/tests/api/openstack/test_common.py

View File

@@ -206,12 +206,36 @@ class MiscFunctionsTest(test.TestCase):

actual = common.remove_version_from_href(fixture)

self.assertEqual(actual, expected)

def test_remove_version_from_href_3(self):

fixture = 'http://www.testsite.com/v10.10'

expected = 'http://www.testsite.com'

actual = common.remove_version_from_href(fixture)

self.assertEqual(actual, expected)

def test_remove_version_from_href_4(self):

fixture = 'http://www.testsite.com/v1.1/images/v10.5'

expected = 'http://www.testsite.com/images/v10.5'

actual = common.remove_version_from_href(fixture)

self.assertEqual(actual, expected)

def test_remove_version_from_href_bad_request(self):

fixture = 'http://www.testsite.com/1.1/images'

self.assertRaises(ValueError,

common.remove_version_from_href,

fixture)

def test_remove_version_from_href_bad_request_2(self):

fixture = 'http://www.testsite.com/v/images'

self.assertRaises(ValueError,

common.remove_version_from_href,

fixture)

def test_remove_version_from_href_bad_request_3(self):

fixture = 'http://www.testsite.com/v1.1images'

self.assertRaises(ValueError,

common.remove_version_from_href,

fixture)

def test_get_id_from_href(self):

fixture = 'http://www.testsite.com/dir/45'

actual = common.get_id_from_href(fixture)