diff --git a/neutron_taas/extensions/taas.py b/neutron_taas/extensions/taas.py index b6274697..f62cbac0 100644 --- a/neutron_taas/extensions/taas.py +++ b/neutron_taas/extensions/taas.py @@ -23,8 +23,6 @@ from neutron.api.v2 import resource_helper from neutron_taas.common import config -import six - config.register() @@ -53,8 +51,7 @@ class Taas(extensions.APIExtensionDescriptor): return TaasPluginBase -@six.add_metaclass(abc.ABCMeta) -class TaasPluginBase(service_base.ServicePluginBase): +class TaasPluginBase(service_base.ServicePluginBase, metaclass=abc.ABCMeta): def get_plugin_description(self): return taas_api_def.DESCRIPTION diff --git a/neutron_taas/services/taas/agents/extensions/taas.py b/neutron_taas/services/taas/agents/extensions/taas.py index b7bc78b4..1257c5e6 100644 --- a/neutron_taas/services/taas/agents/extensions/taas.py +++ b/neutron_taas/services/taas/agents/extensions/taas.py @@ -14,7 +14,6 @@ # limitations under the License. import abc -import six from neutron_lib.agent import l2_extension @@ -35,8 +34,7 @@ OPTS = [ cfg.CONF.register_opts(OPTS) -@six.add_metaclass(abc.ABCMeta) -class TaasAgentDriver(object): +class TaasAgentDriver(object, metaclass=abc.ABCMeta): """Defines stable abstract interface for TaaS Agent Driver.""" @abc.abstractmethod diff --git a/neutron_taas/services/taas/service_drivers/__init__.py b/neutron_taas/services/taas/service_drivers/__init__.py index cc0e0928..41d1f0cb 100644 --- a/neutron_taas/services/taas/service_drivers/__init__.py +++ b/neutron_taas/services/taas/service_drivers/__init__.py @@ -14,11 +14,8 @@ import abc -import six - -@six.add_metaclass(abc.ABCMeta) -class TaasBaseDriver(object): +class TaasBaseDriver(object, metaclass=abc.ABCMeta): def __init__(self, service_plugin): self.service_plugin = service_plugin