diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-16 23:35:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-16 23:35:08 +0000 |
| commit | 36dcc2d9230f8104f0defc8fa27ee8f6c2f2eeaf (patch) | |
| tree | b6fb06617cbcfbf985b7186a4e430b5f6cd75500 /nova/tests | |
| parent | 381e5e5b0dbbb6fefdc8194fa103176f18760060 (diff) | |
| parent | e6073532e5020203a8ec2247ca7ddd481c6ec517 (diff) | |
Merge "Separate metadata api into its own service"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/__init__.py | 2 | ||||
| -rw-r--r-- | nova/tests/integrated/integrated_helpers.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_metadata.py | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index 1109dfb70..676518a48 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -24,7 +24,7 @@ :platform: Unix .. moduleauthor:: Jesse Andrews <jesse@ansolabs.com> .. moduleauthor:: Devin Carlen <devin.carlen@gmail.com> -.. moduleauthor:: Vishvananda Ishaya <vishvananda@yahoo.com> +.. moduleauthor:: Vishvananda Ishaya <vishvananda@gmail.com> .. moduleauthor:: Joshua McKenty <joshua@cognition.ca> .. moduleauthor:: Manish Singh <yosh@gimp.org> .. moduleauthor:: Andy Smith <andy@anarkystic.com> diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py index 5351c53f6..f9e1c76c4 100644 --- a/nova/tests/integrated/integrated_helpers.py +++ b/nova/tests/integrated/integrated_helpers.py @@ -93,6 +93,7 @@ class _IntegratedTestBase(test.TestCase): # Auto-assign ports to allow concurrent tests f['ec2_listen_port'] = 0 f['osapi_listen_port'] = 0 + f['metadata_listen_port'] = 0 f['image_service'] = 'nova.image.fake.FakeImageService' f['fake_network'] = True diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index 5aba8a545..283b6a7cb 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -21,7 +21,7 @@ import base64 import webob -from nova.api.ec2 import metadatarequesthandler +from nova.api.metadata import handler from nova.db.sqlalchemy import api from nova import exception from nova import flags @@ -86,7 +86,7 @@ class MetadataTestCase(test.TestCase): self.stubs.Set(api, 'instance_get', instance_get) self.stubs.Set(api, 'instance_get_all_by_filters', instance_get_list) self.stubs.Set(api, 'instance_get_floating_address', floating_get) - self.app = metadatarequesthandler.MetadataRequestHandler() + self.app = handler.MetadataRequestHandler() network_manager = fake_network.FakeNetworkManager() self.stubs.Set(self.app.cc.network_api, 'get_instance_uuids_by_ip_filter', |