Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Azure/sonic-mgmt into zero_ports_2
Browse files Browse the repository at this point in the history
  • Loading branch information
@slutati1536
slutati1536 committed Aug 17, 2021
2 parents 4a3d8bb + 741c735 commit 3273768
Show file tree
Hide file tree
Showing 207 changed files with 7,085 additions and 1,322 deletions.
3 changes: 3 additions & 0 deletions ansible/group_vars/lab/lab.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ snmp_servers: ['10.0.0.9']
# dhcp relay servers
dhcp_servers: ['192.0.0.1', '192.0.0.2', '192.0.0.3', '192.0.0.4']

# dhcpv6 relay servers
dhcpv6_servers: ['fc02:2000::1', 'fc02:2000::2', 'fc02:2000::3', 'fc02:2000::4']

# snmp variables
snmp_rocommunity: public
snmp_location: testlab
Expand Down
225 changes: 225 additions & 0 deletions ansible/group_vars/sonic/sku-sensors-data.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3970,6 +3970,231 @@ sensors_checks:
psu_skips: {}
sensor_skip_per_version: {}

x86_64-mlnx_msn4410-r0-a1:
alarms:
fan:
- dps460-i2c-4-58/PSU-1(L) Fan 1/fan1_alarm
- dps460-i2c-4-58/PSU-1(L) Fan 1/fan1_fault

- dps460-i2c-4-59/PSU-2(R) Fan 1/fan1_alarm
- dps460-i2c-4-59/PSU-2(R) Fan 1/fan1_fault

- mlxreg_fan-isa-0000/Chassis Fan Drawer-1 Tach 1/fan1_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-1 Tach 2/fan2_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-2 Tach 1/fan3_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-2 Tach 2/fan4_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-3 Tach 1/fan5_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-3 Tach 2/fan6_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-4 Tach 1/fan7_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-4 Tach 2/fan8_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-5 Tach 1/fan9_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-5 Tach 2/fan10_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-6 Tach 1/fan11_fault
- mlxreg_fan-isa-0000/Chassis Fan Drawer-6 Tach 2/fan12_fault
power:
- mp2975-i2c-5-62/PMIC-1 PSU 12V Rail Curr (in1)/curr1_alarm
- mp2975-i2c-5-62/PMIC-1 ASIC 0.8V VCORE MAIN Rail Curr (out)/curr2_alarm
- mp2975-i2c-5-62/PMIC-1 PSU 12V Rail (in1)/in1_crit_alarm
- mp2975-i2c-5-62/PMIC-1 ASIC 0.8V VCORE MAIN Rail (out)/in2_lcrit_alarm
- mp2975-i2c-5-62/PMIC-1 ASIC 0.8V VCORE MAIN Rail (out)/in2_crit_alarm
- mp2975-i2c-5-62/PMIC-1 PSU 12V Rail Pwr (in1)/power1_alarm

- mp2975-i2c-5-64/PMIC-2 PSU 12V Rail Curr (in1)/curr1_alarm
- mp2975-i2c-5-64/PMIC-2 ASIC 1.8V VCORE MAIN Rail Curr (out)/curr2_alarm
- mp2975-i2c-5-64/PMIC-2 ASIC 1.2V VCORE MAIN Rail Curr (out)/curr3_alarm
- mp2975-i2c-5-64/PMIC-2 PSU 12V Rail (in1)/in1_crit_alarm
- mp2975-i2c-5-64/PMIC-2 ASIC 1.8V VCORE MAIN Rail (out)/in2_lcrit_alarm
- mp2975-i2c-5-64/PMIC-2 ASIC 1.8V VCORE MAIN Rail (out)/in2_crit_alarm
- mp2975-i2c-5-64/PMIC-2 ASIC 1.2V VCORE MAIN Rail (out)/in3_crit_alarm
- mp2975-i2c-5-64/PMIC-2 ASIC 1.2V VCORE MAIN Rail (out)/in3_lcrit_alarm
- mp2975-i2c-5-64/PMIC-2 PSU 12V Rail Pwr (in1)/power1_alarm

- mp2975-i2c-5-66/PMIC-3 PSU 12V Rail Curr (in1)/curr1_alarm
- mp2975-i2c-5-66/PMIC-3 ASIC 0.85V T0_1 Rail Curr (out)/curr2_alarm
- mp2975-i2c-5-66/PMIC-3 ASIC 1.8V T0_1 Rail Curr (out)/curr3_alarm
- mp2975-i2c-5-66/PMIC-3 PSU 12V Rail (in1)/in1_crit_alarm
- mp2975-i2c-5-66/PMIC-3 ASIC 0.85V T0_1 Rail (out)/in2_lcrit_alarm
- mp2975-i2c-5-66/PMIC-3 ASIC 0.85V T0_1 Rail (out)/in2_crit_alarm
- mp2975-i2c-5-66/PMIC-3 ASIC 1.8V T0_1 Rail (out)/in3_crit_alarm
- mp2975-i2c-5-66/PMIC-3 ASIC 1.8V T0_1 Rail (out)/in3_lcrit_alarm
- mp2975-i2c-5-66/PMIC-3 PSU 12V Rail Pwr (in1)/power1_alarm

- mp2975-i2c-5-6a/PMIC-4 PSU 12V Rail Curr (in1)/curr1_alarm
- mp2975-i2c-5-6a/PMIC-4 ASIC 0.85V T2_3 Rail Curr (out)/curr2_alarm
- mp2975-i2c-5-6a/PMIC-4 ASIC 1.8V T2_3 Rail Curr (out)/curr3_alarm
- mp2975-i2c-5-6a/PMIC-4 PSU 12V Rail (in1)/in1_crit_alarm
- mp2975-i2c-5-6a/PMIC-4 ASIC 0.85V T2_3 Rail (out)/in2_lcrit_alarm
- mp2975-i2c-5-6a/PMIC-4 ASIC 0.85V T2_3 Rail (out)/in2_crit_alarm
- mp2975-i2c-5-6a/PMIC-4 ASIC 1.8V T2_3 Rail (out)/in3_crit_alarm
- mp2975-i2c-5-6a/PMIC-4 ASIC 1.8V T2_3 Rail (out)/in3_lcrit_alarm
- mp2975-i2c-5-6a/PMIC-4 PSU 12V Rail Pwr (in1)/power1_alarm

- mp2975-i2c-5-6e/PMIC-5 PSU 12V Rail Curr (in1)/curr1_alarm
- mp2975-i2c-5-6e/PMIC-5 ASIC 1.2V T0_3 Rail_1 Curr (out)/curr2_alarm
- mp2975-i2c-5-6e/PMIC-5 ASIC 1.2V T4_7 Rail_2 Curr (out)/curr3_alarm
- mp2975-i2c-5-6e/PMIC-5 PSU 12V Rail (in1)/in1_crit_alarm
- mp2975-i2c-5-6e/PMIC-5 ASIC 1.2V T0_3 Rail_1 (out)/in2_lcrit_alarm
- mp2975-i2c-5-6e/PMIC-5 ASIC 1.2V T0_3 Rail_1 (out)/in2_crit_alarm
- mp2975-i2c-5-6e/PMIC-5 ASIC 1.2V T4_7 Rail_2 (out)/in3_crit_alarm
- mp2975-i2c-5-6e/PMIC-5 ASIC 1.2V T4_7 Rail_2 (out)/in3_lcrit_alarm
- mp2975-i2c-5-6e/PMIC-5 PSU 12V Rail Pwr (in1)/power1_alarm

- tps53679-i2c-15-58/PMIC-8 COMEX 1.8V Rail Curr (out)/curr1_crit_alarm
- tps53679-i2c-15-58/PMIC-8 COMEX 1.8V Rail Curr (out)/curr1_max_alarm
- tps53679-i2c-15-58/PMIC-8 COMEX 1.05V Rail Curr (out)/curr2_crit_alarm
- tps53679-i2c-15-58/PMIC-8 COMEX 1.05V Rail Curr (out)/curr2_max_alarm
- tps53679-i2c-15-58/PMIC-8 PSU 12V Rail (in1)/in1_alarm
- tps53679-i2c-15-58/PMIC-8 PSU 12V Rail (in2)/in2_alarm
- tps53679-i2c-15-58/PMIC-8 COMEX 1.8V Rail (out)/in3_crit_alarm
- tps53679-i2c-15-58/PMIC-8 COMEX 1.8V Rail (out)/in3_lcrit_alarm
- tps53679-i2c-15-58/PMIC-8 COMEX 1.05V Rail (out)/in4_crit_alarm
- tps53679-i2c-15-58/PMIC-8 COMEX 1.05V Rail (out)/in4_lcrit_alarm

- tps53679-i2c-15-61/PMIC-9 COMEX 1.2V Rail Curr (out)/curr1_crit_alarm
- tps53679-i2c-15-61/PMIC-9 COMEX 1.2V Rail Curr (out)/curr1_max_alarm
- tps53679-i2c-15-61/PMIC-9 PSU 12V Rail (in1)/in1_alarm
- tps53679-i2c-15-61/PMIC-9 PSU 12V Rail (in2)/in2_alarm
- tps53679-i2c-15-61/PMIC-9 COMEX 1.2V Rail (out)/in3_crit_alarm
- tps53679-i2c-15-61/PMIC-9 COMEX 1.2V Rail (out)/in3_lcrit_alarm

- dps460-i2c-4-58/PSU-1(L) 220V Rail Curr (in)/curr1_crit_alarm
- dps460-i2c-4-58/PSU-1(L) 220V Rail Curr (in)/curr1_max_alarm
- dps460-i2c-4-58/PSU-1(L) 12V Rail Curr (out)/curr2_crit_alarm
- dps460-i2c-4-58/PSU-1(L) 12V Rail Curr (out)/curr2_max_alarm
- dps460-i2c-4-58/PSU-1(L) 220V Rail Pwr (in)/power1_alarm
- dps460-i2c-4-58/PSU-1(L) 12V Rail Pwr (out)/power2_crit_alarm
- dps460-i2c-4-58/PSU-1(L) 12V Rail Pwr (out)/power2_max_alarm
- dps460-i2c-4-58/PSU-1(L) 220V Rail (in)/in1_crit_alarm
- dps460-i2c-4-58/PSU-1(L) 220V Rail (in)/in1_lcrit_alarm
- dps460-i2c-4-58/PSU-1(L) 220V Rail (in)/in1_max_alarm
- dps460-i2c-4-58/PSU-1(L) 220V Rail (in)/in1_min_alarm
- dps460-i2c-4-58/PSU-1(L) 12V Rail (out)/in3_crit_alarm
- dps460-i2c-4-58/PSU-1(L) 12V Rail (out)/in3_lcrit_alarm
- dps460-i2c-4-58/PSU-1(L) 12V Rail (out)/in3_max_alarm
- dps460-i2c-4-58/PSU-1(L) 12V Rail (out)/in3_min_alarm

- dps460-i2c-4-59/PSU-2(R) 220V Rail Curr (in)/curr1_crit_alarm
- dps460-i2c-4-59/PSU-2(R) 220V Rail Curr (in)/curr1_max_alarm
- dps460-i2c-4-59/PSU-2(R) 12V Rail Curr (out)/curr2_crit_alarm
- dps460-i2c-4-59/PSU-2(R) 12V Rail Curr (out)/curr2_max_alarm
- dps460-i2c-4-59/PSU-2(R) 220V Rail Pwr (in)/power1_alarm
- dps460-i2c-4-59/PSU-2(R) 12V Rail Pwr (out)/power2_crit_alarm
- dps460-i2c-4-59/PSU-2(R) 12V Rail Pwr (out)/power2_max_alarm
- dps460-i2c-4-59/PSU-2(R) 220V Rail (in)/in1_crit_alarm
- dps460-i2c-4-59/PSU-2(R) 220V Rail (in)/in1_lcrit_alarm
- dps460-i2c-4-59/PSU-2(R) 220V Rail (in)/in1_max_alarm
- dps460-i2c-4-59/PSU-2(R) 220V Rail (in)/in1_min_alarm
- dps460-i2c-4-59/PSU-2(R) 12V Rail (out)/in3_crit_alarm
- dps460-i2c-4-59/PSU-2(R) 12V Rail (out)/in3_lcrit_alarm
- dps460-i2c-4-59/PSU-2(R) 12V Rail (out)/in3_max_alarm
- dps460-i2c-4-59/PSU-2(R) 12V Rail (out)/in3_min_alarm
temp:
- coretemp-isa-0000/\P[a-z]*\ id 0/temp1_crit_alarm
- coretemp-isa-0000/Core 0/temp2_crit_alarm
- coretemp-isa-0000/Core 1/temp3_crit_alarm
- coretemp-isa-0000/Core 2/temp4_crit_alarm
- coretemp-isa-0000/Core 3/temp5_crit_alarm

- mlxsw-i2c-2-48/front panel 001/temp2_fault
- mlxsw-i2c-2-48/front panel 002/temp3_fault
- mlxsw-i2c-2-48/front panel 003/temp4_fault
- mlxsw-i2c-2-48/front panel 004/temp5_fault
- mlxsw-i2c-2-48/front panel 005/temp6_fault
- mlxsw-i2c-2-48/front panel 006/temp7_fault
- mlxsw-i2c-2-48/front panel 007/temp8_fault
- mlxsw-i2c-2-48/front panel 008/temp9_fault
- mlxsw-i2c-2-48/front panel 009/temp10_fault
- mlxsw-i2c-2-48/front panel 010/temp11_fault
- mlxsw-i2c-2-48/front panel 011/temp12_fault
- mlxsw-i2c-2-48/front panel 012/temp13_fault
- mlxsw-i2c-2-48/front panel 013/temp14_fault
- mlxsw-i2c-2-48/front panel 014/temp15_fault
- mlxsw-i2c-2-48/front panel 015/temp16_fault
- mlxsw-i2c-2-48/front panel 016/temp17_fault
- mlxsw-i2c-2-48/front panel 017/temp18_fault
- mlxsw-i2c-2-48/front panel 018/temp19_fault
- mlxsw-i2c-2-48/front panel 019/temp20_fault
- mlxsw-i2c-2-48/front panel 020/temp21_fault
- mlxsw-i2c-2-48/front panel 021/temp22_fault
- mlxsw-i2c-2-48/front panel 022/temp23_fault
- mlxsw-i2c-2-48/front panel 023/temp24_fault
- mlxsw-i2c-2-48/front panel 024/temp25_fault
- mlxsw-i2c-2-48/front panel 025/temp26_fault
- mlxsw-i2c-2-48/front panel 026/temp27_fault
- mlxsw-i2c-2-48/front panel 027/temp28_fault
- mlxsw-i2c-2-48/front panel 028/temp29_fault
- mlxsw-i2c-2-48/front panel 029/temp30_fault
- mlxsw-i2c-2-48/front panel 030/temp31_fault
- mlxsw-i2c-2-48/front panel 031/temp32_fault
- mlxsw-i2c-2-48/front panel 032/temp33_fault

- mp2975-i2c-5-62/PMIC-1 Temp 1/temp1_crit_alarm
- mp2975-i2c-5-62/PMIC-1 Temp 1/temp1_max_alarm

- mp2975-i2c-5-64/PMIC-2 Temp 1/temp1_crit_alarm
- mp2975-i2c-5-64/PMIC-2 Temp 1/temp1_max_alarm

- mp2975-i2c-5-66/PMIC-3 Temp 1/temp1_crit_alarm
- mp2975-i2c-5-66/PMIC-3 Temp 1/temp1_max_alarm

- mp2975-i2c-5-6a/PMIC-4 Temp 1/temp1_crit_alarm
- mp2975-i2c-5-6a/PMIC-4 Temp 1/temp1_max_alarm

- mp2975-i2c-5-6e/PMIC-5 Temp 1/temp1_crit_alarm
- mp2975-i2c-5-6e/PMIC-5 Temp 1/temp1_max_alarm

- tps53679-i2c-15-58/PMIC-8 Temp 1/temp1_crit_alarm
- tps53679-i2c-15-58/PMIC-8 Temp 1/temp1_max_alarm
- tps53679-i2c-15-58/PMIC-8 Temp 2/temp2_crit_alarm
- tps53679-i2c-15-58/PMIC-8 Temp 2/temp2_max_alarm

- tps53679-i2c-15-61/PMIC-9 Temp 1/temp1_crit_alarm
- tps53679-i2c-15-61/PMIC-9 Temp 1/temp1_max_alarm
- tps53679-i2c-15-61/PMIC-9 Temp 2/temp2_crit_alarm
- tps53679-i2c-15-61/PMIC-9 Temp 2/temp2_max_alarm

- dps460-i2c-4-58/PSU-1(L) Temp 1/temp1_crit_alarm
- dps460-i2c-4-58/PSU-1(L) Temp 1/temp1_max_alarm
- dps460-i2c-4-58/PSU-1(L) Temp 2/temp2_crit_alarm
- dps460-i2c-4-58/PSU-1(L) Temp 2/temp2_max_alarm
- dps460-i2c-4-58/PSU-1(L) Temp 3/temp3_crit_alarm
- dps460-i2c-4-58/PSU-1(L) Temp 3/temp3_max_alarm

- dps460-i2c-4-59/PSU-2(R) Temp 1/temp1_crit_alarm
- dps460-i2c-4-59/PSU-2(R) Temp 1/temp1_max_alarm
- dps460-i2c-4-59/PSU-2(R) Temp 2/temp2_crit_alarm
- dps460-i2c-4-59/PSU-2(R) Temp 2/temp2_max_alarm
- dps460-i2c-4-59/PSU-2(R) Temp 3/temp3_crit_alarm
- dps460-i2c-4-59/PSU-2(R) Temp 3/temp3_max_alarm
compares:
power: []
temp:
- - coretemp-isa-0000/\P[a-z]*\ id 0/temp1_input
- coretemp-isa-0000/\P[a-z]*\ id 0/temp1_crit
- - coretemp-isa-0000/Core 0/temp2_input
- coretemp-isa-0000/Core 0/temp2_crit
- - coretemp-isa-0000/Core 1/temp3_input
- coretemp-isa-0000/Core 1/temp3_crit
- - coretemp-isa-0000/Core 2/temp4_input
- coretemp-isa-0000/Core 2/temp4_crit
- - coretemp-isa-0000/Core 3/temp5_input
- coretemp-isa-0000/Core 3/temp5_crit

- - tmp102-i2c-7-49/Ambient Fan Side Temp (air intake)/temp1_input
- tmp102-i2c-7-49/Ambient Fan Side Temp (air intake)/temp1_max

- - tmp102-i2c-7-4a/Ambient Port Side Temp (air exhaust)/temp1_input
- tmp102-i2c-7-4a/Ambient Port Side Temp (air exhaust)/temp1_max

- - tmp102-i2c-15-49/Ambient COMEX Temp/temp1_input
- tmp102-i2c-15-49/Ambient COMEX Temp/temp1_max
non_zero:
fan: []
power: []
temp: []
psu_skips: {}
sensor_skip_per_version: {}

x86_64-mlnx_msn4600c-r0:
alarms:
fan:
Expand Down
3 changes: 2 additions & 1 deletion ansible/group_vars/sonic/variables
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ broadcom_td2_hwskus: ['Force10-S6000', 'Force10-S6000-Q24S32', 'Arista-7050-QX32
broadcom_td3_hwskus: ['Arista-7050CX3-32S-C32', 'Arista-7050CX3-32S-D48C8']
broadcom_th_hwskus: ['Force10-S6100', 'Arista-7060CX-32S-C32', 'Arista-7060CX-32S-C32-T1', 'Arista-7060CX-32S-D48C8', 'Celestica-DX010-C32', "Seastone-DX010" ]
broadcom_th2_hwskus: ['Arista-7260CX3-D108C8', 'Arista-7260CX3-C64', 'Arista-7260CX3-Q64']
broadcom_th3_hwskus: ['DellEMC-Z9332f-M-O16C64', 'DellEMC-Z9332f-O32']

mellanox_spc1_hwskus: [ 'ACS-MSN2700', 'ACS-MSN2740', 'ACS-MSN2100', 'ACS-MSN2410', 'ACS-MSN2010', 'Mellanox-SN2700', 'Mellanox-SN2700-D48C8' ]
mellanox_spc2_hwskus: [ 'ACS-MSN3700', 'ACS-MSN3700C', 'ACS-MSN3800', 'Mellanox-SN3800-D112C8' , 'ACS-MSN3420']
mellanox_spc3_hwskus: [ 'ACS-MSN4700', 'ACS-MSN4600C', 'ACS-MSN4410' ]
mellanox_spc3_hwskus: [ 'ACS-MSN4700', 'ACS-MSN4600C', 'ACS-MSN4410', 'Mellanox-SN4600C-D112C8']
mellanox_hwskus: "{{ mellanox_spc1_hwskus + mellanox_spc2_hwskus + mellanox_spc3_hwskus }}"

cavium_hwskus: [ "AS7512", "XP-SIM" ]
Expand Down
4 changes: 2 additions & 2 deletions ansible/library/bgp_facts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def parse_neighbors(self):
value_dict['rcvd'] = int(rcvd)
message_stats[key] = value_dict
except Exception as e:
print"NonFatal: line:'{}' should not have matched for sent/rcvd count".format(line)
print("NonFatal: line:'{}' should not have matched for sent/rcvd count".format(line))

if capabilities:
neighbor['capabilities'] = capabilities
Expand All @@ -205,7 +205,7 @@ def get_statistics(self):
statistics['ipv6_admin_down'] = 0
statistics['ipv6_idle'] = 0

for neighbor in self.facts['bgp_neighbors'].itervalues():
for neighbor in self.facts['bgp_neighbors'].values():
if neighbor['ip_version'] == 4:
statistics['ipv4'] += 1
if neighbor['admin'] == 'down':
Expand Down
2 changes: 1 addition & 1 deletion ansible/library/bgp_route.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def parse_bgp_route_prefix_json(self, cmd_result):

p = json.loads(cmd_result)

if not p.has_key('prefix'):
if 'prefix' not in p:
self.facts['bgp_route'][prefix]['found'] = False
return

Expand Down
45 changes: 34 additions & 11 deletions ansible/library/config_facts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
import json
from collections import defaultdict
from natsort import natsorted
from ansible.module_utils.port_utils import get_port_indices_for_asic

try:
from sonic_py_common import multi_asic
except ImportError:
print("Failed to import multi_asic")

DOCUMENTATION = '''
---
Expand Down Expand Up @@ -54,14 +60,17 @@ def format_config(json_data):
data.setdefault(key_l1, {})[key_l2] = entry
except ValueError:
# This is a single level key
data.setdefault(key, entry)
if key not in data:
data[key] = entry
else:
data[key].update(entry)

res.setdefault(table, data)

return res


def create_maps(config):
def create_maps(config, namespace):
""" Create a map of SONiC port name to physical port index """
port_index_map = {}
port_name_to_alias_map = {}
Expand All @@ -71,13 +80,27 @@ def create_maps(config):
port_name_list = config["PORT"].keys()
port_name_list_sorted = natsorted(port_name_list)

for idx, val in enumerate(port_name_list_sorted):
port_index_map[val] = idx

port_name_to_alias_map = { name : v['alias'] if 'alias' in v else '' for name, v in config["PORT"].iteritems()}
try:
multi_asic_device = multi_asic.is_multi_asic()
except Exception:
multi_asic_device = False


if multi_asic_device:
asic_id = 0
if namespace is not None:
asic_id = namespace.split("asic")[1]
port_index_map = get_port_indices_for_asic(asic_id,
port_name_list_sorted)
else:
#if not available generate an index
for idx, val in enumerate(port_name_list_sorted):
port_index_map[val] = idx

port_name_to_alias_map = { name : v['alias'] if 'alias' in v else '' for name, v in config["PORT"].items()}

# Create inverse mapping between port name and alias
port_alias_to_name_map = {v: k for k, v in port_name_to_alias_map.iteritems()}
port_alias_to_name_map = {v: k for k, v in port_name_to_alias_map.items()}

return {
'port_name_to_alias_map' : port_name_to_alias_map,
Expand All @@ -97,7 +120,7 @@ def get_running_config(module, namespace):
return json_info


def get_facts(config):
def get_facts(config, namespace):
""" Create the facts dict """

Tree = lambda: defaultdict(Tree)
Expand All @@ -106,7 +129,7 @@ def get_facts(config):

results.update(format_config(config))

results.update(create_maps(config))
results.update(create_maps(config, namespace))

return results

Expand Down Expand Up @@ -136,9 +159,9 @@ def main():
cfg_file_path = PERSISTENT_CONFIG_PATH.format("")
with open(cfg_file_path, "r") as f:
config = json.load(f)
elif m_args["source"] == "running":
elif m_args["source"] == "running":
config = get_running_config(module, namespace)
results = get_facts(config)
results = get_facts(config, namespace)
module.exit_json(ansible_facts=results)
except Exception as e:
module.fail_json(msg=e.message)
Expand Down
2 changes: 1 addition & 1 deletion ansible/library/conn_graph_facts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def port_vlanlist(self, vlanrange):
continue
elif '-' in vlanid:
vlanlist = list(map(str.strip, vlanid.split('-')))
vlans.extend(range(int(vlanlist[0]), int(vlanlist[1])+1))
vlans.extend(list(range(int(vlanlist[0]), int(vlanlist[1])+1)))
continue
elif vlanid != '':
raise ValueError('vlan range error "%s"' % vlanrange)
Expand Down
Loading

0 comments on commit 3273768

Please sign in to comment.