pep8 fixes... largely to things from trunk?

nova/api/ec2/cloud.py

@@ -515,7 +515,8 @@ class CloudController(object):
         # instance_id is passed in as a list of instances
         ec2_id = instance_id[0]
         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()
         return {"InstanceId": ec2_id,
                 "Timestamp": now,

nova/db/sqlalchemy/api.py

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

nova/network/manager.py

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

nova/virt/libvirt_conn.py

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