From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Tue, 23 Jun 2015 12:28:59 +0000 (+0200)
Subject: Cleanup get_plugin_name() from the tree
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b7dc34ef15061577158eeafc179915e5bde73c64;p=openstack-build%2Fneutron-build.git

Cleanup get_plugin_name() from the tree

It does not seem to be used since Icehouse: the patch that removed its
last usage is: 1b36e2077141749495bb32b423f3df8cbbd0eb40

I don't think we should have it as part of abstract interface for
service plugins.

Change-Id: If03f67a617efd3a7cadb96d1a86283ac14088a83
---

diff --git a/neutron/extensions/metering.py b/neutron/extensions/metering.py
index 8485fc40d..36db796da 100644
--- a/neutron/extensions/metering.py
+++ b/neutron/extensions/metering.py
@@ -137,9 +137,6 @@ class Metering(extensions.ExtensionDescriptor):
 @six.add_metaclass(abc.ABCMeta)
 class MeteringPluginBase(service_base.ServicePluginBase):
 
-    def get_plugin_name(self):
-        return constants.METERING
-
     def get_plugin_description(self):
         return constants.METERING
 
diff --git a/neutron/services/service_base.py b/neutron/services/service_base.py
index 0cc8b3bda..acae7a0f5 100644
--- a/neutron/services/service_base.py
+++ b/neutron/services/service_base.py
@@ -41,15 +41,6 @@ class ServicePluginBase(extensions.PluginInterface):
         """
         pass
 
-    @abc.abstractmethod
-    def get_plugin_name(self):
-        """Return a symbolic name for the plugin.
-
-        Each service plugin should have a symbolic name. This name
-        will be used, for instance, by service definitions in service types
-        """
-        pass
-
     @abc.abstractmethod
     def get_plugin_description(self):
         """Return string description of the plugin."""
diff --git a/neutron/tests/unit/dummy_plugin.py b/neutron/tests/unit/dummy_plugin.py
index 0e7fcd98f..14251933e 100644
--- a/neutron/tests/unit/dummy_plugin.py
+++ b/neutron/tests/unit/dummy_plugin.py
@@ -24,7 +24,6 @@ from neutron.plugins.common import constants
 from neutron.services import service_base
 
 
-DUMMY_PLUGIN_NAME = "dummy_plugin"
 RESOURCE_NAME = "dummy"
 COLLECTION_NAME = "%ss" % RESOURCE_NAME
 
@@ -101,9 +100,6 @@ class DummyServicePlugin(service_base.ServicePluginBase):
     def get_plugin_type(self):
         return constants.DUMMY
 
-    def get_plugin_name(self):
-        return DUMMY_PLUGIN_NAME
-
     def get_plugin_description(self):
         return "Neutron Dummy Service Plugin"
 
diff --git a/neutron/tests/unit/extensions/test_servicetype.py b/neutron/tests/unit/extensions/test_servicetype.py
index cc834ffe5..13eab8fa2 100644
--- a/neutron/tests/unit/extensions/test_servicetype.py
+++ b/neutron/tests/unit/extensions/test_servicetype.py
@@ -32,9 +32,6 @@ from neutron.tests.unit import dummy_plugin as dp
 from neutron.tests.unit import testlib_api
 
 
-DEFAULT_SERVICE_DEFS = [{'service_class': constants.DUMMY,
-                         'plugin': dp.DUMMY_PLUGIN_NAME}]
-
 _uuid = test_base._uuid
 _get_path = test_base._get_path