Merge "Always enqueue route DB table operations on fabric route table."

Juniper · Feb 7, 2016 · 37f159c · 37f159c
2 parents 6651d42 + e9a64b7
commit 37f159c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/vnsw/agent/oper/agent_route.cc b/src/vnsw/agent/oper/agent_route.cc
@@ -719,7 +719,8 @@ void AgentRoute::EnqueueRouteResync(void) const {
     DBRequest  req(DBRequest::DB_ENTRY_ADD_CHANGE);
     req.key = GetDBRequestKey();
     (static_cast<AgentKey *>(req.key.get()))->sub_op_ = AgentKey::RESYNC;
-    get_table()->Enqueue(&req);
+    Agent *agent = (static_cast<AgentRouteTable *>(get_table()))->agent();
+    agent->fabric_inet4_unicast_table()->Enqueue(&req);
 }
 
 //If a direct route get modified invariably trigger change

diff --git a/src/vnsw/agent/oper/bridge_route.cc b/src/vnsw/agent/oper/bridge_route.cc
@@ -107,7 +107,7 @@ void BridgeAgentRouteTable::AddBridgeReceiveRouteReq(const Peer *peer,
     DBRequest req(DBRequest::DB_ENTRY_ADD_CHANGE);
     req.key.reset(new BridgeRouteKey(peer, vrf_name, mac, vxlan_id));
     req.data.reset(new L2ReceiveRoute(vn_name, vxlan_id, 0, PathPreference()));
-    Enqueue(&req);
+    agent()->fabric_l2_unicast_table()->Enqueue(&req);
 }
 
 void BridgeAgentRouteTable::AddBridgeReceiveRoute(const Peer *peer,

diff --git a/src/vnsw/agent/oper/evpn_route.cc b/src/vnsw/agent/oper/evpn_route.cc
@@ -159,7 +159,7 @@ void EvpnAgentRouteTable::AddReceiveRouteReq(const Peer *peer,
     req.key.reset(new EvpnRouteKey(peer, vrf_name, mac, ip_addr,
                                    ethernet_tag));
     req.data.reset(new L2ReceiveRoute(vn_name, ethernet_tag, label, pref));
-    Enqueue(&req);
+    agent()->fabric_evpn_table()->Enqueue(&req);
 }
 
 void EvpnAgentRouteTable::AddReceiveRoute(const Peer *peer,