Merge "Retain the VRF and policy flag on the interface when HC fails.…

…" into R3.1
Juniper · Nov 22, 2016 · 508d20a · 508d20a
2 parents 530f68b + 0b268dc
commit 508d20a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/vnsw/agent/vrouter/ksync/interface_ksync.cc b/src/vnsw/agent/vrouter/ksync/interface_ksync.cc
@@ -52,6 +52,7 @@ InterfaceKSyncEntry::InterfaceKSyncEntry(InterfaceKSyncObject *obj,
     layer3_forwarding_(entry->layer3_forwarding_),
     ksync_obj_(obj), l2_active_(false),
     metadata_l2_active_(entry->metadata_l2_active_),
+    metadata_ip_active_(entry->metadata_ip_active_),
     bridging_(entry->bridging_),
     mac_(entry->mac_),
     smac_(entry->smac_),
@@ -95,6 +96,7 @@ InterfaceKSyncEntry::InterfaceKSyncEntry(InterfaceKSyncObject *obj,
     ksync_obj_(obj),
     l2_active_(false),                
     metadata_l2_active_(false),
+    metadata_ip_active_(false),
     bridging_(true),
     mac_(),
     smac_(),
@@ -277,14 +279,21 @@ bool InterfaceKSyncEntry::Sync(DBEntry *e) {
                 vm_port->metadata_l2_active();
             ret = true;
         }
+
+        if (metadata_ip_active_ !=
+            vm_port->metadata_ip_active()) {
+            metadata_ip_active_ =
+                vm_port->metadata_ip_active();
+            ret = true;
+        }
     }
 
     uint32_t vrf_id = VIF_VRF_INVALID;
     bool policy_enabled = false;
     std::string analyzer_name;
     Interface::MirrorDirection mirror_direction = Interface::UNKNOWN;
     bool has_service_vlan = false;
-    if (l2_active_ || ipv4_active_ || metadata_l2_active_) {
+    if (l2_active_ || ipv4_active_ || metadata_l2_active_ || metadata_ip_active_) {
         vrf_id = intf->vrf_id();
         if (vrf_id == VrfEntry::kInvalidIndex) {
             vrf_id = VIF_VRF_INVALID;

diff --git a/src/vnsw/agent/vrouter/ksync/interface_ksync.h b/src/vnsw/agent/vrouter/ksync/interface_ksync.h
@@ -92,6 +92,7 @@ class InterfaceKSyncEntry : public KSyncNetlinkDBEntry {
     InterfaceKSyncObject *ksync_obj_;
     bool l2_active_;
     bool metadata_l2_active_;
+    bool metadata_ip_active_;
     bool bridging_;
     MacAddress mac_;
     MacAddress smac_;