From 981b87c2f01eb0d7cf0f8d3c1d897928deb92c76 Mon Sep 17 00:00:00 2001
From: Taoyu Li <taoyl@microsoft.com>
Date: Fri, 16 Feb 2018 01:51:57 +0000
Subject: [PATCH] Adapt to config engine change to load platform info properly

---
 config/main.py           | 4 ++--
 psuutil/main.py          | 6 +++---
 scripts/decode-syseeprom | 4 ++--
 scripts/generate_dump    | 2 +-
 scripts/reboot           | 2 +-
 show/main.py             | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/main.py b/config/main.py
index 7d1661f705..42bb4ac30a 100755
--- a/config/main.py
+++ b/config/main.py
@@ -231,9 +231,9 @@ def load_minigraph():
     client = config_db.redis_clients[config_db.CONFIG_DB]
     client.flushdb()
     if os.path.isfile('/etc/sonic/init_cfg.json'):
-        command = "{} -m -j /etc/sonic/init_cfg.json --write-to-db".format(SONIC_CFGGEN_PATH)
+        command = "{} -H -m -j /etc/sonic/init_cfg.json --write-to-db".format(SONIC_CFGGEN_PATH)
     else:
-        command = "{} -m --write-to-db".format(SONIC_CFGGEN_PATH)
+        command = "{} -H -m --write-to-db".format(SONIC_CFGGEN_PATH)
     run_command(command, display_cmd=True)
     client.set(config_db.INIT_INDICATOR, 1)
     if os.path.isfile('/etc/sonic/acl.json'):
diff --git a/psuutil/main.py b/psuutil/main.py
index 002619e0b4..4e347ab9ef 100644
--- a/psuutil/main.py
+++ b/psuutil/main.py
@@ -28,8 +28,8 @@
 PLATFORM_ROOT_PATH_DOCKER = '/usr/share/sonic/platform'
 SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen'
 MINIGRAPH_PATH = '/etc/sonic/minigraph.xml'
-HWSKU_KEY = "DEVICE_METADATA['localhost']['hwsku']"
-PLATFORM_KEY = 'platform'
+HWSKU_KEY = 'DEVICE_METADATA.localhost.hwsku'
+PLATFORM_KEY = 'DEVICE_METADATA.localhost.platform'
 
 # Global platform-specific psuutil class instance
 platform_psuutil = None
@@ -70,7 +70,7 @@ def log_error(msg, also_print_to_console=False):
 # Returns platform and HW SKU
 def get_platform_and_hwsku():
     try:
-        proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-v', PLATFORM_KEY],
+        proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-H', '-v', PLATFORM_KEY],
                                 stdout=subprocess.PIPE,
                                 shell=False,
                                 stderr=subprocess.STDOUT)
diff --git a/scripts/decode-syseeprom b/scripts/decode-syseeprom
index f060ce47b9..6b70a4daab 100755
--- a/scripts/decode-syseeprom
+++ b/scripts/decode-syseeprom
@@ -22,7 +22,7 @@ except ImportError, e:
 
 
 SONIC_CFGGEN = '/usr/local/bin/sonic-cfggen'
-PLATFORM_KEY = 'platform'
+PLATFORM_KEY = 'DEVICE_METADATA.localhost.platform'
 
 PLATFORM_ROOT = '/usr/share/sonic/device'
 
@@ -32,7 +32,7 @@ CACHE_FILE = 'syseeprom_cache'
 # Returns platform and HW SKU
 def get_platform():
     try:
-        proc = subprocess.Popen([SONIC_CFGGEN, '-v', PLATFORM_KEY],
+        proc = subprocess.Popen([SONIC_CFGGEN, '-H', '-v', PLATFORM_KEY],
                                 stdout=subprocess.PIPE,
                                 shell=False,
                                 stderr=subprocess.STDOUT)
diff --git a/scripts/generate_dump b/scripts/generate_dump
index 74083e1765..fade14f7cd 100755
--- a/scripts/generate_dump
+++ b/scripts/generate_dump
@@ -286,7 +286,7 @@ main() {
 
     save_cmd "docker exec -it syncd saidump" "saidump"
     
-    local platform="$(/usr/local/bin/sonic-cfggen -v platform)"
+    local platform="$(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)"
     if [[ $platform == *"mlnx"* ]]; then
         local sai_dump_filename="/tmp/sai_sdk_dump_$(date +"%m_%d_%Y_%I_%M_%p")"
         docker exec -it syncd saisdkdump -f $sai_dump_filename
diff --git a/scripts/reboot b/scripts/reboot
index 019e5ad762..b02d5fd425 100755
--- a/scripts/reboot
+++ b/scripts/reboot
@@ -11,7 +11,7 @@ function stop_sonic_services()
 }
 
 # Obtain our platform as we will mount directories with these names in each docker
-PLATFORM=`sonic-cfggen -v platform`
+PLATFORM=`sonic-cfggen -H -v DEVICE_METADATA.hwsku.platform`
 
 DEVPATH="/usr/share/sonic/device"
 REBOOT="platform_reboot"
diff --git a/show/main.py b/show/main.py
index b59fe9e1e2..74e28143c2 100755
--- a/show/main.py
+++ b/show/main.py
@@ -473,8 +473,8 @@ def summary():
     username = getpass.getuser()
 
     PLATFORM_TEMPLATE_FILE = "/tmp/cli_platform_{0}.j2".format(username)
-    PLATFORM_TEMPLATE_CONTENTS = "Platform: {{ platform }}\n" \
-                                 "HwSKU: {{ DEVICE_METADATA['localhost']['hwsku'] }}\n" \
+    PLATFORM_TEMPLATE_CONTENTS = "Platform: {{ DEVICE_METADATA.localhost.platform }}\n" \
+                                 "HwSKU: {{ DEVICE_METADATA.localhost.hwsku }}\n" \
                                  "ASIC: {{ asic_type }}"
 
     # Create a temporary Jinja2 template file to use with sonic-cfggen