From ff3df0d27fbe32f1974e27d95eab05c2087396b4 Mon Sep 17 00:00:00 2001
From: Tamer Ahmed <tamer.ahmed@microsoft.com>
Date: Wed, 19 Aug 2020 10:35:50 -0700
Subject: [PATCH] add delay start info to init_cfg template

---
 files/build_templates/init_cfg.json.j2 | 35 +++++++++++++-------------
 files/image_config/hostcfgd/hostcfgd   |  8 +++---
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2
index 334593a9d3cc..20d450378ab6 100644
--- a/files/build_templates/init_cfg.json.j2
+++ b/files/build_templates/init_cfg.json.j2
@@ -17,26 +17,27 @@
 {% endfor %}
         }
     },
-{%- set features = [("bgp", "enabled", "enabled"),
-                   ("database", "enabled", "disabled"),
-                   ("dhcp_relay", "enabled", "enabled"),
-                   ("lldp", "enabled", "enabled"),
-                   ("pmon", "enabled", "enabled"),
-                   ("radv", "enabled", "enabled"),
-                   ("snmp", "enabled", "enabled"),
-                   ("swss", "enabled", "enabled"),
-                   ("syncd", "enabled", "enabled"),
-                   ("teamd", "enabled", "enabled")] %}
-{%- if include_iccpd == "y" %}{% do features.append(("iccpd", "disabled", "enabled")) %}{% endif %}
-{%- if include_mgmt_framework == "y" %}{% do features.append(("mgmt-framework", "enabled", "enabled")) %}{% endif %}
-{%- if include_nat == "y" %}{% do features.append(("nat", "disabled", "enabled")) %}{% endif %}
-{%- if include_restapi == "y" %}{% do features.append(("restapi", "enabled", "enabled")) %}{% endif %}
-{%- if include_sflow == "y" %}{% do features.append(("sflow", "disabled", "enabled")) %}{% endif %}
-{%- if include_system_telemetry == "y" %}{% do features.append(("telemetry", "enabled", "enabled")) %}{% endif %}
+{%- set features = [("bgp", "enabled", false, "enabled"),
+                   ("database", "enabled", false, "disabled"),
+                   ("dhcp_relay", "enabled", false, "enabled"),
+                   ("lldp", "enabled", false, "enabled"),
+                   ("pmon", "enabled", false, "enabled"),
+                   ("radv", "enabled", false, "enabled"),
+                   ("snmp", "enabled", true, "enabled"),
+                   ("swss", "enabled", false, "enabled"),
+                   ("syncd", "enabled", false, "enabled"),
+                   ("teamd", "enabled", false, "enabled")] %}
+{%- if include_iccpd == "y" %}{% do features.append(("iccpd", "disabled", false, "enabled")) %}{% endif %}
+{%- if include_mgmt_framework == "y" %}{% do features.append(("mgmt-framework", "enabled", false, "enabled")) %}{% endif %}
+{%- if include_nat == "y" %}{% do features.append(("nat", "disabled", false, "enabled")) %}{% endif %}
+{%- if include_restapi == "y" %}{% do features.append(("restapi", "enabled", false, "enabled")) %}{% endif %}
+{%- if include_sflow == "y" %}{% do features.append(("sflow", "disabled", false, "enabled")) %}{% endif %}
+{%- if include_system_telemetry == "y" %}{% do features.append(("telemetry", "enabled", true, "enabled")) %}{% endif %}
     "FEATURE": {
-{%- for feature, state, autorestart in features %}
+{%- for feature, state, delay_start, autorestart in features %}
         "{{feature}}": {
             "state": "{{state}}",
+            "delay_start" : {{delay_start | lower()}},
             "auto_restart": "{{autorestart}}",
             "high_mem_alert": "disabled"
         }{% if not loop.last %},{% endif -%}
diff --git a/files/image_config/hostcfgd/hostcfgd b/files/image_config/hostcfgd/hostcfgd
index 9351e43f844f..22755006badc 100755
--- a/files/image_config/hostcfgd/hostcfgd
+++ b/files/image_config/hostcfgd/hostcfgd
@@ -41,8 +41,8 @@ def obfuscate(data):
         return data
 
 
-def update_feature_state(feature_name, state):
-    feature_suffix = "timer" if feature_name in ["snmp", "telemetry"] else "service"
+def update_feature_state(feature_name, state, delay_start=False):
+    feature_suffix = "timer" if delay_start else "service"
     if state == "enabled":
         start_cmds = []
         start_cmds.append("sudo systemctl unmask {}.{}".format(feature_name, feature_suffix))
@@ -286,7 +286,7 @@ class HostConfigDaemon:
                 syslog.syslog(syslog.LOG_WARNING, "Eanble state of feature '{}' is None".format(feature_name))
                 continue
 
-            update_feature_state(feature_name, state)
+            update_feature_state(feature_name, state, feature_table[feature_name]['delay_start'])
 
     def aaa_handler(self, key, data):
         self.aaacfg.aaa_update(key, data)
@@ -328,7 +328,7 @@ class HostConfigDaemon:
             syslog.syslog(syslog.LOG_WARNING, "Enable state of feature '{}' is None".format(feature_name))
             return
 
-        update_feature_state(feature_name, state)
+        update_feature_state(feature_name, state, feature_table[feature_name]['delay_start'])
 
     def start(self):
         # Update all feature states once upon starting