openstack/nova
Code Issues Proposed changes

pep8 fixes... largely to things from trunk?

Browse Source
This commit is contained in:
Andy Smith
2011-01-14 17:54:36 -08:00
parent 073336d206
commit 69c11c27c2
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/api/ec2/cloud.py
View File

@@ -515,7 +515,8 @@ class CloudController(object):
# instance_id is passed in as a list of instances # instance_id is passed in as a list of instances
ec2_id = instance_id[0] ec2_id = instance_id[0]
instance_id = ec2_id_to_id(ec2_id) instance_id = ec2_id_to_id(ec2_id)
output = self.compute_api.get_console_output(context, instance_id=instance_id) output = self.compute_api.get_console_output(
context, instance_id=instance_id)
now = datetime.datetime.utcnow() now = datetime.datetime.utcnow()
return {"InstanceId": ec2_id, return {"InstanceId": ec2_id,
"Timestamp": now, "Timestamp": now,

6
nova/db/sqlalchemy/api.py
View File

@@ -611,9 +611,9 @@ def fixed_ip_get_instance_v6(context, address):
session = get_session() session = get_session()
mac = utils.to_mac(address) mac = utils.to_mac(address)
result = session.query(models.Instance result = session.query(models.Instance).\
).filter_by(mac_address=mac filter_by(mac_address=mac).\
).first() first()
return result return result

6
nova/network/manager.py
View File

@@ -517,10 +517,8 @@ class VlanManager(NetworkManager):
net['vlan'] = vlan net['vlan'] = vlan
net['bridge'] = 'br%s' % vlan net['bridge'] = 'br%s' % vlan
if(FLAGS.use_ipv6): if(FLAGS.use_ipv6):
cidr_v6 = "%s/%s" % ( cidr_v6 = "%s/%s" % (fixed_net_v6[start_v6],
fixed_net_v6[start_v6], significant_bits_v6)
significant_bits_v6
)
net['cidr_v6'] = cidr_v6 net['cidr_v6'] = cidr_v6
# NOTE(vish): This makes ports unique accross the cloud, a more # NOTE(vish): This makes ports unique accross the cloud, a more

3
nova/virt/libvirt_conn.py
View File

@@ -995,8 +995,7 @@ class NWFilterFirewall(FirewallDriver):
['no-mac-spoofing', ['no-mac-spoofing',
'no-ip-spoofing', 'no-ip-spoofing',
'no-arp-spoofing', 'no-arp-spoofing',
'allow-dhcp-server' 'allow-dhcp-server']))
]))
self._define_filter(self.nova_base_ipv4_filter) self._define_filter(self.nova_base_ipv4_filter)
self._define_filter(self.nova_base_ipv6_filter) self._define_filter(self.nova_base_ipv6_filter)
self._define_filter(self.nova_dhcp_filter) self._define_filter(self.nova_dhcp_filter)