Merge branch 'tk_tof3_prof_nam_bf' of github.com:tkerykx/sonic-utilities into tk_tof3_prof_nam_bf

Author: Taras Keryk

config/plugins/barefoot.py

@@ -32,23 +32,33 @@ def profile(profile):
         chip_family = json.load(file)['chip_list'][0]['chip_family'].lower()
 
     # Check if profile is supported
-    if chip_family == 'tofino' and profile[0] == 'y' or \
-        chip_family == 'tofino2' and profile[0] == 'x':
+    if chip_family == 'tofino' and profile[0] != 'x' or \
+        chip_family == 'tofino2' and profile[0] != 'y':
         click.echo('Specified profile is unsupported on the system')
         raise click.Abort()
-    
-    # Check if profile exists
+
+    # Check if profile <profile_name>_<chip_family> exists
+    no_arch_information = False
     completed_process = subprocess.run(['docker', 'exec', '-it', 'syncd',
-        'test', '-d', '/opt/bfn/install_' + profile + '_profile'])
+        'test', '-d', '/opt/bfn/install_' + profile + '_' + chip_family])
+
+    # Otherwise, check if profile <profile_name>_profile exists (only for tofino and tofino2)
     if completed_process.returncode != 0:
-        click.echo('No profile with the provided name found')
+        if chip_family == 'tofino' or chip_family == 'tofino2':
+            completed_process = subprocess.run(['docker', 'exec', '-it', 'syncd',
+            'test', '-d', '/opt/bfn/install_' + profile + '_profile'])
+            no_arch_information = True
+
+    if completed_process.returncode != 0:
+        click.echo('No profile with the provided name found for {}'.format(chip_family))
         raise click.Abort()
 
     # Update configuration
     config_db = ConfigDBConnector()
     config_db.connect()
-    config_db.mod_entry('DEVICE_METADATA', 'localhost',
-        {'p4_profile': profile + '_profile'})
+    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)
 
 def register(cli):

show/platform.py

@@ -154,3 +154,10 @@ def firmware(args):
         subprocess.check_call(cmd, shell=True)
     except subprocess.CalledProcessError as e:
         sys.exit(e.returncode)
+
+# 'barefoot' subcommand ("show platform barefoot")
+@platform.command()
+def barefoot():
+    """Show Barefoot profile information"""
+    cmd = "barefoot profile"
+    clicommon.run_command(cmd)

show/plugins/barefoot.py

@@ -22,24 +22,32 @@ def profile():
     hwsku_dir = device_info.get_path_to_hwsku_dir()
     with open(hwsku_dir + '/switch-tna-sai.conf') as file:
         chip_family = json.load(file)['chip_list'][0]['chip_family'].lower()
-    
+
     # Print current profile
     click.echo('Current profile: ', nl=False)
     subprocess.run('docker exec -it syncd readlink /opt/bfn/install | sed '
-        r's/install_\\\(.\*\\\)_profile/\\1/', check=True, shell=True)
-    
-    # Exclude current and unsupported profiles
+        r's/install_\\\(.\*\\\)_profile/\\1/'
+        r' | sed s/install_\\\(.\*\\\)_tofino\\\(.\*\\\)/\\1/', check=True, shell=True)
+
+    # Check if profile naming format contains tofino family information 
+    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 = ''
     if chip_family == 'tofino':
-        opts = r'\! -name install_y\*_profile '
+        opts = r' -name install_x\*' + suffix
     elif chip_family == 'tofino2':
-        opts = r'\! -name install_x\*_profile '
-    
+        opts = r' -name install_y\*' + suffix
+    else:
+        opts = r' -name \*' + suffix
+
     # Print profile list
     click.echo('Available profile(s):')
     subprocess.run('docker exec -it syncd find /opt/bfn -mindepth 1 '
-        r'-maxdepth 1 -type d -name install_\*_profile ' + opts + '| sed '
-        r's%/opt/bfn/install_\\\(.\*\\\)_profile%\\1%', shell=True)
+        r'-maxdepth 1 -type d,l ' + opts + '| sed '
+        r's%/opt/bfn/install_\\\(.\*\\\)_profile%\\1%'
+        r' | sed s%/opt/bfn/install_\\\(.\*\\\)_tofino\\\(.\*\\\)%\\1%', shell=True)
 
 def register(cli):
     version_info = device_info.get_sonic_version_info()

tests/config_barefoot_test.py

@@ -0,0 +1,39 @@
+import os
+import sys
+import textwrap
+from unittest import mock
+
+import pytest
+from click.testing import CliRunner
+import config.plugins.barefoot as bf
+import config.main as config_main
+
+@pytest.fixture(scope='class')
+def config_env():
+    os.environ["UTILITIES_UNIT_TESTING"] = "1"
+
+    yield
+
+    os.environ["UTILITIES_UNIT_TESTING"] = "0"
+
+class TestConfigPlatformBarefoot(object):
+    @classmethod
+    def setup_class(cls):
+        print("SETUP")
+    
+    def test_profile(self):
+        runner = CliRunner()
+        expected_output = "Swss service will be restarted, continue? [y/N]: \nAborted!\n"
+        #result = runner.invoke(show.cli.commands['platform'].commands['barefoot'], ['profile'])
+        #result = runner.invoke(show.cli.commands['platform'].commands['barefoot'].commands['profile'])
+        result = runner.invoke(bf.barefoot.commands['profile'], ['default'])
+        #assert mock_run_command.call_count == 0
+        #assert result.exit_code == 2
+        #assert result.exit_code == 0
+        print("result.exit_code:", result.exit_code)
+        print("result.output:", result.output)
+        assert result.output == expected_output
+        #mock_run_command.assert_called_with('show platform barefoot profile', display_cmd=False)
+    
+    def test_register(self):
+        bf.register(config_main.config)