Gratuitous arp cache is having stale entries even after delete

of VRF or interface due to that crash is seen.
Timer functinality is also not getting triggered becuase of gratious arp
check miss. now it is enabled this will also ensures that entries will
removed from Gratuitous cache.
closes-bug: #1712189

Change-Id: I44699840cdfe6285272ff8e3f5b3baf79f84304b

src/vnsw/agent/services/arp_proto.cc

@@ -79,6 +79,21 @@ void ArpProto::VrfNotify(DBTablePartBase *part, DBEntryBase *entry) {
                 } else
                     it++;
             }
+            for (GratuitousArpIterator it = gratuitous_arp_cache_.begin();
+                 it != gratuitous_arp_cache_.end(); ) {
+                 ArpKey key = it->first;
+                 if (key.vrf == vrf) {
+                     for (ArpEntrySet::iterator sit = it->second.begin();
+                          sit != it->second.end();) {
+                         ArpEntry *entry = *sit;
+                         it->second.erase(sit++);
+                         delete entry;
+                     }
+                    gratuitous_arp_cache_.erase(it++);
+                 }else {
+                    it++;
+                 }
+            }
             state->Delete();
         }
         return;
@@ -427,7 +442,8 @@ void ArpVrfState::RouteUpdate(DBTablePartBase *part, DBEntryBase *entry) {
                               arp_proto->ip_fabric_interface());
     } else {
         if (intf_nh) {
-            if (!intf->IsDeleted() && intf->type() == Interface::VM_INTERFACE) {
+            if (!intf->IsDeleted() && intf->type() == Interface::VM_INTERFACE
+                && static_cast<const VmInterface*>(intf)->IsActive()) {
                 ArpKey intf_key(route->addr().to_v4().to_ulong(), route->vrf());
                 arp_proto->AddGratuitousArpEntry(intf_key);
                 arp_proto->SendArpIpc(ArpProto::ARP_SEND_GRATUITOUS,
@@ -567,6 +583,16 @@ void ArpProto::InterfaceNotify(DBEntryBase *entry) {
             intf_entry.arp_key_list.clear();
             interface_arp_map_.erase(it);
         }
+
+        if (itf->type() == Interface::VM_INTERFACE) {
+            ArpKey key(static_cast<VmInterface *>
+                       (itf)->primary_ip_addr().to_ulong(), itf->vrf());
+            ArpEntry *arpentry = GratuitousArpEntry(key, itf);
+            if (arpentry) {
+                DeleteGratuitousArpEntry(arpentry);
+            }
+        }
+
         if (itf->type() == Interface::PHYSICAL &&
             itf->name() == agent_->fabric_interface_name()) {
             set_ip_fabric_interface(NULL);
@@ -656,7 +682,8 @@ void ArpProto::NextHopNotify(DBEntryBase *entry) {
 
 bool ArpProto::TimerExpiry(ArpKey &key, uint32_t timer_type,
                            const Interface* itf) {
-    if (arp_cache_.find(key) != arp_cache_.end()) {
+    if (arp_cache_.find(key) != arp_cache_.end() ||
+        gratuitous_arp_cache_.find(key) != gratuitous_arp_cache_.end()) {
         SendArpIpc((ArpProto::ArpMsgType)timer_type, key, itf);
     }
     return false;