linse/boxtools
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 'version' to box info

Browse Source 
version 0: git.psi.ch repo
version 1: gitea.psi.ch repo
This commit is contained in:
zolliker
2025-05-20 07:58:15 +02:00
parent 30369aff3c
commit c4a8cee558
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cfg/flamedil.cfg
View File

@ -1,6 +1,7 @@
[BOX] [BOX]
type=dual-eth-rpi type=dual-eth-rpi
MAC=d8:3a:dd:51:2b:81 MAC=d8:3a:dd:51:2b:81
version=1
[NETWORK] [NETWORK]
eth0=wan eth0=wan

1
cfg/flamemag.cfg
View File

@ -1,6 +1,7 @@
[BOX] [BOX]
type=dual-eth-rpi type=dual-eth-rpi
MAC=d8:3a:dd:51:2a:e6 MAC=d8:3a:dd:51:2a:e6
version=1
[NETWORK] [NETWORK]
eth0=wan eth0=wan

1
cfg/linse-fi.cfg
View File

@ -1,6 +1,7 @@
[BOX] [BOX]
type=ionopimax type=ionopimax
MAC=b8:27:eb:41:3f:b2 MAC=b8:27:eb:41:3f:b2
version=1
[FRAPPY] [FRAPPY]
port=5000 port=5000

1
cfg/linse-fs.cfg
View File

@ -3,6 +3,7 @@
[BOX] [BOX]
type=ionopimax type=ionopimax
MAC=b8:27:eb:33:2e:7a MAC=b8:27:eb:33:2e:7a
version=1
[FRAPPY] [FRAPPY]
port=5000 port=5000

16
listboxes
View File

@ -28,11 +28,11 @@ def print_line(sizes):
print(' '.join('-' * l for l in sizes)) print(' '.join('-' * l for l in sizes))
legend = ['', '', '* running', '* online'] legend = ['', '', '', '* running', '* online']
opt = sys.argv[-1] opt = sys.argv[-1]
if opt.startswith('-'): if opt.startswith('-'):
opt = opt[1:] opt = opt[1:]
header = ['box name', 'box type', 'frappy'] header = ['box name', 'box type', 'V', 'frappy']
if opt == 's': if opt == 's':
header.append('') header.append('')
legend = [] legend = []
@ -42,7 +42,7 @@ else:
header.extend(['router', 'MAC addr']) header.extend(['router', 'MAC addr'])
else: else:
header.append('') header.append('')
legend = legend[:4] legend = legend[:5]
table = [header] table = [header]
all_ports = {} all_ports = {}
@ -80,7 +80,7 @@ for file in sorted(cfgdir.glob('*.cfg')):
if frappy: if frappy:
box_ports['frappy'] = int(frappy_info.get('port', 10767)) box_ports['frappy'] = int(frappy_info.get('port', 10767))
box = info.get('BOX', {}) box = info.get('BOX', {})
row = [name, box.get('type', 'unknown'), frappy] row = [name, box.get('type', 'unknown'), box.get('version', '0'), frappy]
if opt == 's': if opt == 's':
row.append(router) row.append(router)
else: else:
@ -92,8 +92,8 @@ for file in sorted(cfgdir.glob('*.cfg')):
sizes = [max([len(row[i]) for row in table]) for i in range(len(header))] sizes = [max([len(row[i]) for row in table]) for i in range(len(header))]
if opt != 's': if opt != 's':
# make space for '*' # make space for '*'
sizes[2] += 1
sizes[3] += 1 sizes[3] += 1
sizes[4] += 1
firstrow = True firstrow = True
print_line(sizes) print_line(sizes)
@ -111,20 +111,22 @@ for row in table:
addr += online addr += online
if opt != 'a' and online != '*': if opt != 'a' and online != '*':
continue continue
row[3] = addr row[4] = addr
if opt != 's': if opt != 's':
port = all_ports[name].get('frappy') port = all_ports[name].get('frappy')
if port and online == '*': if port and online == '*':
flag = check_connection(name, port)[0] flag = check_connection(name, port)[0]
else: else:
flag = ' ' flag = ' '
row[2] += flag row[3] += flag
print(' '.join(v.ljust(l) for v, l in zip(row, sizes))) print(' '.join(v.ljust(l) for v, l in zip(row, sizes)))
print_line(sizes) print_line(sizes)
if legend: if legend:
print_row(legend, sizes) print_row(legend, sizes)
print('V 0: not yet migrated to gitea')
print('V 1: 2025-05')
USAGE = f""" USAGE = f"""
Usage: Usage: