Merge "Fix issue of physical interface field not sent in Vrouter Uve"

Juniper · Apr 21, 2016 · 34a3f3f · 34a3f3f
2 parents 11f6ea1 + 70b4577
commit 34a3f3f
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/src/vnsw/agent/uve/vrouter_uve_entry_base.cc b/src/vnsw/agent/uve/vrouter_uve_entry_base.cc
@@ -592,20 +592,6 @@ bool VrouterUveEntryBase::SendVrouterMsg() {
     if (first) {
         //Physical interface list
         vnsConstants vnsVrouterType;
-        vector<AgentInterface> phy_if_list;
-        PhysicalInterfaceSet::iterator it = phy_intf_set_.begin();
-        while (it != phy_intf_set_.end()) {
-            AgentInterface pitf;
-            const Interface *intf = *it;
-            const PhysicalInterface *port = static_cast
-                                            <const PhysicalInterface *>(intf);
-            pitf.set_name(intf->name());
-            pitf.set_mac_address(GetMacAddress(port->mac()));
-            phy_if_list.push_back(pitf);
-            ++it;
-        }
-        vrouter_agent.set_phy_if(phy_if_list);
-
         //vhost attributes
         InetInterfaceKey key(agent_->vhost_interface_name());
         const Interface *vhost = static_cast<const Interface *>(
@@ -665,6 +651,24 @@ bool VrouterUveEntryBase::SendVrouterMsg() {
 
     }
 
+    vector<AgentInterface> phy_if_list;
+    PhysicalInterfaceSet::iterator it = phy_intf_set_.begin();
+    while (it != phy_intf_set_.end()) {
+        AgentInterface pitf;
+        const Interface *intf = *it;
+        const PhysicalInterface *port = static_cast
+            <const PhysicalInterface *>(intf);
+        pitf.set_name(intf->name());
+        pitf.set_mac_address(GetMacAddress(port->mac()));
+        phy_if_list.push_back(pitf);
+        ++it;
+    }
+    if (prev_vrouter_.get_phy_if() != phy_if_list) {
+        vrouter_agent.set_phy_if(phy_if_list);
+        prev_vrouter_.set_phy_if(phy_if_list);
+        changed = true;
+    }
+
     std::vector<AgentXmppPeer> xmpp_list;
     for (int count = 0; count < MAX_XMPP_SERVERS; count++) {
         AgentXmppPeer peer;