Fixed profile naming

Author: Taras Keryk

config/plugins/barefoot.py

@@ -56,10 +56,7 @@ def profile(profile):
     # Update configuration
     config_db = ConfigDBConnector()
     config_db.connect()
-    if no_arch_information:
-        profile += '_profile'
-    else:
-        profile = profile + '_' + chip_family
+    profile += '_profile' if no_arch_information else '_' + chip_family
     config_db.mod_entry('DEVICE_METADATA', 'localhost', {'p4_profile': profile})
 
     subprocess.run(['systemctl', 'restart', 'swss'], check=True)

show/plugins/barefoot.py

@@ -30,9 +30,8 @@ def profile():
         r' | sed s/install_\\\(.\*\\\)_tofino\\\(.\*\\\)/\\1/', check=True, shell=True)
 
     # Check if profile naming format contains tofino family information 
-    suffix = '_profile'
-    if '_tofino' in subprocess.check_output(['docker', 'exec', '-it', 'syncd', 'ls', '/opt/bfn']).strip().decode():
-        suffix = '_' + chip_family
+    output = subprocess.check_output(['docker', 'exec', '-it', 'syncd', 'ls', '/opt/bfn']).strip().decode()
+    suffix = '_' + chip_family if '_tofino' in output else '_profile'
 
     # Check supported profiles 
     opts = ''