From 86b660023c1073715940d45e1429323e17ac9ddd Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Tue, 6 Aug 2013 14:07:07 +0900 Subject: [PATCH] Delete useless and wrong comments in NEC Plugin This commit deletes useless and wrong comments in NEC Plugin, and adds _clean_nec_ini() to Cleanup to make sure it is called. Fixes: bug #1208716 Change-Id: I5c7950617cdf5d66f5f5cf3334bf2d5e617148eb --- neutron/plugins/nec/nec_plugin.py | 2 -- neutron/tests/unit/nec/test_nec_plugin.py | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/neutron/plugins/nec/nec_plugin.py b/neutron/plugins/nec/nec_plugin.py index 7f9b97c97..ac7a8cc1c 100644 --- a/neutron/plugins/nec/nec_plugin.py +++ b/neutron/plugins/nec/nec_plugin.py @@ -230,8 +230,6 @@ class NECPluginV2(db_base_plugin_v2.NeutronDbPluginV2, return port - # Quantm Plugin Basic methods - def create_network(self, context, network): """Create a new network entry on DB, and create it on OFC.""" LOG.debug(_("NECPluginV2.create_network() called, " diff --git a/neutron/tests/unit/nec/test_nec_plugin.py b/neutron/tests/unit/nec/test_nec_plugin.py index bab4f3d33..480ec1b31 100644 --- a/neutron/tests/unit/nec/test_nec_plugin.py +++ b/neutron/tests/unit/nec/test_nec_plugin.py @@ -78,12 +78,8 @@ class NecPluginV2TestCase(test_plugin.NeutronDbPluginV2TestCase): self.addCleanup(mock.patch.stopall) self._set_nec_ini() + self.addCleanup(self._clean_nec_ini) super(NecPluginV2TestCase, self).setUp(self._plugin_name) - # NOTE: `test_config' is global, and most tests don't set - # test_config['config_files'] but read this in setUp(). - # So clean test_config['config_files'] ASAP, to avoid side effects - # on other tests which are running at the same time. - self._clean_nec_ini() self.plugin = manager.NeutronManager.get_plugin() self.plugin.ofc = fake_ofc_manager.patch_ofc_manager() -- 2.45.2