reorg

Author: isabelmsft

generic_config_updater/field_operation_validators.py

@@ -10,15 +10,15 @@
 
 def get_asic_name():
     asic = "unknown"
-    command = ["sudo", "lspci"]
-    hwsku = device_info.get_hwsku()
-    proc = subprocess.Popen(command, universal_newlines=True, stdout=subprocess.PIPE)
-    proc.communicate()
-    output = proc.stdout.readlines()
- 
+
     if device_info.get_sonic_version_info()['asic_type'] == 'cisco-8000':
         asic = "cisco-8000"
-    elif proc.returncode == 0:
+    else:
+        command = ["sudo", "lspci"]
+        hwsku = device_info.get_hwsku()
+        proc = subprocess.Popen(command, universal_newlines=True, stdout=subprocess.PIPE)
+        proc.communicate()
+        output = proc.stdout.readlines()
         if "Broadcom Limited Device b960" in output or "Broadcom Limited Broadcom BCM56960" in output:
             asic = "th"
         elif "Broadcom Limited Device b971" in output:
@@ -27,13 +27,13 @@ def get_asic_name():
             asic = "td2"
         elif "Broadcom Limited Device b870" in output or "Broadcom Inc. and subsidiaries Device b870" in output:
             asic = "td3"
-    else:
+    
+    if asic == "unknown":
         spc1_hwskus = [ 'ACS-MSN2700', 'ACS-MSN2740', 'ACS-MSN2100', 'ACS-MSN2410', 'ACS-MSN2010', 'Mellanox-SN2700', 'Mellanox-SN2700-D48C8' ]
         if hwsku.lower() in [spc1_hwsku.lower() for spc1_hwsku in spc1_hwskus]:
             asic = "spc1"
- 
-    return asic
 
+    return asic
 
 def rdma_config_update_validator(path, operation):
     version_info = device_info.get_sonic_version_info()