diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-23 18:22:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-23 18:22:25 +0000 |
| commit | 2736b2d493e5129257061739d339d4cd4d8a5f25 (patch) | |
| tree | 9990b789b6faf7f5018ac5f40b1e0df9ab8bf34b | |
| parent | 041b97dc3d2dde7f0a0c8c175f723e36feae8777 (diff) | |
| parent | 2d2ebd676a81a0443824990a710eda4df72b9987 (diff) | |
| download | nova-2736b2d493e5129257061739d339d4cd4d8a5f25.tar.gz nova-2736b2d493e5129257061739d339d4cd4d8a5f25.tar.xz nova-2736b2d493e5129257061739d339d4cd4d8a5f25.zip | |
Merge "Making link prefixes support https."
| -rw-r--r-- | nova/api/openstack/common.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/test_images.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index 575c58fac..92ef17687 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -488,5 +488,5 @@ class ViewBuilder(object): return orig_url url_parts = list(urlparse.urlsplit(orig_url)) prefix_parts = list(urlparse.urlsplit(prefix)) - url_parts[1] = prefix_parts[1] + url_parts[0:2] = prefix_parts[0:2] return urlparse.urlunsplit(url_parts) diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py index 460bf437f..660345031 100644 --- a/nova/tests/api/openstack/compute/test_images.py +++ b/nova/tests/api/openstack/compute/test_images.py @@ -122,12 +122,12 @@ class ImagesControllerTest(test.TestCase): self.assertDictMatch(expected_image, actual_image) def test_get_image_with_custom_prefix(self): - self.flags(osapi_compute_link_prefix='http://zoo.com:42', + self.flags(osapi_compute_link_prefix='https://zoo.com:42', osapi_glance_link_prefix='http://circus.com:34') fake_req = fakes.HTTPRequest.blank('/v2/fake/images/123') actual_image = self.controller.show(fake_req, '124') - href = "http://zoo.com:42/v2/fake/images/124" - bookmark = "http://zoo.com:42/fake/images/124" + href = "https://zoo.com:42/v2/fake/images/124" + bookmark = "https://zoo.com:42/fake/images/124" alternate = "http://circus.com:34/fake/images/124" server_uuid = "aa640691-d1a7-4a67-9d3c-d35ee6b3cc74" server_href = "http://localhost/v2/servers/" + server_uuid |