From bcf453a65f20cb3cae272f7bdbc5f10e8a74d55c Mon Sep 17 00:00:00 2001 From: Longxiang Lyu Date: Tue, 1 Sep 2020 08:50:19 +0000 Subject: [PATCH] [iface_namingmode] Get port_speed from DUT host variables `port_alias` module retrieves `port_speed` from `port_config.ini`. But for 7060 devices, `port_config.ini` has no port speed info. So get port speed from host variable `iface_speed` defined in inventory. Signed-off-by: Longxiang Lyu --- tests/iface_namingmode/test_iface_namingmode.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/iface_namingmode/test_iface_namingmode.py b/tests/iface_namingmode/test_iface_namingmode.py index a20c579327e..6c19cdfb1be 100644 --- a/tests/iface_namingmode/test_iface_namingmode.py +++ b/tests/iface_namingmode/test_iface_namingmode.py @@ -29,6 +29,12 @@ def setup(duthost): up_ports = minigraph_facts['minigraph_ports'].keys() default_interfaces = port_alias_facts['port_name_map'].keys() minigraph_portchannels = minigraph_facts['minigraph_portchannels'] + port_speed_facts = port_alias_facts['port_speed'] + if not port_speed_facts: + all_vars = duthost.host.options['variable_manager'].get_vars() + iface_speed = all_vars['hostvars'][duthost.hostname]['iface_speed'] + port_speed_facts = {_: iface_speed for _ in + port_alias_facts['port_alias_map'].keys()} port_alias = list() port_name_map = dict() @@ -43,7 +49,7 @@ def setup(duthost): port_alias.append(port_alias_new) port_name_map[item] = port_alias_new port_alias_map[port_alias_new] = item - port_speed[port_alias_new] = port_alias_facts['port_speed'][port_alias_old] + port_speed[port_alias_new] = port_speed_facts[port_alias_old] # Update port alias name in redis db duthost.command('redis-cli -n 4 HSET "PORT|{}" alias {}'.format(item, port_alias_new))