openstack/nova
Code Issues Proposed changes

Merge "Fix EC2 DescribeTags filter"

Browse Source
This commit is contained in:
Jenkins
2013-07-16 17:50:50 +00:00
committed by Gerrit Code Review
parent 0b089b770b de5dff5fb5
commit f97f87343f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/api/ec2/cloud.py
View File

@@ -1805,14 +1805,14 @@ class CloudController(object):
val = (val,)
if key_name:
search_block = {}
if key_name == 'resource_id':
if key_name in ('resource_id', 'resource-id'):
search_block['resource_id'] = []
for res_id in val:
search_block['resource_id'].append(
ec2utils.ec2_inst_id_to_uuid(context, res_id))
elif key_name in ['key', 'value']:
search_block[key_name] = val
elif key_name == 'resource_type':
elif key_name in ('resource_type', 'resource-type'):
for res_type in val:
if res_type != 'instance':
raise exception.EC2APIError(_

6
nova/tests/api/ec2/test_cloud.py
View File

@@ -2593,13 +2593,13 @@ class CloudTestCase(test.TestCase):
# Resource ID
tags = self.cloud.describe_tags(self.context,
filter=[{'name': 'resource_id',
filter=[{'name': 'resource-id',
'value': [ec2_id1]}])['tagSet']
self.assertEqual(tags, [inst1_key_foo, inst1_key_bax])
# Resource Type
tags = self.cloud.describe_tags(self.context,
filter=[{'name': 'resource_type',
filter=[{'name': 'resource-type',
'value': ['instance']}])['tagSet']
self.assertEqual(tags, [inst1_key_foo, inst2_key_foo,
inst2_key_baz, inst1_key_bax])
@@ -2659,7 +2659,7 @@ class CloudTestCase(test.TestCase):
self.assertRaises(exception.EC2APIError,
self.cloud.describe_tags,
self.context,
filter=[{'name': 'resource_type',
filter=[{'name': 'resource-type',
'value': ['instance', 'volume']}])
def test_resource_type_from_id(self):