From: Sukhdev <sukhdev@aristanetworks.com>
Date: Mon, 19 Jan 2015 21:29:05 +0000 (-0800)
Subject: Fixes blocking of VRF config in Arista L3 Plugin
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=856447d9c041018021659e36e9d7b3bb766e9bd5;p=openstack-build%2Fneutron-build.git

Fixes blocking of VRF config in Arista L3 Plugin

This fix removes the restriction that Arista HW,
when configured in MLAG (redunancy) mode, is not
allowed to configure in VRF mode.

Additionally, a minor fix to log message is made
as the correct message is logged when an
exception is hit.

Change-Id: Icc1e9cc81d20c6aa19ed0429bdbc781e4a11f224
Closes-bug: 1411016
---

diff --git a/neutron/plugins/ml2/drivers/arista/arista_l3_driver.py b/neutron/plugins/ml2/drivers/arista/arista_l3_driver.py
index 14c105b60..f41aed279 100644
--- a/neutron/plugins/ml2/drivers/arista/arista_l3_driver.py
+++ b/neutron/plugins/ml2/drivers/arista/arista_l3_driver.py
@@ -21,7 +21,7 @@ from oslo.config import cfg
 
 from neutron import context as nctx
 from neutron.db import db_base_plugin_v2
-from neutron.i18n import _LI
+from neutron.i18n import _LE, _LI
 from neutron.openstack.common import log as logging
 from neutron.plugins.ml2.drivers.arista import exceptions as arista_exc
 
@@ -133,11 +133,6 @@ class AristaL3Driver(object):
             LOG.error(msg)
             raise arista_exc.AristaSevicePluginConfigError(msg=msg)
         if cfg.CONF.l3_arista.get('mlag_config'):
-            if cfg.CONF.l3_arista.get('use_vrf'):
-                #This is invalid/unsupported configuration
-                msg = _('VRFs are not supported MLAG config mode')
-                LOG.error(msg)
-                raise arista_exc.AristaSevicePluginConfigError(msg=msg)
             if cfg.CONF.l3_arista.get('secondary_l3_host') == '':
                 msg = _('Required option secondary_l3_host is not set')
                 LOG.error(msg)
@@ -379,8 +374,8 @@ class AristaL3Driver(object):
             LOG.info(_LI('Results of execution on Arista EOS: %s'), ret)
 
         except Exception:
-            msg = (_('Error occured while trying to execute '
-                     'commands %(cmd)s on EOS %(host)s') %
+            msg = (_LE("Error occured while trying to execute "
+                     "commands %(cmd)s on EOS %(host)s"),
                    {'cmd': full_command, 'host': server})
             LOG.exception(msg)
             raise arista_exc.AristaServicePluginRpcError(msg=msg)