Merge "Handle Update of dest IP for Health Check instance"

Juniper · Feb 4, 2016 · 12bbf08 · 12bbf08
2 parents 201e963 + b1547a7
commit 12bbf08
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/vnsw/agent/oper/health_check.cc b/src/vnsw/agent/oper/health_check.cc
@@ -233,6 +233,7 @@ void HealthCheckService::PostAdd() {
 bool HealthCheckService::Copy(HealthCheckTable *table,
                               const HealthCheckServiceData *data) {
     bool ret = false;
+    bool dest_ip_changed = false;
 
     if (monitor_type_ != data->monitor_type_) {
         monitor_type_ = data->monitor_type_;
@@ -271,6 +272,7 @@ bool HealthCheckService::Copy(HealthCheckTable *table,
 
     if (dest_ip_ != data->dest_ip_) {
         dest_ip_ = data->dest_ip_;
+        dest_ip_changed = true;
         ret = true;
     }
 
@@ -318,6 +320,11 @@ bool HealthCheckService::Copy(HealthCheckTable *table,
                 inst->ip_->set_destination_ip(dest_ip_);
                 ret = true;
             } else {
+                if (dest_ip_changed) {
+                    // change in destination IP needs to be propagated
+                    // explicitly to metadata-IP object
+                    it->second->ip_->set_destination_ip(dest_ip_);
+                }
                 it++;
             }
             it_cfg++;