sync from broadcom_sonic_4.x_share to dell_sonic_4.x_share - 0530 (#112)

* [JIRA SONIC-59502] User name field in not applicable cases should be displayed as Not Applicable instead of empty. Change-Id: Ie96be7eacf13a9ebe4c9e95abbd6a88f1e47533f * [JIRA SONIC-60245] Field to display the operational value of the session timeout in the output of the show authentication clients. Change-Id: Ieddba8ac30568d55197fe1ce172b8cc208ffdc30 * [JIRA SONIC-56405] Added support for pac configuration over range of interfaces. Change-Id: I0ce68fc2497fcc45fcd0c15d6113542967d974c2 Co-authored-by: Sravani Maddukuri <[email protected]> Co-authored-by: Shiva Kumar Boddula <[email protected]> Co-authored-by: Sonic Build <[email protected]> Co-authored-by: SONiC Syncbot <[email protected]>
project-arlo · Jun 1, 2022 · 56d8faf · 56d8faf
1 parent 4670b79
commit 56d8faf
Show file tree

Hide file tree

Showing 11 changed files with 863 additions and 919 deletions.
diff --git a/CLI/actioner/show_config_data.py b/CLI/actioner/show_config_data.py
@@ -433,7 +433,7 @@
     "tacacs_global_key_config": show_tacacs_global_key,
     "tacacs_host_config": show_tacacs_host_config,
     "show_running_media_fec_mode": show_running_media_fec_mode,
-    "authmgr_global_critical_recovery_max_reauth": show_config_authmgr_global_critical_recovery_max_reauth,
+    #"authmgr_global_critical_recovery_max_reauth": show_config_authmgr_global_critical_recovery_max_reauth,
     "authmgr_intf_config_cb": show_config_authmgr_intf_config_cb,
     "mab_global_request_format_attribute": show_config_mab_global_request_format_attribute,
     "mab_intf_config_cb": show_config_mab_intf_config_cb,

diff --git a/CLI/actioner/show_config_pac.py b/CLI/actioner/show_config_pac.py
@@ -43,7 +43,7 @@ def show_config_authmgr_monitor_mode_enable_status(render_tables):
         cmd_str = 'authentication monitor'
 
     return 'CB_SUCCESS', cmd_str
-
+    """
 def show_config_authmgr_global_critical_recovery_max_reauth(render_tables):
     cmd_str = ''
     if 'sonic-authmgr:sonic-authmgr/PAC_GLOBAL_CONFIG_TABLE/PAC_GLOBAL_CONFIG_TABLE_LIST' not in render_tables:
@@ -58,8 +58,7 @@ def show_config_authmgr_global_critical_recovery_max_reauth(render_tables):
         cmd_str = 'authentication critical recovery max-reauth ' + str(db_entry['max_reauth'])
 
     return 'CB_SUCCESS', cmd_str
-
-
+    """
 def show_config_mab_global_request_format_attribute(render_tables):
     cmd_str = ''
     if 'sonic-mab:sonic-mab/MAB_GLOBAL_CONFIG_TABLE/MAB_GLOBAL_CONFIG_TABLE_LIST' not in render_tables:
@@ -121,7 +120,7 @@ def show_config_authmgr_intf_config_cb(render_tables):
                    cmd_list.append(cmd_prfx + 'priority ' + db_entry['priority_list'][0] + ' ' + db_entry['priority_list'][1])
                 else:
                    cmd_list.append(cmd_prfx + 'priority ' + db_entry['priority_list'][0])
-
+                   """
             if 'server_alive_action' in db_entry and db_entry['server_alive_action'] != 'none':
                 cmd_list.append(cmd_prfx + 'event server alive action ' + db_entry['server_alive_action'])
 
@@ -138,7 +137,7 @@ def show_config_authmgr_intf_config_cb(render_tables):
             if 'dead_server_critical_vlan' in db_entry and db_entry['dead_server_critical_vlan'] != 0 \
                 and db_entry['dead_server_action'] != 'none' and db_entry['dead_server_action'] != 'authorize':
                 cmd_list.append(cmd_prfx + 'event server dead action reinitialize vlan ' + str(db_entry['dead_server_critical_vlan']))
-
+                """
             if 'auth_fail_vlan_id' in db_entry and db_entry['auth_fail_vlan_id'] != 0:
                 cmd_list.append(cmd_prfx + 'event fail action authorize vlan ' + str(db_entry['auth_fail_vlan_id']))
 
@@ -147,10 +146,10 @@ def show_config_authmgr_intf_config_cb(render_tables):
 
             if 'reauth_period_from_server' in db_entry and db_entry['reauth_period_from_server'] != True:
                 cmd_list.append(cmd_prfx + 'timer reauthenticate ' + str(db_entry['reauth_period']))
-
+                """
             if 'quiet_period' in db_entry and db_entry['quiet_period'] != 30:
                 cmd_list.append(cmd_prfx + 'timer restart ' + str(db_entry['quiet_period']))
-
+                """
             if 'port_pae_role' in db_entry and db_entry['port_pae_role'] != 'none':
                 cmd_list.append(cmd_prfx_dot1x + 'pae ' + str(db_entry['port_pae_role']))
 

diff --git a/CLI/actioner/sonic_cli_authentication.py b/CLI/actioner/sonic_cli_authentication.py
@@ -63,7 +63,7 @@ def invoke_api(func, args):
         }
         return api.patch(path, body)
     elif func == 'get_sonic_authmgr_global_config':
-        path = cc.Path('/restconf/data/openconfig-authmgr:authmgr/authmgr-global-config/config')
+        path = cc.Path('/restconf/data/openconfig-authmgr:authmgr/authmgr-global-config/state')
         return api.get(path)
     elif func == 'get_sonic_authmgr_global_oper_state_db_data':
         path = cc.Path('/restconf/data/openconfig-authmgr:authmgr/authmgr-global-operational-state-data/state')