Remove unused delete_dvr_mac_address method

I looked backed to stable/kilo and stable/liberty,
I'm not sure this method was ever used, so there is
no upgrade concern either.

Change-Id: Id72ee9114a8c3f1e49314c03dbab0b15b327eb93

diff --git a/neutron/db/dvr_mac_db.py b/neutron/db/dvr_mac_db.py
index b3983f0ddd6be98d417d2e5e0c9a734e2a44ca53..7c3e92c9b9e9925ac211c7b36aff00a1ce680150 100644 (file)
--- a/neutron/db/dvr_mac_db.py
+++ b/neutron/db/dvr_mac_db.py
@@ -105,12 +105,6 @@ class DVRDbMixin(ext_dvr.DVRMacAddressPluginBase):
         LOG.error(_LE("MAC generation error after %s attempts"), max_retries)
         raise ext_dvr.MacAddressGenerationFailure(host=host)
 
-    def delete_dvr_mac_address(self, context, host):
-        query = context.session.query(DistributedVirtualRouterMacAddress)
-        (query.
-         filter(DistributedVirtualRouterMacAddress.host == host).
-         delete(synchronize_session=False))
-
     def get_dvr_mac_address_list(self, context):
         with context.session.begin(subtransactions=True):
             return (context.session.

diff --git a/neutron/extensions/dvr.py b/neutron/extensions/dvr.py
index 14f0be17f306f27db02cc5d9edd22c8be3566cfb..06031fb7f73f3feff41939200880e9bf7f4f4ec7 100644 (file)
--- a/neutron/extensions/dvr.py
+++ b/neutron/extensions/dvr.py
@@ -80,10 +80,6 @@ class Dvr(extensions.ExtensionDescriptor):
 @six.add_metaclass(abc.ABCMeta)
 class DVRMacAddressPluginBase(object):
 
-    @abc.abstractmethod
-    def delete_dvr_mac_address(self, context, host):
-        pass
-
     @abc.abstractmethod
     def get_dvr_mac_address_list(self, context):
         pass

diff --git a/neutron/tests/unit/db/test_dvr_mac_db.py b/neutron/tests/unit/db/test_dvr_mac_db.py
index d819bf193c8b3bcfe686de29ef9618f1b8d7adf5..f6d4172d5da938b6abc9bd5e888fafd8e0d2ad38 100644 (file)
--- a/neutron/tests/unit/db/test_dvr_mac_db.py
+++ b/neutron/tests/unit/db/test_dvr_mac_db.py
@@ -73,13 +73,6 @@ class DvrDbMixinTestCase(testlib_api.SqlTestCase):
                               self.ctx, "foo_host_2")
         self.assertEqual(new_retries, f.call_count)
 
-    def test_delete_dvr_mac_address(self):
-        self._create_dvr_mac_entry('foo_host', 'foo_mac_address')
-        self.mixin.delete_dvr_mac_address(self.ctx, 'foo_host')
-        count = self.ctx.session.query(
-            dvr_mac_db.DistributedVirtualRouterMacAddress).count()
-        self.assertFalse(count)
-
     def test_get_dvr_mac_address_list(self):
         self._create_dvr_mac_entry('host_1', 'mac_1')
         self._create_dvr_mac_entry('host_2', 'mac_2')