From 358961f3cf259487a2ff9bbb225defdc7cd9e7a7 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 23 Dec 2010 11:22:51 -0600
Subject: Fixed trunk and PEP8 cleanup

---
 nova/virt/libvirt_conn.py | 16 +++++++++-------
 nova/virt/xenapi_conn.py  |  4 ++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 651b2af93..809a484dc 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -512,9 +512,11 @@ class LibvirtConnection(object):
 
         if FLAGS.allow_project_net_traffic:
             net, mask = _get_net_and_mask(network['cidr'])
-            extra_params = ("<parameter name=\"PROJNET\" value=\"%s\" />\n"
-                            "<parameter name=\"PROJMASK\" value=\"%s\" />\n"
-                           ) % (net, mask)
+            extra_params = (
+                "<parameter name=\"PROJNET\" value=\"%s\" />\n"
+                "<parameter name=\"PROJMASK\" value=\"%s\" />\n") % (
+                    net,
+                    mask)
         else:
             extra_params = "\n"
 
@@ -800,8 +802,8 @@ class NWFilterFirewall(object):
         the base filter are all in place.
         """
 
-        nwfilter_xml = ("<filter name='nova-instance-%s' chain='root'>\n"
-                       ) % instance['name']
+        nwfilter_xml = ("<filter name='nova-instance-%s' chain='root'>\n") % (
+            instance['name'])
 
         if instance['image_id'] == FLAGS.vpn_image_id:
             nwfilter_xml += "  <filterref filter='nova-vpn' />\n"
@@ -814,8 +816,8 @@ class NWFilterFirewall(object):
         for security_group in instance.security_groups:
             self.ensure_security_group_filter(security_group['id'])
 
-            nwfilter_xml += ("  <filterref filter='nova-secgroup-%d' />\n"
-                            ) % security_group['id']
+            nwfilter_xml += ("  <filterref filter='nova-secgroup-%d' />\n") % (
+                security_group['id'])
         nwfilter_xml += "</filter>"
 
         self._define_filter(nwfilter_xml)
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 7870a21ac..af16fcdf3 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -110,6 +110,10 @@ class XenAPIConnection(object):
         self._vmops = VMOps(session)
         self._volumeops = VolumeOps(session)
 
+    def init_host(self):
+        """Initialize anything that is necessary for the driver to function"""
+        return
+
     def list_instances(self):
         """List VM instances"""
         return self._vmops.list_instances()
-- 
cgit