From 1cb1449eb6561b9ec879e1779d591421b5e44424 Mon Sep 17 00:00:00 2001 From: Dane LeBlanc Date: Mon, 25 Mar 2013 18:43:52 -0400 Subject: [PATCH] Create a fake netconf client for Cisco nexus unit tests Fixes bug 1159560 Change-Id: Idb0578a16d3944052a0302415c6c0d96e87cc485 --- quantum/tests/unit/cisco/test_network_plugin.py | 7 +++++++ quantum/tests/unit/cisco/test_nexus_plugin.py | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/quantum/tests/unit/cisco/test_network_plugin.py b/quantum/tests/unit/cisco/test_network_plugin.py index 4fbec2095..78954e45d 100644 --- a/quantum/tests/unit/cisco/test_network_plugin.py +++ b/quantum/tests/unit/cisco/test_network_plugin.py @@ -32,8 +32,15 @@ class CiscoNetworkPluginV2TestCase(test_db_plugin.QuantumDbPluginV2TestCase): _plugin_name = 'quantum.plugins.cisco.network_plugin.PluginV2' def setUp(self): + # Use a mock netconf client + mock_ncclient = mock.Mock() + self.patch_obj = mock.patch.dict('sys.modules', + {'ncclient': mock_ncclient}) + self.patch_obj.start() + super(CiscoNetworkPluginV2TestCase, self).setUp(self._plugin_name) self.port_create_status = 'DOWN' + self.addCleanup(self.patch_obj.stop) def _get_plugin_ref(self): plugin_obj = QuantumManager.get_plugin() diff --git a/quantum/tests/unit/cisco/test_nexus_plugin.py b/quantum/tests/unit/cisco/test_nexus_plugin.py index 98f56dc5f..bd1426004 100644 --- a/quantum/tests/unit/cisco/test_nexus_plugin.py +++ b/quantum/tests/unit/cisco/test_nexus_plugin.py @@ -30,8 +30,8 @@ HOSTNAME = 'testhost' INSTANCE = 'testvm' NEXUS_PORTS = '1/10' NEXUS_SSH_PORT = '22' -NEXUS_DRIVER = ('quantum.plugins.cisco.tests.unit.v2.nexus.' - 'fake_nexus_driver.CiscoNEXUSFakeDriver') +NEXUS_DRIVER = ('quantum.plugins.cisco.nexus.' + 'cisco_nexus_network_driver_v2.CiscoNEXUSDriver') class TestCiscoNexusPlugin(base.BaseTestCase): @@ -77,11 +77,19 @@ class TestCiscoNexusPlugin(base.BaseTestCase): } db.configure_db() + # Use a mock netconf client + mock_ncclient = mock.Mock() + self.patch_obj = mock.patch.dict('sys.modules', + {'ncclient': mock_ncclient}) + self.patch_obj.start() + with mock.patch.object(cisco_nexus_plugin_v2.NexusPlugin, '__init__', new=new_nexus_init): self._cisco_nexus_plugin = cisco_nexus_plugin_v2.NexusPlugin() self._cisco_nexus_plugin._nexus_switches = self._nexus_switches + self.addCleanup(self.patch_obj.stop) + def test_a_create_network(self): """ Tests creation of two new Virtual Network. -- 2.45.2