From: Sukhdev Kapur <sukhdev@aristanetworks.com>
Date: Sat, 9 May 2015 00:19:58 +0000 (-0700)
Subject: remove router interface on Arista L3 plugin fails
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c2860ba68fd9c8e39fbdfc079319dac8dedb7952;p=openstack-build%2Fneutron-build.git

remove router interface on Arista L3 plugin fails

The failure is because of mismatch of the
parameters to _validate_interface_info(). This patch removes
this code as it can be inherited from upstream

Change-Id: I5a92c6d05876e9ab5201e8fac018433eeb5c89e4
Closes-Bug: #1453323
(cherry picked from commit 9c857dab6289047a272a4519479903c92a84dc4c)
---

diff --git a/neutron/services/l3_router/l3_arista.py b/neutron/services/l3_router/l3_arista.py
index 583b511f0..d90185f28 100644
--- a/neutron/services/l3_router/l3_arista.py
+++ b/neutron/services/l3_router/l3_arista.py
@@ -278,8 +278,3 @@ class AristaL3ServicePlugin(db_base_plugin_v2.NeutronDbPluginV2,
                         LOG.error(_LE("Error Adding interface %(subnet_id)s "
                                       "to router %(router_id)s on Arista HW"),
                                   {'subnet_id': subnet_id, 'router_id': r})
-
-    def _validate_interface_info(self, interface_info):
-        port_id_specified = interface_info and 'port_id' in interface_info
-        subnet_id_specified = interface_info and 'subnet_id' in interface_info
-        return port_id_specified, subnet_id_specified