From ca668a0b9ec5f6412cd842b89d523ba1a8369782 Mon Sep 17 00:00:00 2001 From: zhhuabj Date: Thu, 16 Jan 2014 14:34:14 +0800 Subject: [PATCH] Clean up ML2 Manager Some things need cleanup in the ML2Manager. 1) Replace sys.exit(1) with raise SystemExit(1) 2) Replace reserved keyword type with network_type Change-Id: I921bfaec7d3e31503942b3ca4a1b2218c44b14ac Closes-Bug: #1259646 --- neutron/plugins/ml2/managers.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/neutron/plugins/ml2/managers.py b/neutron/plugins/ml2/managers.py index a4db860b2e5..dec707bad35 100644 --- a/neutron/plugins/ml2/managers.py +++ b/neutron/plugins/ml2/managers.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import sys - from oslo.config import cfg import stevedore @@ -46,16 +44,16 @@ class TypeManager(stevedore.named.NamedExtensionManager): def _register_types(self): for ext in self: - type = ext.obj.get_type() - if type in self.drivers: + network_type = ext.obj.get_type() + if network_type in self.drivers: LOG.error(_("Type driver '%(new_driver)s' ignored because type" " driver '%(old_driver)s' is already registered" " for type '%(type)s'"), {'new_driver': ext.name, - 'old_driver': self.drivers[type].name, - 'type': type}) + 'old_driver': self.drivers[network_type].name, + 'type': network_type}) else: - self.drivers[type] = ext + self.drivers[network_type] = ext LOG.info(_("Registered types: %s"), self.drivers.keys()) def _check_tenant_network_types(self, types): @@ -64,15 +62,15 @@ class TypeManager(stevedore.named.NamedExtensionManager): if network_type in self.drivers: self.tenant_network_types.append(network_type) else: - LOG.error(_("No type driver for tenant network_type: %s. " - "Service terminated!"), - network_type) - sys.exit(1) + msg = _("No type driver for tenant network_type: %s. " + "Service terminated!") % network_type + LOG.error(msg) + raise SystemExit(msg) LOG.info(_("Tenant network_types: %s"), self.tenant_network_types) def initialize(self): - for type, driver in self.drivers.iteritems(): - LOG.info(_("Initializing driver for type '%s'"), type) + for network_type, driver in self.drivers.iteritems(): + LOG.info(_("Initializing driver for type '%s'"), network_type) driver.obj.initialize() def validate_provider_segment(self, segment):