Merge "* Add PBB NH mac as a seperate field."

Juniper · Mar 5, 2017 · a243d83 · a243d83
2 parents ad29908 + 85760f0
commit a243d83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/vnsw/agent/oper/agent.sandesh b/src/vnsw/agent/oper/agent.sandesh
@@ -584,6 +584,8 @@ struct NhSandeshData {
    28: bool etree_leaf;
    /** Layer 2 control word */
    29: bool layer2_control_word;
+   /** PBB B-MAC for PBB NH */
+   30: optional string pbb_bmac;
 }
 
 /**

diff --git a/src/vnsw/agent/oper/nexthop.cc b/src/vnsw/agent/oper/nexthop.cc
@@ -2777,7 +2777,7 @@ void NextHop::SetNHSandeshData(NhSandeshData &data) const {
         case PBB: {
              data.set_type("PBB Tunnel");
              const PBBNH *pbb_nh = static_cast<const PBBNH *>(this);
-             data.set_mac(pbb_nh->dest_bmac().ToString());
+             data.set_pbb_bmac(pbb_nh->dest_bmac().ToString());
              data.set_vrf(pbb_nh->vrf()->GetName());
              data.set_isid(pbb_nh->isid());
              std::vector<McastData> data_list;