Merge "Ignore change notification for loadbalancer-pool."

Juniper · Jan 26, 2016 · 362ca7e · 362ca7e
2 parents 38818d6 + 0727f7c
commit 362ca7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/vnsw/agent/oper/loadbalancer_pool.cc b/src/vnsw/agent/oper/loadbalancer_pool.cc
@@ -201,6 +201,10 @@ bool LoadbalancerPoolTable::OnChange(DBEntry *entry, const DBRequest *request) {
     LoadbalancerPoolData *data = static_cast<LoadbalancerPoolData *>(
         request->data.get());
 
+    /* Ignore change notifications if the entry is marked for delete */
+    if (data->node()->IsDeleted()) {
+        return false;
+    }
     assert(graph_);
     LoadBalancerPoolInfo properties;
     CalculateProperties(graph_, data->node(), &properties, &type);

diff --git a/src/vnsw/agent/oper/vm_interface.cc b/src/vnsw/agent/oper/vm_interface.cc
@@ -204,7 +204,7 @@ static void BuildFloatingIpList(Agent *agent, VmInterfaceConfigData *data,
                     IpAddress fixed_ip_addr =
                         IpAddress::from_string(fip->fixed_ip_address(), ec);
                     if (ec.value() != 0) {
-                        fixed_ip_addr = Ip4Address(0);
+                        fixed_ip_addr = IpAddress();
                     }
                     data->floating_ip_list_.list_.insert
                         (VmInterface::FloatingIp(addr, vrf_node->name(),
@@ -3657,7 +3657,7 @@ void VmInterface::FloatingIp::DeActivate(VmInterface *interface, bool l2) const{
 
 const IpAddress
 VmInterface::FloatingIp::GetFixedIp(const VmInterface *interface) const {
-    if (fixed_ip_.to_v4() == Ip4Address(0)) {
+    if (fixed_ip_.is_unspecified()) {
         if (floating_ip_.is_v4() == true) {
             return interface->primary_ip_addr();
         } else {