Supporting networks with multiple PIFs.

pep8 fixes
unit tests passed

2 files changed, 11 insertions, 12 deletions

diff --git a/nova/virt/xenapi/network_utils.py b/nova/virt/xenapi/network_utils.py
index 8f7806e6c..c4ee8a6be 100644
--- a/nova/virt/xenapi/network_utils.py
+++ b/nova/virt/xenapi/network_utils.py
@@ -28,10 +28,9 @@ class NetworkHelper(HelperBase):
     """
     The class that wraps the helper methods together.
     """
-    
-    
+
     @classmethod
-    def find_network_with_name_label(cls,session,name_label):
+    def find_network_with_name_label(cls, session, name_label):
         networks = session.call_xenapi('network.get_by_name_label', name_label)
         if len(networks) == 1:
             return networks[0]
@@ -39,9 +38,8 @@ class NetworkHelper(HelperBase):
             raise Exception(_('Found non-unique network'
                               ' for name_label %s') % name_label)
         else:
-            return None       
-    
-    
+            return None
+
     @classmethod
     def find_network_with_bridge(cls, session, bridge):
         """Return the network on which the bridge is attached, if found."""
@@ -53,4 +51,4 @@ class NetworkHelper(HelperBase):
             raise Exception(_('Found non-unique network'
                               ' for bridge %s') % bridge)
         else:
-            raise Exception(_('Found no network for bridge %s') % bridge)       
+            raise Exception(_('Found no network for bridge %s') % bridge)
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index b5c5e082e..a0dbd1411 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -70,18 +70,19 @@ class VMOps(object):
         #this will return the bridge name in nova db
         bridge = db.network_get_by_instance(context.get_admin_context(),
                                             instance['id'])['bridge']
-                                            
+
         #this will return the appropriate network
         #TODO: avoid unnecessary call to find_network_with_bridge
         #when VLAN manager is being used (and not just use an if)
-        network_ref = None 
-        try: 
+        network_ref = None
+        try:
             network_ref = \
                 NetworkHelper.find_network_with_bridge(self._session, bridge)
         except:
-            #try to get name with name_label 
+            #try to get name with name_label
             network_ref = \
-                NetworkHelper.find_network_with_name_label(self._session,bridge)
+                NetworkHelper.find_network_with_name_label(self._session,
+                                                           bridge)
 
         user = AuthManager().get_user(instance.user_id)
         project = AuthManager().get_project(instance.project_id)