Merge "closes-bug:1351172 While printing Agent config introspect not …

…processing the Delete Marked node adjacencies and printing this node as Delete Marked Config" into R2.0
Juniper · Feb 5, 2015 · 9e1bbcb · 9e1bbcb
2 parents b2d4ea0 + ef9459d
commit 9e1bbcb
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/ifmap/ifmap_agent_sandesh.cc b/src/ifmap/ifmap_agent_sandesh.cc
@@ -144,18 +144,20 @@ void xml_parse(pugi::xml_node &node, string &s, int n) {
 void ShowIFMapAgentTable::MakeNode(string &dst, DBEntryBase *src) {
     IFMapNode *node = static_cast<IFMapNode *>(src);
     pugi::xml_document doc;
-    pugi::xml_node config = doc.append_child("config");
+    pugi::xml_node config;
+
+    if (!node->IsDeleted()) {
+        config = doc.append_child("config");
+    } else {
+        config = doc.append_child("Delete Marked config");
+    }
 
     node->EncodeNodeDetail(&config);
-#if 0
-    ostringstream oss;
-    doc.save(oss);
-    dst = oss.str();
-    //replace(dst.begin(), dst.end(), '<', '"');
-    //replace(dst.begin(), dst.end(), '>', '"');
-#else 
     xml_parse(config, dst, 1);
-#endif
+
+    if (node->IsDeleted()) {
+        return;
+    }
 
     // Display its adjacencies
     dst = dst + "Adjacencies:\n";