Merge ~gavin.lin/cc-lab-manager:more-agent-config into cc-lab-manager:master

[Gavin Lin]

Support configs for noprovision type.
Let's land this first and continue working on naming rule.

[Kevin Yeh (kevinyeh)]

lgtm +1

review: Approve

[Devices Certification Bot (ce-certification-qa)]

I tried to merge it but there are some problems. Typically you want to merge or rebase and try again.

review: Needs Fixing

diff --git a/cc_lab_manager/gen_config/gen_agent_tf_config.py b/cc_lab_manager/gen_config/gen_agent_tf_config.py
index 00bc37f..e386440 100644
--- a/cc_lab_manager/gen_config/gen_agent_tf_config.py
+++ b/cc_lab_manager/gen_config/gen_agent_tf_config.py
@@ -4,6 +4,8 @@ import yaml
 import argparse
 import re
 
+from cc_lab_manager.cc_lab_manager_maptable import reboot_script_maptable
+
 agent_config = {"device_ip": None,
         "secure_id": None,
         "node_id": None,
@@ -86,9 +88,11 @@ def close_db(db):
 def read_data_from_db(cursor):
     
     col_in_c3 = ["CID","Lab","IP","MAAS_Node_ID", "Provision",
-                 "CanonicalLabel","SecureID", "Customized_agent_config", "CID"]
+                 "Power", "PDU_IP", "PDU_Outlet", "Controller_IP",
+                 "CanonicalLabel","SecureID", "Customized_agent_config",
+                 "CID"]
     
-    sqlcmd = 'select {},{},{},{},{},{},{},{} from lab_hw \
+    sqlcmd = 'select {},{},{},{},{},{},{},{},{},{},{},{} from lab_hw \
               where CID not like \'dummy-%\' \
               order by {} ASC'.format(*col_in_c3)
     cursor.execute(sqlcmd)
@@ -125,20 +129,35 @@ def generate_agent_config(db_machine_list, cfg_path):
         agent_conf["device_ip"] = ip
         agent_conf["env"]["HEXR_DEVICE_SECURE_ID"] = secure_id
         agent_conf["env"]["DEVICE_IP"] = ip
+
+        agent_conf["reboot_script"] = []
+        power_template = {'PDU_IP' : machine["PDU_IP"],
+                          'PDU_Outlet' : machine["PDU_Outlet"]}
+        try:
+            reboot_script_template = reboot_script_maptable[machine["Power"]]
+
+            for line in reboot_script_template:
+                agent_conf["reboot_script"].append(line.format(**power_template))
+            print(agent_conf["reboot_script"])
+        except:
+            print('No power template')
+
+
+        try:
+            provision = provision_type[machine["Provision"]]
+        except:
+            print("Unknown provision type for {}".format(machine['cid']))
+            continue
         
+        empty_keys = []
+        for key in agent_conf:
+            if agent_conf[key] == None:
+                empty_keys.append(key)
+        for key in empty_keys:
+            agent_conf.pop(key)
+
         with open(os.path.join(cfg_path, 'data-' + machine['lab'].lower(), agent_name, 'default.yaml'), "w+") as f:
-            for key in agent_config:
-                if agent_conf[key] == None:
-                    continue
-                if key == "env":
-                    f.write(key+" :\n")
-                    for env_key in agent_config["env"]:
-                        # We are using the same set of APs currently, we will need this commented section if we need more sets
-                        # if "SSID" in env_key:
-                        #     agent_conf["env"][env_key] += machine["lab"][-1]
-                        f.write("  {key}: {value}\n".format(key=env_key,value=agent_conf["env"][env_key]))
-                else:
-                    f.write("{key}: {value}\n".format(key=key,value=agent_conf[key]))
+            yaml.dump(agent_conf, f, default_flow_style=False, encoding='utf-8', allow_unicode=True, sort_keys=False)
 
         
 def generate_tf_config(db_machine_list, cfg_path):