diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-02-23 09:40:43 -0800 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-02-23 09:40:43 -0800 |
| commit | ef0dfb6809f31cfe8ca8056892fc9dcc2f00a0d7 (patch) | |
| tree | 7f91ef87357a2ef061f116e76eaa8791d5ef9b37 /nova/api | |
| parent | 46ccef67f35d130cd94a1a6d743124313097964b (diff) | |
| download | nova-ef0dfb6809f31cfe8ca8056892fc9dcc2f00a0d7.tar.gz nova-ef0dfb6809f31cfe8ca8056892fc9dcc2f00a0d7.tar.xz nova-ef0dfb6809f31cfe8ca8056892fc9dcc2f00a0d7.zip | |
Changed unit test to refer to compute API, per Todd's suggestion.
Avoids needing to extend our implementation of the EC2 API.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 5db865b02..882cdcfc9 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -783,9 +783,6 @@ class CloudController(object): def run_instances(self, context, **kwargs): max_count = int(kwargs.get('max_count', 1)) - # NOTE(justinsb): the EC2 API doesn't support metadata here, but this - # is needed for the unit tests. Maybe the unit tests shouldn't be - # calling the EC2 code instances = self.compute_api.create(context, instance_type=instance_types.get_by_type( kwargs.get('instance_type', None)), @@ -800,8 +797,7 @@ class CloudController(object): user_data=kwargs.get('user_data'), security_group=kwargs.get('security_group'), availability_zone=kwargs.get('placement', {}).get( - 'AvailabilityZone'), - metadata=kwargs.get('metadata', [])) + 'AvailabilityZone')) return self._format_run_instances(context, instances[0]['reservation_id']) |