cleanup

6 files changed, 14 insertions, 16 deletions

diff --git a/nova/api/openstack/contrib/vifs.py b/nova/api/openstack/contrib/vifs.py
index 5c8492aa3..a54f412a6 100644
--- a/nova/api/openstack/contrib/vifs.py
+++ b/nova/api/openstack/contrib/vifs.py
@@ -59,7 +59,6 @@ class ServerVIFController(object):
         return _translate_vifs_view(vifs)
 
 
-
 class VIFs(extensions.ExtensionDescriptor):
     def get_name(self):
         return "VIFs"
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 863e6bc18..8670465c4 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -363,7 +363,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             self.db.instance_destroy(context, instance_id)
             raise exception.Error(_('trying to destroy already destroyed'
                                     ' instance: %s') % instance_id)
-        self.driver.destroy(instance,network_info)
+        self.driver.destroy(instance, network_info)
 
         if action_str == 'Terminating':
             terminate_volumes(self.db, context, instance_id)
@@ -411,7 +411,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         network_info = self.network_api.get_instance_nw_info(context,
                                                         instance_ref)
-        self.driver.destroy(instance_ref,network_info)
+        self.driver.destroy(instance_ref, network_info)
         image_ref = kwargs.get('image_ref')
         instance_ref.image_ref = image_ref
         instance_ref.injected_files = kwargs.get('injected_files', [])
@@ -674,7 +674,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         network_info = self.network_api.get_instance_nw_info(context,
                                                         instance_ref)
-        self.driver.destroy(instance_ref,network_info)
+        self.driver.destroy(instance_ref, network_info)
         usage_info = utils.usage_from_instance(instance_ref)
         notifier_api.notify('compute.%s' % self.host,
                             'compute.instance.resize.confirm',
@@ -695,7 +695,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         network_info = self.network_api.get_instance_nw_info(context,
                                                         instance_ref)
-        self.driver.destroy(instance_ref,network_info)
+        self.driver.destroy(instance_ref, network_info)
         topic = self.db.queue_get_for(context, FLAGS.compute_topic,
                 instance_ref['host'])
         rpc.cast(context, topic,
diff --git a/nova/network/manager.py b/nova/network/manager.py
index b64afae5c..0689759d7 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -351,8 +351,6 @@ class NetworkManager(manager.SchedulerDependentManager):
         networks = self.db.network_get_all(context)
 
         # return only networks which are not vlan networks and have host set
-        for n in networks:
-            print "net: host = %s vlan = %s" % (n['host'],n['vlan'])
         return [network for network in networks if
                 not network['vlan'] and network['host']]
 
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 36a6d62fe..d7f7d8980 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -313,7 +313,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
             try:
                 for (network, mapping) in network_info:
-                            self.vif_driver.unplug(instance, network, mapping)
+                    self.vif_driver.unplug(instance, network, mapping)
             except:
                 LOG.warning("Failed while unplugging vif of instance '%s'" % \
                     instance['name'])
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 8ce1f1f7e..4f7bb0b4d 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -100,15 +100,16 @@ class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
     def unplug(self, instance, network, mapping):
         pass
 
+
 class LibvirtOpenVswitchDriver(VIFDriver):
     """VIF driver for Open vSwitch."""
 
     def get_configurations(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        utils.execute('sudo','ip','tuntap','add', dev, 'mode','tap')
-        utils.execute('sudo','ip','link','set', dev, 'up')
-        utils.execute('sudo', 'ovs-vsctl','--', '--may-exist', 'add-port',
+        utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
+        utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
+        utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
            FLAGS.flat_network_bridge, dev,
            '--', 'set', 'Interface', dev, "external-ids:iface-id=%s" % vif_id,
            '--', 'set', 'Interface', dev, "external-ids:iface-status=active",
@@ -118,17 +119,16 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         result = {
             'script': '',
             'name': dev,
-            'mac_address' : mapping['mac']
-        }
+            'mac_address': mapping['mac']}
         print "using result = %s" % str(result)
         return result
 
-
     def plug(self, network):
         pass
 
     def unplug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        utils.execute('sudo', 'ovs-vsctl','del-port', FLAGS.flat_network_bridge, dev)
-        utils.execute('sudo','ip','link','delete', dev)
+        utils.execute('sudo', 'ovs-vsctl', 'del-port',
+                FLAGS.flat_network_bridge, dev)
+        utils.execute('sudo', 'ip', 'link', 'delete', dev)
diff --git a/nova/virt/vif.py b/nova/virt/vif.py
index 1ff41ed7e..bab1bdac9 100644
--- a/nova/virt/vif.py
+++ b/nova/virt/vif.py
@@ -17,6 +17,7 @@
 
 """VIF module common to all virt layers."""
 
+
 class VIFDriver(object):
     """Abstract class that defines generic interfaces for all VIF drivers."""