Along with label modify ethernet-tag as well.

Change-Id: I9d56785dcff92b5bbdbaf8b3b33e895be646c607 Closes-bug: 1529665
Juniper · Feb 4, 2016 · 8145128 · 8145128
1 parent 60ea648
commit 8145128
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/vnsw/agent/controller/controller_peer.cc b/src/vnsw/agent/controller/controller_peer.cc
@@ -2065,14 +2065,14 @@ bool AgentXmppChannel::BuildEvpnMulticastMessage(EnetItemType &item,
                 nh.tunnel_encapsulation_list.tunnel_encapsulation.push_back("udp");
             }
         } else {
+            if (path == NULL)
+                path = route->FindPath(agent_->local_peer());
+
             if (path) {
                 nh.label = path->vxlan_id();
                 item.entry.nlri.ethernet_tag = nh.label;
             } else {
-                //Before marking label as 0 check for local_peer path as well.
-                path = route->FindPath(agent_->local_peer());
-                if (path == NULL)
-                    nh.label = 0;
+                nh.label = 0;
             }
             nh.tunnel_encapsulation_list.tunnel_encapsulation.push_back("vxlan");
         }

diff --git a/src/vnsw/agent/test/test_l2route.cc b/src/vnsw/agent/test/test_l2route.cc
@@ -1456,6 +1456,8 @@ TEST_F(RouteTest, evpn_mcast_label_check_with_no_vm) {
                                         false);
     autogen::EnetNextHopType nh = item.entry.next_hops.next_hop.back();
     EXPECT_TRUE(nh.label != 0);
+    EXPECT_TRUE(item.entry.nlri.ethernet_tag != 0);
+    EXPECT_TRUE(item.entry.nlri.ethernet_tag == nh.label);
     //Add VM
     CreateVmportEnv(input, 1);
     client->WaitForIdle();