Merge "* Copy interface mac in AAP route if no mac is specified."

Juniper · Jul 26, 2016 · 163eb6e · 163eb6e
2 parents b3b7bdf + c40da29
commit 163eb6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/vnsw/agent/oper/test/test_aap.cc b/src/vnsw/agent/oper/test/test_aap.cc
@@ -172,6 +172,8 @@ TEST_F(TestAap, AddDel_1) {
 
     AddAap("intf1", 1, v);
     EXPECT_TRUE(RouteFind("vrf1", ip, 32));
+    EXPECT_TRUE(RouteGet("vrf1", ip, 32)->GetActiveNextHop()->GetType() == 
+                NextHop::INTERFACE);
     v.clear();
     AddAap("intf1", 1, v);
     EXPECT_FALSE(RouteFind("vrf1", ip, 32));

diff --git a/src/vnsw/agent/oper/vm_interface.cc b/src/vnsw/agent/oper/vm_interface.cc
@@ -5017,7 +5017,8 @@ VmInterface::GetIpMac(const IpAddress &ip, uint8_t plen) const {
     AllowedAddressPairSet::const_iterator it =
         allowed_address_pair_list_.list_.begin();
     while (it != allowed_address_pair_list_.list_.end()) {
-        if (it->addr_ == ip && it->plen_ == plen) {
+        if (it->addr_ == ip && it->plen_ == plen &&
+            it->mac_ != MacAddress::kZeroMac) {
             return it->mac_;
         }
         it++;