From 7c50652a97fe7ebd74ce38572cbd9744c76b2f71 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Mon, 5 Mar 2012 16:21:41 +0900
Subject: virt/firewall: NoopFirewallDriver::instance_filter_exists must return
 True

Otherwise, virt.libvirt.connection.ensure_filtering_rules_for_instance()
results in infinite loop.
And eliminate NullFirewallDriver as it's same to NoopFirewallDriver.
This patch fixes bug 953781.

Change-Id: I7936b3c69e9269041defd1ef7e5dda2de1f96dab
---
 nova/virt/firewall.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nova/virt')

diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py
index 3ae12bcb0..3f5333427 100644
--- a/nova/virt/firewall.py
+++ b/nova/virt/firewall.py
@@ -453,3 +453,6 @@ class NoopFirewallDriver(object):
 
     def __getattr__(self, key):
         return self._noop
+
+    def instance_filter_exists(self, instance, network_info):
+        return True
-- 
cgit