Create a fake netconf client for Cisco nexus unit tests

Fixes bug 1159560

Change-Id: Idb0578a16d3944052a0302415c6c0d96e87cc485

diff --git a/quantum/tests/unit/cisco/test_network_plugin.py b/quantum/tests/unit/cisco/test_network_plugin.py
index 4fbec2095a286bca0c0b8ae41a3956d13ec3eff0..78954e45d6a1743b374bb1e14f7193ae0b2ba0e4 100644 (file)
--- 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 98f56dc5f274fa26d3109dd3b5cbd23eb68b6af6..bd1426004b009f488ba4d13de210c9c790496ec7 100644 (file)
--- 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.