Fix sfputil/psuutil issues due to dependencies on minigraph (sonic-ne…

…t#253)
Kalimuthu-Velappan · May 16, 2018 · 9087d5f · 9087d5f
1 parent e2a3228
commit 9087d5f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/config/main.py b/config/main.py
@@ -13,8 +13,6 @@
 import mlnx
 
 SONIC_CFGGEN_PATH = "sonic-cfggen"
-MINIGRAPH_PATH = "/etc/sonic/minigraph.xml"
-MINIGRAPH_BGP_SESSIONS = "minigraph_bgp"
 
 #
 # Helper functions

diff --git a/psuutil/main.py b/psuutil/main.py
@@ -27,7 +27,6 @@
 PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
 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 = 'DEVICE_METADATA.localhost.platform'
 
@@ -78,7 +77,7 @@ def get_platform_and_hwsku():
         proc.wait()
         platform = stdout.rstrip('\n')
 
-        proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-m', MINIGRAPH_PATH, '-v', HWSKU_KEY],
+        proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-d', '-v', HWSKU_KEY],
                                 stdout=subprocess.PIPE,
                                 shell=False,
                                 stderr=subprocess.STDOUT)

diff --git a/sfputil/main.py b/sfputil/main.py
@@ -27,7 +27,6 @@
 
 PLATFORM_ROOT_PATH = '/usr/share/sonic/device'
 SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen'
-MINIGRAPH_PATH = '/etc/sonic/minigraph.xml'
 HWSKU_KEY = 'DEVICE_METADATA.localhost.hwsku'
 PLATFORM_KEY = 'DEVICE_METADATA.localhost.platform'
 
@@ -296,7 +295,7 @@ def get_platform_and_hwsku():
         proc.wait()
         platform = stdout.rstrip('\n')
 
-        proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-m', MINIGRAPH_PATH, '-v', HWSKU_KEY],
+        proc = subprocess.Popen([SONIC_CFGGEN_PATH, '-d', '-v', HWSKU_KEY],
                                 stdout=subprocess.PIPE,
                                 shell=False,
                                 stderr=subprocess.STDOUT)