diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-08-12 14:09:25 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-08-12 14:09:25 -0400 |
| commit | 26216f23741abb92cf520d9d144a1fb303567ed2 (patch) | |
| tree | be540a7d56e142e5544102f6cb2fbcc0fbac08c7 | |
| parent | 3cbf0267efdef7d36a88faeb545342619f82f108 (diff) | |
fix merges from trunk
| -rw-r--r-- | nova/tests/api/openstack/test_servers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index 4ac1168fe..99c947467 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -1656,13 +1656,13 @@ class ServersTest(test.TestCase): def test_create_instance_v1_1_invalid_flavor_id_int(self): self._setup_for_create_instance() - image_href = 'http://localhost/v1.1/images/2' + image_href = 'http://localhost/v1.1/123/images/2' flavor_ref = -1 body = dict(server=dict( name='server_test', imageRef=image_href, flavorRef=flavor_ref, metadata={'hello': 'world', 'open': 'stack'}, personality={})) - req = webob.Request.blank('/v1.1/servers') + req = webob.Request.blank('/v1.1/123/servers') req.method = 'POST' req.body = json.dumps(body) req.headers["content-type"] = "application/json" |