revisions as per @srj102. revert changes to create_tunnel() helper since TTL is set to non-zero

Author: bradh352

orchagent/vxlanorch.cpp

@@ -275,7 +275,7 @@ create_tunnel(
     sai_ip_address_t *dst_ip,
     sai_object_id_t underlay_rif,
     bool p2p,
-    sai_uint8_t encap_ttl)
+    sai_uint8_t encap_ttl=0)
 {
     sai_attribute_t attr;
     std::vector<sai_attribute_t> tunnel_attrs;
@@ -349,13 +349,16 @@ create_tunnel(
         tunnel_attrs.push_back(attr);
     }
 
-    attr.id = SAI_TUNNEL_ATTR_ENCAP_TTL_MODE;
-    attr.value.s32 = SAI_TUNNEL_TTL_MODE_PIPE_MODEL;
-    tunnel_attrs.push_back(attr);
+    if (encap_ttl != 0)
+    {
+        attr.id = SAI_TUNNEL_ATTR_ENCAP_TTL_MODE;
+        attr.value.s32 = SAI_TUNNEL_TTL_MODE_PIPE_MODEL;
+        tunnel_attrs.push_back(attr);
 
-    attr.id = SAI_TUNNEL_ATTR_ENCAP_TTL_VAL;
-    attr.value.u8 = encap_ttl;
-    tunnel_attrs.push_back(attr);
+        attr.id = SAI_TUNNEL_ATTR_ENCAP_TTL_VAL;
+        attr.value.u8 = encap_ttl;
+        tunnel_attrs.push_back(attr);
+    }
 
     sai_object_id_t tunnel_id;
     sai_status_t status = sai_tunnel_api->create_tunnel(

orchagent/vxlanorch.h

@@ -46,7 +46,7 @@ typedef enum
 #define MAX_VLAN_ID 4095
 
 #define MAX_VNI_ID 16777215
-#define DEFAULT_TUNNEL_ENCAP_TTL 64
+#define DEFAULT_TUNNEL_ENCAP_TTL 255
 
 typedef enum
 {

tests/test_vxlan_tunnel.py

@@ -154,7 +154,7 @@ def check_vxlan_tunnel(dvs, src_ip, dst_ip, tunnel_map_ids, tunnel_map_entry_ids
                         'SAI_TUNNEL_ATTR_PEER_MODE': 'SAI_TUNNEL_PEER_MODE_P2MP',
                         'SAI_TUNNEL_ATTR_ENCAP_SRC_IP': src_ip,
                         'SAI_TUNNEL_ATTR_ENCAP_TTL_MODE': 'SAI_TUNNEL_TTL_MODE_PIPE_MODEL',
-                        'SAI_TUNNEL_ATTR_ENCAP_TTL_VAL': '64'
+                        'SAI_TUNNEL_ATTR_ENCAP_TTL_VAL': '255'
                     }
                 )