openstack
/
heat
Code Issues Proposed changes

Merge "Allow many-to-one glob mapping in registry"

This commit is contained in:
Jenkins 2015-12-07 16:35:11 +00:00 committed by Gerrit Code Review
parent 887e5da00f 02a0025338
commit fcb23785b3
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
heat/engine/environment.py
View File

@ -184,16 +184,30 @@ class GlobResourceInfo(MapResourceInfo):
"""Store the mapping (with wild cards) of one resource type to another.
like: OS::Networking::* -> OS::Neutron::*
Also supports many-to-one mapping (mostly useful together with special
"OS::Heat::None" resource)
like: OS::* -> OS::Heat::None
"""
description = 'Wildcard Mapping'
def get_resource_info(self, resource_type=None, resource_name=None):
# NOTE(pas-ha) we end up here only when self.name already
# ends with * so truncate it
orig_prefix = self.name[:-1]
new_type = self.value[:-1] + resource_type[len(orig_prefix):]
if self.value.endswith('*'):
new_type = self.value[:-1] + resource_type[len(orig_prefix):]
else:
new_type = self.value
return self.registry.get_resource_info(new_type, resource_name)
def matches(self, resource_type):
return resource_type.startswith(self.name[:-1])
# prevent self-recursion in case of many-to-one mapping
match = (resource_type != self.value and
resource_type.startswith(self.name[:-1]))
return match
class ResourceRegistry(object):

16
heat/tests/test_environment.py
View File

@ -66,6 +66,22 @@ class EnvironmentTest(common.HeatTestCase):
env.get_resource_info('OS::Nova::Server',
'my_db_server').name)
def test_global_registry_many_to_one(self):
new_env = {u'parameters': {u'a': u'ff', u'b': u'ss'},
u'resource_registry': {u'OS::Nova::*': 'OS::Heat::None'}}
env = environment.Environment(new_env)
self.assertEqual('OS::Heat::None',
env.get_resource_info('OS::Nova::Server',
'my_db_server').name)
def test_global_registry_many_to_one_no_recurse(self):
new_env = {u'parameters': {u'a': u'ff', u'b': u'ss'},
u'resource_registry': {u'OS::*': 'OS::Heat::None'}}
env = environment.Environment(new_env)
self.assertEqual('OS::Heat::None',
env.get_resource_info('OS::Some::Name',
'my_db_server').name)
def test_map_one_resource_type(self):
new_env = {u'parameters': {u'a': u'ff', u'b': u'ss'},
u'resource_registry': {u'resources':