openstack/nova
Code Issues Proposed changes

Access DB values as dict not as attributes. Part 2

Browse Source 
We cannot assume nova.db.api will be returning sqlalchemy objects with
attributes, instead treat return values as dicts

Part of blueprint db-api-cleanup

Change-Id: I39ccd2f110c258d69bb2d4d7078c672c6a6ef36e
This commit is contained in:
Joe Gordon
2012-11-29 17:10:30 -08:00
parent adb0f2b0b4
commit 03ae11664d
6 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nova/virt/firewall.py
View File

@@ -360,20 +360,20 @@ class IptablesFirewallDriver(FirewallDriver):
LOG.debug(_('Adding security group rule: %r'), rule,
instance=instance)
if not rule.cidr:
if not rule['cidr']:
version = 4
else:
version = netutils.get_ip_version(rule.cidr)
version = netutils.get_ip_version(rule['cidr'])
if version == 4:
fw_rules = ipv4_rules
else:
fw_rules = ipv6_rules
protocol = rule.protocol
protocol = rule['protocol']
if protocol:
protocol = rule.protocol.lower()
protocol = rule['protocol'].lower()
if version == 6 and protocol == 'icmp':
protocol = 'icmpv6'
@@ -386,9 +386,9 @@ class IptablesFirewallDriver(FirewallDriver):
args += self._build_tcp_udp_rule(rule, version)
elif protocol == 'icmp':
args += self._build_icmp_rule(rule, version)
if rule.cidr:
LOG.debug('Using cidr %r', rule.cidr, instance=instance)
args += ['-s', rule.cidr]
if rule['cidr']:
LOG.debug('Using cidr %r', rule['cidr'], instance=instance)
args += ['-s', rule['cidr']]
fw_rules += [' '.join(args)]
else:
if rule['grantee_group']: