From 3bb61ab10c63c283e6e541e75f51cd016df64cc9 Mon Sep 17 00:00:00 2001
From: yozhao101 <56170650+yozhao101@users.noreply.github.com>
Date: Fri, 7 Feb 2020 12:35:35 -0800
Subject: [PATCH] [init_cfg.json] Maintain a separate init_cfg.json.j2 template
 file (#4092)

---
 files/build_templates/init_cfg.json.j2        | 20 +++++++++++++++++++
 .../build_templates/sonic_debian_extension.j2 |  8 +++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 files/build_templates/init_cfg.json.j2

diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2
new file mode 100644
index 0000000000..33cfe990f9
--- /dev/null
+++ b/files/build_templates/init_cfg.json.j2
@@ -0,0 +1,20 @@
+{
+    "DEVICE_METADATA": {
+        "localhost": {
+            "default_bgp_status": {% if shutdown_bgp_on_start == "y" %}"down"{% else %}"up"{% endif %},
+            "default_pfcwd_status": {% if enable_pfcwd_on_start == "y" %}"enable"{% else %}"disable"{% endif %}
+        }
+    },
+    "CRM": {
+        "Config": {
+            "polling_interval": "300",
+{%- for crm_res in ["ipv4_route", "ipv6_route", "ipv4_nexthop", "ipv6_nexthop", "ipv4_neighbor",
+                    "ipv6_neighbor", "nexthop_group_member", "nexthop_group", "acl_table",
+                    "acl_group", "acl_entry", "acl_counter", "fdb_entry"] %}
+            "{{crm_res}}_threshold_type": "percentage",
+            "{{crm_res}}_low_threshold": "70",
+            "{{crm_res}}_high_threshold": "85"{% if not loop.last %},{% endif -%}
+{% endfor %}
+        }
+    }
+}
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index a32120bf8d..50f242a0a0 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -277,11 +277,9 @@ sudo bash -c "echo dhcp_as_static=true >> $FILESYSTEM_ROOT/etc/sonic/updategraph
 {% else %}
 sudo bash -c "echo enabled=false > $FILESYSTEM_ROOT/etc/sonic/updategraph.conf"
 {% endif %}
-sudo bash -c "echo '{ \"DEVICE_METADATA\": { \"localhost\": { \"default_bgp_status\": {% if shutdown_bgp_on_start == "y" %}\"down\"{% else %}\"up\"{% endif %}, \"default_pfcwd_status\": {% if enable_pfcwd_on_start == "y" %}\"enable\"{% else %}\"disable\"{% endif %}  } },
-{%- print ' \\"CRM\\": { \\"Config\\": { \\"polling_interval\\": \\"300\\", ' %}
-{%- for crm_res in ["ipv4_route", "ipv6_route", "ipv4_nexthop", "ipv6_nexthop", "ipv4_neighbor", "ipv6_neighbor", "nexthop_group_member", "nexthop_group", "acl_table", "acl_group", "acl_entry", "acl_counter", "fdb_entry"] -%}
-\"{{crm_res}}_threshold_type\": \"percentage\", \"{{crm_res}}_low_threshold\": \"70\", \"{{crm_res}}_high_threshold\": \"85\"{% if not loop.last %}, {% endif %}
-{%- endfor %} } } }' >> $FILESYSTEM_ROOT/etc/sonic/init_cfg.json"
+
+# Generate initial SONiC configuration file
+j2 files/build_templates/init_cfg.json.j2 | sudo tee $FILESYSTEM_ROOT/etc/sonic/init_cfg.json
 
 # Copy config-setup script and service file
 j2 files/build_templates/config-setup.service.j2 | sudo tee $FILESYSTEM_ROOT/etc/systemd/system/config-setup.service