Skip to content

Commit 18ca3f1

Browse files
authored
Ver 2.5.1b
1 parent f61d753 commit 18ca3f1

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

network_sketcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __init__(self):
4242
self.click_value_3rd = ''
4343
self.click_value_VPN = ''
4444
self.root = TkinterDnD.Tk()
45-
self.root.title("Network Sketcher ver 2.5.1a")
45+
self.root.title("Network Sketcher ver 2.5.1b")
4646
self.root.geometry("510x200+100+100")
4747
icon = tk.PhotoImage(file='ns_logo.png')
4848
self.root.iconphoto(True, icon)

ns_def.py

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,17 +1445,22 @@ def run(self,excel_maseter_file):
14451445
tmp_opposite_if_array = get_l2_broadcast_domains.get_opposite_if(self,device_name,if_name)
14461446
#print(' + device_name,if_name -> ', device_name,if_name ,' +++tmp_oppsite_if_array -> ',tmp_opposite_if_array)
14471447

1448-
for now_device_l2_boradcast_domain_array in device_l2_boradcast_domain_array:
1448+
#bug fix at ve 2.5.1b
1449+
now2_device_l2_boradcast_domain_array = []
1450+
for sublist in device_l2_boradcast_domain_array:
1451+
now2_device_l2_boradcast_domain_array.extend(sublist)
1452+
1453+
# bug fix at ve 2.5.1b
1454+
for now_device_l2_boradcast_domain_array in now2_device_l2_boradcast_domain_array:
14491455
if now_device_l2_boradcast_domain_array != []:
14501456
#print(now_device_l2_boradcast_domain_array)
1451-
if now_device_l2_boradcast_domain_array[0][1] == tmp_opposite_if_array[0]:
1452-
for kyuusai_now_device_l2_boradcast_domain_array in now_device_l2_boradcast_domain_array:
1453-
for now_now_device_l2_boradcast_domain_array in kyuusai_now_device_l2_boradcast_domain_array[3]:
1454-
#print(now_now_device_l2_boradcast_domain_array[1] , tmp_opposite_if_array[1] , now_device_l2_boradcast_domain_array[0][2] , tmp_device_l2_boradcast_domain_array[0][2])
1455-
if now_now_device_l2_boradcast_domain_array[1] == tmp_opposite_if_array[1] and now_device_l2_boradcast_domain_array[0][2] == tmp_device_l2_boradcast_domain_array[0][2]:
1456-
#print(' *MATCH OPPO L2***',kyuusai_now_device_l2_boradcast_domain_array[2],now_device_l2_boradcast_domain_array[0][0])
1457-
tmp_l2_broadcast_group_array.append(now_device_l2_boradcast_domain_array[0][0])
1458-
break
1457+
if now_device_l2_boradcast_domain_array[1] == tmp_opposite_if_array[0]:
1458+
for now_now_device_l2_boradcast_domain_array in now_device_l2_boradcast_domain_array[3]:
1459+
#print(now_now_device_l2_boradcast_domain_array[1] , tmp_opposite_if_array[1] , now_device_l2_boradcast_domain_array[2] , kyuusai_device_l2_boradcast_domain_array[2])
1460+
if now_now_device_l2_boradcast_domain_array[1] == tmp_opposite_if_array[1] and now_device_l2_boradcast_domain_array[2] == kyuusai_device_l2_boradcast_domain_array[2]:
1461+
#print(' *MATCH OPPO L2***',now_device_l2_boradcast_domain_array[2],now_device_l2_boradcast_domain_array[0])
1462+
tmp_l2_broadcast_group_array.append(now_device_l2_boradcast_domain_array[0])
1463+
break
14591464

14601465
'''Kyuusai a one-L2_SEG if connect to a one-L2_SEG if with difference name'''
14611466
tmp_num_1 = get_l2_broadcast_domains.get_l2seg_count_on_if(self,device_name,if_name)

0 commit comments

Comments
 (0)