sonic-net · renukamanavalan · Nov 17, 2021 · Apr 22, 2021 · Apr 23, 2021 · Apr 26, 2021
diff --git a/clear/main.py b/clear/main.py
@@ -452,8 +452,7 @@ def translations():
 
 # Load plugins and register them
 helper = util_base.UtilHelper()
-for plugin in helper.load_plugins(plugins):
-    helper.register_plugin(plugin, cli)
+helper.load_and_register_plugins(plugins, cli)
 
 
 if __name__ == '__main__':

diff --git a/clear/plugins/auto/__init__.py b/clear/plugins/auto/__init__.py
diff --git a/config/main.py b/config/main.py
@@ -4562,8 +4562,7 @@ def delete(ctx):
 
 # Load plugins and register them
 helper = util_base.UtilHelper()
-for plugin in helper.load_plugins(plugins):
-    helper.register_plugin(plugin, config)
+helper.load_and_register_plugins(plugins, config)
 
 
 if __name__ == '__main__':

diff --git a/config/plugins/auto/__init__.py b/config/plugins/auto/__init__.py
diff --git a/setup.py b/setup.py
@@ -23,8 +23,10 @@
         'acl_loader',
         'clear',
         'clear.plugins',
+        'clear.plugins.auto',
         'config',
         'config.plugins',
+        'config.plugins.auto',
         'connect',
         'consutil',
         'counterpoll',
@@ -46,6 +48,7 @@
         'show',
         'show.interfaces',
         'show.plugins',
+        'show.plugins.auto',
         'sonic_installer',
         'sonic_installer.bootloader',
         'sonic_package_manager',
@@ -54,6 +57,7 @@
         'undebug',
         'utilities_common',
         'watchdogutil',
+        'sonic_cli_gen',
     ],
     package_data={
         'show': ['aliases.ini'],
@@ -157,6 +161,7 @@
             'spm = sonic_package_manager.main:cli',
             'undebug = undebug.main:cli',
             'watchdogutil = watchdogutil.main:watchdogutil',
+            'sonic-cli-gen = sonic_cli_gen.main:cli',
         ]
     },
     install_requires=[

diff --git a/show/main.py b/show/main.py
@@ -1473,8 +1473,7 @@ def ztp(status, verbose):
 
 # Load plugins and register them
 helper = util_base.UtilHelper()
-for plugin in helper.load_plugins(plugins):
-    helper.register_plugin(plugin, cli)
+helper.load_and_register_plugins(plugins, cli)
 
 
 if __name__ == '__main__':

diff --git a/show/plugins/auto/__init__.py b/show/plugins/auto/__init__.py
diff --git a/sonic-utilities-data/bash_completion.d/sonic-cli-gen b/sonic-utilities-data/bash_completion.d/sonic-cli-gen
@@ -0,0 +1,8 @@
+_sonic_cli_gen_completion() {
+    COMPREPLY=( $( env COMP_WORDS="${COMP_WORDS[*]}" \
+                   COMP_CWORD=$COMP_CWORD \
+                   _SONIC_CLI_GEN_COMPLETE=complete $1 ) )
+    return 0
+}
+
+complete -F _sonic_cli_gen_completion -o default sonic-cli-gen;
diff --git a/sonic-utilities-data/debian/install b/sonic-utilities-data/debian/install
@@ -1,2 +1,3 @@
-bash_completion.d/    /etc/
-templates/*.j2        /usr/share/sonic/templates/
+bash_completion.d/                  /etc/
+templates/*.j2                      /usr/share/sonic/templates/
+templates/sonic-cli-gen/*.j2        /usr/share/sonic/templates/sonic-cli-gen/
diff --git a/sonic-utilities-data/templates/sonic-cli-gen/common.j2 b/sonic-utilities-data/templates/sonic-cli-gen/common.j2
@@ -0,0 +1,3 @@
+{% macro cli_name(name) -%}
+{{ name|lower|replace("_", "-") }}
+{%- endmacro %}