From fdadc742b61ee817b2189f2f76ced90cee3824a7 Mon Sep 17 00:00:00 2001
From: Hari <haripk@juniper.net>
Date: Thu, 11 Feb 2016 10:21:12 +0530
Subject: [PATCH] Enqueue route updates in fabric route tables.

There are still a couple of places where enqueue is happening in
respective VRF route tables. As these may be deleted before the
enqueued request is handled, always enqueue in fabric route table,
which checks for the actual route table and invokes relevant
operation.

Change-Id: I5baf302fbad6524020738610a7a012a6ee7438e0
closes-bug: 1544380
---
 src/vnsw/agent/oper/inet_unicast_route.cc | 3 +--
 src/vnsw/agent/oper/path_preference.cc    | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/vnsw/agent/oper/inet_unicast_route.cc b/src/vnsw/agent/oper/inet_unicast_route.cc
index c56eb78b1f9..7be5d67439f 100644
--- a/src/vnsw/agent/oper/inet_unicast_route.cc
+++ b/src/vnsw/agent/oper/inet_unicast_route.cc
@@ -117,8 +117,7 @@ static void Inet4UnicastTableEnqueue(Agent *agent, DBRequest *req) {
 
 static void Inet6UnicastTableEnqueue(Agent *agent, const string &vrf_name,
                                      DBRequest *req) {
-    AgentRouteTable *table =
-        agent->vrf_table()->GetInet6UnicastRouteTable(vrf_name);
+    AgentRouteTable *table = agent->fabric_inet4_unicast_table();
     if (table) {
         table->Enqueue(req);
     }
diff --git a/src/vnsw/agent/oper/path_preference.cc b/src/vnsw/agent/oper/path_preference.cc
index e0ef8215920..115dca9dcab 100644
--- a/src/vnsw/agent/oper/path_preference.cc
+++ b/src/vnsw/agent/oper/path_preference.cc
@@ -431,11 +431,11 @@ void PathPreferenceSM::EnqueuePathChange() {
 
     AgentRouteTable *table = NULL;
     if (rt_->GetTableType() == Agent::EVPN) {
-        table = rt_->vrf()->GetEvpnRouteTable();
+        table = agent_->fabric_evpn_table();
     } else if (rt_->GetTableType() == Agent::INET4_UNICAST) {
-        table = rt_->vrf()->GetInet4UnicastRouteTable();
+        table = agent_->fabric_inet4_unicast_table();
     } else if (rt_->GetTableType() == Agent::INET6_UNICAST) {
-        table = rt_->vrf()->GetInet6UnicastRouteTable();
+        table = agent_->fabric_inet4_unicast_table();
     }
 
     if (table) {