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

@@ -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);