revert the change for reformating j2 output

sonic-net · Jun 1, 2022 · 7f2c3db · 7f2c3db
1 parent ae9b69e
commit 7f2c3db
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -12,10 +12,10 @@
 {%-     if DEVICE_METADATA['localhost']['subtype'] is defined -%}
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
-{%-             set IPinIP_sock = 'sai_tunnel_support=1\r\n'
-                                   + 'sai_tunnel_underlay_route_mode=1\r\n'
-                                   + 'host_as_route_disable=1\r\n'
-                                   + 'l3_ecmp_levels=2' -%}
+{%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
+                                   host_as_route_disable=1
+                                   l3_ecmp_levels=2' -%}
 {%-             set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-         endif %}
 {%-     endif %}

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -4,10 +4,10 @@
 {%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
-{%-         set IPinIP_sock = 'sai_tunnel_support=1\r\n'
-                               + 'sai_tunnel_underlay_route_mode=1\r\n'
-                               + 'host_as_route_disable=1\r\n'
-                               + 'l3_ecmp_levels=2' -%} -%}
+{%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               sai_tunnel_underlay_route_mode=1
+                               host_as_route_disable=1
+                               l3_ecmp_levels=2' -%} -%}
 {%-         set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-     endif %}
 {%- endif %}

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -12,10 +12,10 @@
 {%-     if DEVICE_METADATA['localhost']['subtype'] is defined -%}
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
-{%-             set IPinIP_sock = 'sai_tunnel_support=1\r\n'
-                                + 'sai_tunnel_underlay_route_mode=1\r\n'
-                                + 'host_as_route_disable=1\r\n'
-                                + 'l3_ecmp_levels=2' -%}
+{%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
+                                   host_as_route_disable=1
+                                   l3_ecmp_levels=2' -%}
 {%-             set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
 {%-         endif %}
 {%-     endif %}

diff --git a/src/sonic-config-engine/tests/sample_output/py3/arista7260-dualtor.config.bcm b/src/sonic-config-engine/tests/sample_output/py3/arista7260-dualtor.config.bcm
@@ -937,7 +937,7 @@ serdes_preemphasis_130=0x580c
 serdes_preemphasis_131=0x580c
 
 mmu_init_config="MSFT-TH2-Tier0"
-sai_tunnel_support=1
-sai_tunnel_underlay_route_mode=1
-host_as_route_disable=1
-l3_ecmp_levels=2
+sai_tunnel_support=1
+                               sai_tunnel_underlay_route_mode=1
+                               host_as_route_disable=1
+                               l3_ecmp_levels=2