From c919ba6602d3e99b23f133b68ec3a484aca3c78d Mon Sep 17 00:00:00 2001 From: Ante Karamatić Date: Thu, 1 Mar 2012 09:38:37 +0100 Subject: Since 'net' is of nova.network.model.VIF class and 'ips' is an empty list, net needs to be pulled from hydrated nw_info.fixed_ips(), and appended to ips. bug 942593 Change-Id: I9c2f55e300d1dad503b15c261027d988073e8e61 --- nova/virt/firewall.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'nova/virt') diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 9df036412..3ae12bcb0 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -327,15 +327,16 @@ class IptablesFirewallDriver(FirewallDriver): nw_api = nova.network.API() for instance in rule['grantee_group']['instances']: LOG.info('instance: %r', instance) - ips = [] nw_info = nw_api.get_instance_nw_info(ctxt, instance) - for net in nw_info: - ips.extend(net[1]['ips']) + + ips = [ip['address'] + for ip in nw_info.fixed_ips() + if ip['version'] == version] LOG.info('ips: %r', ips) for ip in ips: - subrule = args + ['-s %s' % ip['ip']] + subrule = args + ['-s %s' % ip] fw_rules += [' '.join(subrule)] LOG.info('Using fw_rules: %r', fw_rules) -- cgit