Merge "Ignore sending VM subscribes for ServiceInstance VMs, Interfac…

…e port-type attribute distinguishes Nova created VMs and ServiceInstance VMs."
Juniper · Dec 4, 2014 · 54421e9 · 54421e9
2 parents ccd2c98 + 974a6cf
commit 54421e9
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/vnsw/agent/controller/controller_ifmap.cc b/src/vnsw/agent/controller/controller_ifmap.cc
@@ -91,14 +91,21 @@ void AgentIfMapVmExport::Notify(DBTablePartBase *partition, DBEntryBase *e) {
     AgentXmppChannel *peer = NULL;
     AgentIfMapXmppChannel *ifmap = NULL;
     struct VmExportInfo *info = NULL;
+
+    std::stringstream vmid, vmiid;
+    vmid << entry->GetVmUuid();
+    vmiid << entry->GetUuid();
+    if (entry->port_type() == CfgIntEntry::CfgIntNameSpacePort) {
+        CONTROLLER_TRACE(IFMapVmExportTrace, vmid.str(), "NameSpacePort",
+                         "Ignore Sending Subscribe/Unsubscribe");
+        return;
+    }
+
     VmMap::iterator vm_it = vm_map_.find(entry->GetVmUuid());
     if (vm_map_.end() != vm_it) {
         info = vm_it->second;
     }
 
-    std::stringstream vmid, vmiid;
-    vmid << entry->GetVmUuid();
-    vmiid << entry->GetUuid();
     if (entry->IsDeleted()) {
 
         //If delete already processed, neglect the delete