From 07ffed4016cffd333cdddbafe79f624c15d249e0 Mon Sep 17 00:00:00 2001
From: sahilsabharwal <ssabharwal@juniper.net>
Date: Tue, 21 Jun 2016 13:16:10 -0700
Subject: [PATCH] 1. Added attribute "VIF_TYPE_VROUTER" in
 (/opt/stack/contrail/openstack/neutron_plugin/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py)
 2. This attribute was used to be in (neutron/extensions/portbindings.py) and
 has been removed after Kilo.

Change-Id: Ic876976f75863a84c75ccaeb40cec882ff836211
Closes-Bug: #1591995
---
 .../plugins/opencontrail/contrail_plugin_base.py              | 4 +++-
 .../tests/unit/opencontrail/test_contrail_plugin.py           | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py b/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py
index f08561e..eb00e2f 100644
--- a/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py
+++ b/neutron_plugin_contrail/plugins/opencontrail/contrail_plugin_base.py
@@ -46,6 +46,8 @@
 # the VIF class
 NIC_NAME_LEN = 14
 
+VIF_TYPE_VROUTER = 'vrouter'
+
 LOG = logging.getLogger(__name__)
 
 vnc_opts = [
@@ -504,7 +506,7 @@ def update_port(self, context, port_id, port):
                                                             port_id)
             else:
                 port['port'][portbindings.VIF_TYPE] = \
-                        portbindings.VIF_TYPE_VROUTER
+                        VIF_TYPE_VROUTER
                 self._delete_vhostuser_vif_details_from_port(port['port'],
                                                              original)
         else:
diff --git a/neutron_plugin_contrail/tests/unit/opencontrail/test_contrail_plugin.py b/neutron_plugin_contrail/tests/unit/opencontrail/test_contrail_plugin.py
index 4fe03e4..73459b8 100644
--- a/neutron_plugin_contrail/tests/unit/opencontrail/test_contrail_plugin.py
+++ b/neutron_plugin_contrail/tests/unit/opencontrail/test_contrail_plugin.py
@@ -23,7 +23,6 @@
     from oslo.config import cfg
 
 from neutron.api import extensions
-from neutron.extensions import portbindings
 from neutron.tests.unit import _test_extension_portbindings as test_bindings
 
 try:
@@ -50,6 +49,7 @@
     contrail_res_handler)
 from neutron_plugin_contrail.tests.unit.opencontrail.vnc_mock import MockVnc
 from vnc_api import vnc_api
+from neutron_plugin_contrail.plugins.opencontrail import contrail_plugin_base as plugin_base
 
 CONTRAIL_PKG_PATH = (
     "neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_v3")
@@ -352,7 +352,7 @@ class TestContrailPortBinding(JVContrailPluginTestCase,
                               test_bindings.PortBindingsTestCase):
     # from neutron_plugin_contrail.plugins.opencontrail.contrail_plugin
     # import (NeutronPluginContrailCoreV2)
-    VIF_TYPE = portbindings.VIF_TYPE_VROUTER
+    VIF_TYPE = plugin_base.VIF_TYPE_VROUTER
     HAS_PORT_FILTER = True
 
     def setUp(self):