openstack
/
heat
Code Issues Proposed changes

Merge "Use ResourceDefinitionCore methods for lbutils"

This commit is contained in:
Jenkins 2015-07-16 05:09:21 +00:00 committed by Gerrit Code Review
parent 7f5b4c5257 2ebb5d1e87
commit 5b628d7c50
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/rsrc_defn.py
View File

@ -286,7 +286,7 @@ class ResourceDefinitionCore(object):
data = { data = {
'classname': type(self).__name__, 'classname': type(self).__name__,
'name': repr(self.name), 'name': repr(self.name),
'type': repr(self.type), 'type': repr(self.resource_type),
'args': ', '.join(arg_repr(n) for n in args) 'args': ', '.join(arg_repr(n) for n in args)
} }
return '%(classname)s(%(name)s, %(type)s, %(args)s)' % data return '%(classname)s(%(name)s, %(type)s, %(args)s)' % data

4
heat/scaling/lbutils.py
View File

@ -45,7 +45,7 @@ def reload_loadbalancers(group, load_balancers, exclude=None):
lb.name, lb.name,
lb.type(), lb.type(),
properties=props, properties=props,
metadata=lb.t.get('Metadata'), metadata=lb.t.metadata(),
deletion_policy=lb.t.get('DeletionPolicy')) deletion_policy=lb.t.deletion_policy())
scheduler.TaskRunner(lb.update, lb_defn)() scheduler.TaskRunner(lb.update, lb_defn)()

13
heat/tests/test_instance_group.py
View File

@ -216,7 +216,10 @@ class LoadbalancerReloadTest(common.HeatTestCase):
'Listeners': [{'InstancePort': u'80', 'Listeners': [{'InstancePort': u'80',
'LoadBalancerPort': u'80', 'LoadBalancerPort': u'80',
'Protocol': 'HTTP'}], 'Protocol': 'HTTP'}],
'AvailabilityZones': ['nova']}) 'AvailabilityZones': ['nova']},
metadata={},
deletion_policy='Delete'
)
group._lb_reload() group._lb_reload()
mock_members.assert_called_once_with(group, exclude=[]) mock_members.assert_called_once_with(group, exclude=[])
@ -249,7 +252,9 @@ class LoadbalancerReloadTest(common.HeatTestCase):
'ElasticLoadBalancer', 'ElasticLoadBalancer',
'OS::Neutron::LoadBalancer', 'OS::Neutron::LoadBalancer',
{'protocol_port': 8080, {'protocol_port': 8080,
'members': ['aaaa', 'bbb']}) 'members': ['aaaa', 'bbb']},
metadata={},
deletion_policy='Delete')
group._lb_reload() group._lb_reload()
mock_members.assert_called_once_with(group, exclude=[]) mock_members.assert_called_once_with(group, exclude=[])
@ -302,7 +307,9 @@ class LoadbalancerReloadTest(common.HeatTestCase):
u'Listeners': [{u'InstancePort': u'80', u'Listeners': [{u'InstancePort': u'80',
u'LoadBalancerPort': u'80', u'LoadBalancerPort': u'80',
u'Protocol': u'HTTP'}], u'Protocol': u'HTTP'}],
u'AvailabilityZones': ['abc', 'xyz']}} u'AvailabilityZones': ['abc', 'xyz']},
u'DeletionPolicy': 'Delete',
u'Metadata': {}}
stack = utils.parse_stack(t, params=inline_templates.as_params) stack = utils.parse_stack(t, params=inline_templates.as_params)
lb = stack['ElasticLoadBalancer'] lb = stack['ElasticLoadBalancer']