Merge "MPLS gre never get picked up for remote route."

Juniper · Jul 22, 2016 · 24f1d7b · 24f1d7b
2 parents 33f0b27 + 9083e0b
commit 24f1d7b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/vnsw/agent/controller/controller_peer.cc b/src/vnsw/agent/controller/controller_peer.cc
@@ -296,7 +296,8 @@ GetEnetTypeBitmap(const EnetTunnelEncapsulationListType &encap) {
          iter != encap.end(); iter++) {
         TunnelEncapType::Encap encap =
             TunnelEncapType::TunnelEncapFromString(*iter);
-        if (encap == TunnelEncapType::MPLS_O_GRE)
+        if ((encap == TunnelEncapType::GRE) ||
+            (encap == TunnelEncapType::MPLS_O_GRE))
             bmap |= (1 << TunnelType::MPLS_GRE);
         if (encap == TunnelEncapType::MPLS_O_UDP)
             bmap |= (1 << TunnelType::MPLS_UDP);
@@ -313,7 +314,8 @@ GetTypeBitmap(const TunnelEncapsulationListType &encap) {
          iter != encap.end(); iter++) {
         TunnelEncapType::Encap encap =
             TunnelEncapType::TunnelEncapFromString(*iter);
-        if (encap == TunnelEncapType::MPLS_O_GRE)
+        if ((encap == TunnelEncapType::GRE) ||
+            (encap == TunnelEncapType::MPLS_O_GRE))
             bmap |= (1 << TunnelType::MPLS_GRE);
         if (encap == TunnelEncapType::MPLS_O_UDP)
             bmap |= (1 << TunnelType::MPLS_UDP);
@@ -327,7 +329,8 @@ GetMcastTypeBitmap(const McastTunnelEncapsulationListType &encap) {
          iter != encap.end(); iter++) {
         TunnelEncapType::Encap encap =
             TunnelEncapType::TunnelEncapFromString(*iter);
-        if (encap == TunnelEncapType::MPLS_O_GRE)
+        if ((encap == TunnelEncapType::GRE) ||
+            (encap == TunnelEncapType::MPLS_O_GRE))
             bmap |= (1 << TunnelType::MPLS_GRE);
         if (encap == TunnelEncapType::MPLS_O_UDP)
             bmap |= (1 << TunnelType::MPLS_UDP);