Signed-off-by: Isaku Yamahata <[email protected]>
---
nova/tests/test_libvirt.py | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index d8a44ee..d55fa4b 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -2059,34 +2059,6 @@ class LibvirtConnectionTestCase(test.TestCase):
except Exception:
pass
- class NullFirewallDriver(base_firewall.FirewallDriver):
- def __init__(self, get_connection, **kwargs):
- pass
-
- def prepare_instance_filter(self, instance, network_info):
- pass
-
- def unfilter_instance(self, instance, network_info):
- pass
-
- def apply_instance_filter(self, instance, network_info):
- pass
-
- def refresh_security_group_rules(self, security_group_id):
- pass
-
- def refresh_security_group_members(self, security_group_id):
- pass
-
- def refresh_provider_fw_rules(self):
- pass
-
- def setup_basic_filtering(self, instance, network_info):
- pass
-
- def instance_filter_exists(self, instance, network_info):
- return True
-
def _create_instance(self, params=None):
"""Create a test instance"""
if not params:
@@ -2264,7 +2236,7 @@ class LibvirtConnectionTestCase(test.TestCase):
self.stubs.Set(self.libvirtconnection, '_create_new_domain',
fake_create_new_domain)
self.stubs.Set(utils, 'execute', fake_execute)
- fw = self.NullFirewallDriver(None)
+ fw = base_firewall.NoopFirewallDriver()
self.stubs.Set(self.libvirtconnection, 'firewall_driver', fw)
ins_ref = self._create_instance()
@@ -2289,7 +2261,7 @@ class LibvirtConnectionTestCase(test.TestCase):
self.stubs.Set(self.libvirtconnection, 'plug_vifs', fake_plug_vifs)
self.stubs.Set(utils, 'execute', fake_execute)
- fw = self.NullFirewallDriver(None)
+ fw = base_firewall.NoopFirewallDriver()
self.stubs.Set(self.libvirtconnection, 'firewall_driver', fw)
self.stubs.Set(self.libvirtconnection, '_create_new_domain',
fake_create_new_domain)
--
1.7.1.1
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
