From 9d2a8e3cea605bebe6c71b4a454470416f5bdb68 Mon Sep 17 00:00:00 2001
From: Taoyu Li <taoyl@microsoft.com>
Date: Wed, 22 Feb 2017 21:48:11 +0000
Subject: [PATCH] Fix the reference in docker-snmp-sv2 to deprecated
 alias_map.json

---
 dockers/docker-snmp-sv2/config.sh    | 3 +--
 src/sonic-config-engine/sonic-cfggen | 8 ++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-snmp-sv2/config.sh b/dockers/docker-snmp-sv2/config.sh
index f22dcd23b0d3..b6216e8353b0 100755
--- a/dockers/docker-snmp-sv2/config.sh
+++ b/dockers/docker-snmp-sv2/config.sh
@@ -8,8 +8,7 @@ mkdir -p /etc/snmp
 
 sonic-cfggen -m /etc/sonic/minigraph.xml -y /etc/sonic/snmp.yml -t /usr/share/sonic/templates/snmpd.conf.j2 >/etc/snmp/snmpd.conf
 
-hwsku=`sonic-cfggen -m /etc/sonic/minigraph.xml -v minigraph_hwsku`
-/bin/cp -rf /usr/share/sonic/$hwsku/alias_map.json /etc/snmp/
+sonic-cfggen -m /etc/sonic/minigraph.xml -s >/etc/snmp/alias_map.json
 
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status
diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index 02518b3ea364..3cd269805b84 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -54,6 +54,7 @@ def main():
     parser.add_argument("-a", "--additional-data", help="addition data, in json string")
     group = parser.add_mutually_exclusive_group()
     group.add_argument("-t", "--template", help="render the data with the template file")
+    group.add_argument("-s", "--alias-mapping", help="print alias mapping json if available", action='store_true')
     group.add_argument("-v", "--var", help="print the value of a variable")
     group.add_argument("--var-json", help="print the value of a variable, in json format")
     group.add_argument("--var-keys", help="print all keys of a map variable")
@@ -101,6 +102,13 @@ def main():
     if args.var_keys != None:
         for key in data[args.var_keys].keys():
           print key
+    
+    if args.alias_mapping != None:
+        mapping = {}
+        if data.has_key('alias_map'):
+            for item in data['alias_map']:
+                mapping[item['sonic']] = item['origin']
+        print json.dumps(mapping)
 
     if args.print_data:
         print data