diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-02 15:43:55 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-02 15:43:55 -0400 |
| commit | b360aded9cfeebfd7594b1b649bd2a1573203cd3 (patch) | |
| tree | 5c672da6fb9422d0f50931a82b84b06830fb92d3 /nova | |
| parent | 0fa141a231107da931c396f113b00329d63ee430 (diff) | |
| download | nova-b360aded9cfeebfd7594b1b649bd2a1573203cd3.tar.gz nova-b360aded9cfeebfd7594b1b649bd2a1573203cd3.tar.xz nova-b360aded9cfeebfd7594b1b649bd2a1573203cd3.zip | |
send requests to the main API instead of to the EC2 subset -- so that it can parse out the '/services/' prefix. Also, oops, match on path_info instead of path like we're supposed to.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/__init__.py | 2 | ||||
| -rw-r--r-- | nova/tests/api_unittest.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index a94bcb863..1722617ae 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -97,7 +97,7 @@ class Router(wsgi.Middleware): def __call__(self, req): # Obtain the appropriate controller and action for this request. try: - match = self.map.match(req.path) + match = self.map.match(req.path_info) controller_name = match['controller_name'] controller = self.controllers[controller_name] except: diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py index 8087a2e3b..9f9d32784 100644 --- a/nova/tests/api_unittest.py +++ b/nova/tests/api_unittest.py @@ -27,8 +27,7 @@ import webob from nova import test from nova.auth import manager -from nova.api import ec2 -from nova.api.ec2 import cloud +from nova import api class FakeHttplibSocket(object): @@ -83,11 +82,10 @@ class ApiEc2TestCase(test.BaseTestCase): super(ApiEc2TestCase, self).setUp() self.manager = manager.AuthManager() - self.cloud = cloud.CloudController() self.host = '127.0.0.1' - self.app = ec2.API() + self.app = api.API() self.ec2 = boto.connect_ec2( aws_access_key_id='fake', aws_secret_access_key='fake', |