Skip to content

Commit

Permalink
Ensure that members is a list
Browse files Browse the repository at this point in the history
self.properties.get('members') should not be None.  Ensure that
an empty list is returned instead.

Change-Id: I01d191eafebac30ad25505b312ff6e936181bdbf
Closes-Bug: #1255697
  • Loading branch information
Stephen Gran committed Nov 27, 2013
1 parent 01fb048 commit a028cbe
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions heat/engine/resources/neutron/loadbalancer.py
Expand Up @@ -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.')},
}
Expand All @@ -331,9 +332,8 @@ def handle_create(self):
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': {
Expand Down Expand Up @@ -370,7 +370,7 @@ def handle_update(self, json_snippet, tmpl_diff, prop_diff):

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)
Expand Down

0 comments on commit a028cbe

Please sign in to comment.