From 7b14dcfbbce5c25b8421ecc40a7d39dd2e9eb6f9 Mon Sep 17 00:00:00 2001 From: Manish Date: Fri, 22 Jul 2016 14:35:29 +0530 Subject: [PATCH] MPLS gre never get picked up for remote route. Since there is a change in interpretation of TunnelEncapType, agent failed to identify GRE. Solution is to use the modified encap type name. https://bugs.launchpad.net/juniperopenstack/+bug/1588554 Change-Id: I36540574d46f29387f72ff458e9d4b758e4efada Closes-bug: #1605545 --- src/vnsw/agent/controller/controller_peer.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vnsw/agent/controller/controller_peer.cc b/src/vnsw/agent/controller/controller_peer.cc index 15fd9b5d6de..69f0cb388e7 100644 --- a/src/vnsw/agent/controller/controller_peer.cc +++ b/src/vnsw/agent/controller/controller_peer.cc @@ -298,7 +298,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); @@ -315,7 +316,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); @@ -329,7 +331,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);