openstack/heat
Code Issues Proposed changes

Ensure that members is a list

Browse Source 
self.properties.get('members') should not be None.  Ensure that
an empty list is returned instead.

Change-Id: I01d191eafebac30ad25505b312ff6e936181bdbf
Closes-Bug: #1255697
This commit is contained in:
Stephen Gran
2013-11-27 15:40:47 +00:00
parent 01fb048330
commit a028cbe46c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/resources/neutron/loadbalancer.py
View File

@@ -320,6 +320,7 @@ class LoadBalancer(resource.Resource):
'running on the members.')},
'members': {
'Type': 'List',
'Default': [],
'UpdateAllowed': True,
'Description': _('The list of Nova server IDs load balanced.')},
}
@@ -331,9 +332,8 @@ class LoadBalancer(resource.Resource):
client = self.neutron()
nova_client = self.nova()
protocol_port = self.properties['protocol_port']
members = self.properties.get('members') or []
for member in members:
for member in self.properties.get('members'):
address = nova_utils.server_to_ipaddress(nova_client, member)
lb_member = client.create_member({
'member': {
@@ -370,7 +370,7 @@ class LoadBalancer(resource.Resource):
def handle_delete(self):
client = self.neutron()
for member in self.properties.get('members', []):
for member in self.properties.get('members'):
member_id = db_api.resource_data_get(self, member)
try:
client.delete_member(member_id)