Merge "Handle ":" in the table-name" into R2.20

Juniper · May 11, 2015 · 152ec6e · 152ec6e
2 parents e566f0f + 14266d5
commit 152ec6e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/vnsw/agent/oper/agent_sandesh.cc b/src/vnsw/agent/oper/agent_sandesh.cc
@@ -446,9 +446,11 @@ int AgentSandeshArguments::Decode(const std::string &str) {
     for (vector<string>::iterator it = token_list.begin();
          it != token_list.end(); ++it) {
         vector<string> args;
-        if (Split((*it), ':', args) == 2) {
-            Add(args[0], args[1]);
+        if (Split((*it), ':', args) < 2) {
+            return 0;
         }
+        string val = (*it).substr(args[0].length() + 1);
+        Add(args[0], val);
     }
 
     return count;

diff --git a/src/vnsw/agent/oper/evpn_route.cc b/src/vnsw/agent/oper/evpn_route.cc
@@ -362,7 +362,7 @@ void EvpnRouteReq::HandleRequest() const {
 AgentSandeshPtr EvpnAgentRouteTable::GetAgentSandesh
 (const AgentSandeshArguments *args, const std::string &context) {
     return AgentSandeshPtr(new AgentEvpnRtSandesh(vrf_entry(), context, "",
-                                                  true));
+                                                  false));
 }
 
 bool EvpnRouteEntry::DBEntrySandesh(Sandesh *sresp, bool stale) const {

diff --git a/src/vnsw/agent/oper/inet4_multicast_route.cc b/src/vnsw/agent/oper/inet4_multicast_route.cc
@@ -231,5 +231,5 @@ void Inet4McRouteReq::HandleRequest() const {
 AgentSandeshPtr Inet4MulticastAgentRouteTable::GetAgentSandesh
 (const AgentSandeshArguments *args, const std::string &context) {
     return AgentSandeshPtr(new AgentInet4McRtSandesh(vrf_entry(), context, "",
-                                                     true));
+                                                     false));
 }
diff --git a/src/vnsw/agent/oper/inet_unicast_route.cc b/src/vnsw/agent/oper/inet_unicast_route.cc
@@ -949,8 +949,13 @@ void Inet4UcRouteReq::HandleRequest() const {
 
 AgentSandeshPtr InetUnicastAgentRouteTable::GetAgentSandesh
 (const AgentSandeshArguments *args, const std::string &context) {
-    return AgentSandeshPtr(new AgentInet4UcRtSandesh(vrf_entry(), context,
-                                                     true));
+    if (type_ == Agent::INET4_UNICAST) {
+        return AgentSandeshPtr(new AgentInet4UcRtSandesh(vrf_entry(), context,
+                                                         false));
+    } else {
+        return AgentSandeshPtr(new AgentInet6UcRtSandesh(vrf_entry(), context,
+                                                         false));
+    }
 }
 
 void Inet6UcRouteReq::HandleRequest() const {