Skip to content

Commit a48cc8f

Browse files
committed
cli: tighten 'show interface' detail-view alignment
The Ethernet packet/RMON counters at the bottom of 'show interface <name>' were appended with a wider label column than the operational data above them, breaking visual alignment. Group them under an "Ethernet Statistics" section heading (Decore.title), same convention as 'Available Networks' in the wifi scan view. Narrow the operational-data label column from 20 to 19 chars so the title bar exactly matches the heading text — a tighter and more deliberately aligned look. All labels in pr_iface fit within 19 chars except 'lacp system priority' (20); rename it to 'lacp sys priority' for consistency with the other 'lacp ...' labels (lacp aggregate id, lacp partner mac, ...) so the new field width works universally. Refresh CLI snapshots and doc samples to match. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
1 parent 80e7cfa commit a48cc8f

20 files changed

Lines changed: 330 additions & 329 deletions

doc/ethernet.md

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -42,34 +42,34 @@ The detail view spells everything out, including auto-negotiation
4242
state and the speed in Mbit/s.
4343

4444
<pre class="cli"><code>admin@example:/> <b>show interface eth1</b>
45-
name : eth1
46-
index : 2
47-
mtu : 1500
48-
operational status : up
49-
link mode : 1000baseT
50-
auto-negotiation : on
51-
duplex : full
52-
speed : 1000
53-
physical address : 00:53:00:06:11:01
54-
ipv4 addresses :
55-
ipv6 addresses :
56-
in-octets : 75581
57-
out-octets : 43130
45+
name : eth1
46+
index : 2
47+
mtu : 1500
48+
operational status : up
49+
link mode : 1000baseT
50+
auto-negotiation : on
51+
duplex : full
52+
speed : 1000
53+
physical address : 00:53:00:06:11:01
54+
ipv4 addresses :
55+
ipv6 addresses :
56+
in-octets : 75581
57+
out-octets : 43130
5858
...
5959
admin@example:/> <b>show interface eth4</b>
60-
name : eth4
61-
index : 5
62-
mtu : 1500
63-
operational status : up
64-
link mode : 100baseTX
65-
auto-negotiation : on
66-
duplex : full
67-
speed : 100
68-
physical address : 00:53:00:06:11:04
69-
ipv4 addresses :
70-
ipv6 addresses :
71-
in-octets : 75439
72-
out-octets : 550704
60+
name : eth4
61+
index : 5
62+
mtu : 1500
63+
operational status : up
64+
link mode : 100baseTX
65+
auto-negotiation : on
66+
duplex : full
67+
speed : 100
68+
physical address : 00:53:00:06:11:04
69+
ipv4 addresses :
70+
ipv6 addresses :
71+
in-octets : 75439
72+
out-octets : 550704
7373
...
7474
admin@example:/>
7575
</code></pre>
@@ -114,30 +114,31 @@ require auto-negotiation to be enabled.
114114
Ethernet packet statistics[^1] can be listed as shown below.
115115

116116
<pre class="cli"><code>admin@example:/> <b>show interface eth1</b>
117-
name : eth1
118-
index : 2
119-
mtu : 1500
120-
operational status : up
121-
link mode : 1000baseT
122-
auto-negotiation : on
123-
duplex : full
124-
speed : 1000
125-
physical address : 00:53:00:06:11:0a
126-
ipv4 addresses :
127-
ipv6 addresses :
128-
in-octets : 75581
129-
out-octets : 43130
130-
131-
eth-in-frames : 434
132-
eth-in-multicast-frames : 296
133-
eth-in-broadcast-frames : 138
134-
eth-in-error-fcs-frames : 0
135-
eth-in-error-oversize-frames : 0
136-
eth-out-frames : 310
137-
eth-out-multicast-frames : 310
138-
eth-out-broadcast-frames : 0
139-
eth-out-good-octets : 76821
140-
eth-in-good-octets : 60598
117+
name : eth1
118+
index : 2
119+
mtu : 1500
120+
operational status : up
121+
link mode : 1000baseT
122+
auto-negotiation : on
123+
duplex : full
124+
speed : 1000
125+
physical address : 00:53:00:06:11:0a
126+
ipv4 addresses :
127+
ipv6 addresses :
128+
in-octets : 75581
129+
out-octets : 43130
130+
───────────────────
131+
<b>Ethernet Statistics</b>
132+
in-frames : 434
133+
in-multicast-frames : 296
134+
in-broadcast-frames : 138
135+
in-error-fcs-frames : 0
136+
in-error-oversize-frames : 0
137+
out-frames : 310
138+
out-multicast-frames : 310
139+
out-broadcast-frames : 0
140+
out-good-octets : 76821
141+
in-good-octets : 60598
141142
admin@example:/>
142143
</code></pre>
143144

doc/iface.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ The description is visible in the operational datastore and in `show`
9090
commands:
9191

9292
<pre class="cli"><code>admin@example:/> <b>show interface eth0</b>
93-
name : eth0
94-
description : Uplink to core switch
95-
index : 2
93+
name : eth0
94+
description : Uplink to core switch
95+
index : 2
9696
...
9797
</code></pre>
9898

doc/lag.md

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -124,45 +124,45 @@ In addition to basic status shown in the interface overview, detailed
124124
LAG status can be inspected:
125125

126126
<pre class="cli"><code>admin@example:/> <b>show interface lag0</b>
127-
name : lag0
128-
index : 25
129-
mtu : 1500
130-
operational status : up
131-
physical address : 00:a0:85:00:02:00
132-
lag mode : static
133-
lag type : balance-xor
134-
lag hash : layer2
135-
link debounce up : 0 msec
136-
link debounce down : 0 msec
137-
ipv4 addresses :
138-
ipv6 addresses :
139-
in-octets : 0
140-
out-octets : 2142
127+
name : lag0
128+
index : 25
129+
mtu : 1500
130+
operational status : up
131+
physical address : 00:a0:85:00:02:00
132+
lag mode : static
133+
lag type : balance-xor
134+
lag hash : layer2
135+
link debounce up : 0 msec
136+
link debounce down : 0 msec
137+
ipv4 addresses :
138+
ipv6 addresses :
139+
in-octets : 0
140+
out-octets : 2142
141141
</code></pre>
142142

143143
Same aggregate, but in LACP mode:
144144

145145
<pre class="cli"><code>admin@example:/> <b>show interface lag0</b>
146-
name : lag0
147-
index : 24
148-
mtu : 1500
149-
operational status : up
150-
physical address : 00:a0:85:00:02:00
151-
lag mode : lacp
152-
lag hash : layer2
153-
lacp mode : active
154-
lacp rate : fast (1s)
155-
lacp aggregate id : 1
146+
name : lag0
147+
index : 24
148+
mtu : 1500
149+
operational status : up
150+
physical address : 00:a0:85:00:02:00
151+
lag mode : lacp
152+
lag hash : layer2
153+
lacp mode : active
154+
lacp rate : fast (1s)
155+
lacp aggregate id : 1
156156
lacp system priority: 65535
157-
lacp actor key : 9
158-
lacp partner key : 9
159-
lacp partner mac : 00:a0:85:00:03:00
160-
link debounce up : 0 msec
161-
link debounce down : 0 msec
162-
ipv4 addresses :
163-
ipv6 addresses :
164-
in-octets : 100892
165-
out-octets : 111776
157+
lacp actor key : 9
158+
lacp partner key : 9
159+
lacp partner mac : 00:a0:85:00:03:00
160+
link debounce up : 0 msec
161+
link debounce down : 0 msec
162+
ipv4 addresses :
163+
ipv6 addresses :
164+
in-octets : 100892
165+
out-octets : 111776
166166
</code></pre>
167167

168168
Member ports provide additional status information:
@@ -184,21 +184,21 @@ Member ports provide additional status information:
184184
Example member port status:
185185

186186
<pre class="cli"><code>admin@example:/> <b>show interface eth7</b>
187-
name : eth7
188-
index : 8
189-
mtu : 1500
190-
operational status : up
191-
physical address : 00:a0:85:00:02:00
192-
lag member : lag0
193-
lag member state : active
194-
lacp aggregate id : 1
195-
lacp actor state : active, short_timeout, aggregating, in_sync, collecting, distributing
196-
lacp partner state : active, short_timeout, aggregating, in_sync, collecting, distributing
197-
link failure count : 0
198-
ipv4 addresses :
199-
ipv6 addresses :
200-
in-octets : 473244
201-
out-octets : 499037
187+
name : eth7
188+
index : 8
189+
mtu : 1500
190+
operational status : up
191+
physical address : 00:a0:85:00:02:00
192+
lag member : lag0
193+
lag member state : active
194+
lacp aggregate id : 1
195+
lacp actor state : active, short_timeout, aggregating, in_sync, collecting, distributing
196+
lacp partner state : active, short_timeout, aggregating, in_sync, collecting, distributing
197+
link failure count : 0
198+
ipv4 addresses :
199+
ipv6 addresses :
200+
in-octets : 473244
201+
out-octets : 499037
202202
</code></pre>
203203

204204

doc/vpn-wireguard.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,11 @@ wg0 wireguard UP 2 peers (1 up)
351351
ipv6 fd00::1/64 (static)
352352

353353
admin@example:/> <b>show interface wg0</b>
354-
name : wg0
355-
type : wireguard
356-
index : 12
357-
operational status : up
358-
peers : 2
354+
name : wg0
355+
type : wireguard
356+
index : 12
357+
operational status : up
358+
peers : 2
359359

360360
Peer 1:
361361
status : UP

doc/wifi.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -223,22 +223,22 @@ access-point).
223223
Use `show interface` to see discovered networks and their signal strength:
224224

225225
<pre class="cli"><code>admin@example:/> <b>show interface wifi0</b>
226-
name : wifi0
227-
type : wifi
228-
index : 3
229-
mtu : 1500
230-
operational status : up
231-
ip forwarding : enabled
232-
physical address : f0:09:0d:36:5f:86
233-
ipv4 addresses : 192.168.1.100/24 (dhcp)
234-
ipv6 addresses :
235-
in-octets : 148388
236-
out-octets : 24555
237-
mode : station
238-
ssid : MyNetwork
239-
signal : -45 dBm (good)
240-
rx bitrate : 72.2 Mbps
241-
tx bitrate : 86.6 Mbps
226+
name : wifi0
227+
type : wifi
228+
index : 3
229+
mtu : 1500
230+
operational status : up
231+
ip forwarding : enabled
232+
physical address : f0:09:0d:36:5f:86
233+
ipv4 addresses : 192.168.1.100/24 (dhcp)
234+
ipv6 addresses :
235+
in-octets : 148388
236+
out-octets : 24555
237+
mode : station
238+
ssid : MyNetwork
239+
signal : -45 dBm (good)
240+
rx bitrate : 72.2 Mbps
241+
tx bitrate : 86.6 Mbps
242242
──────────────────────────────────────────────────────────────────────
243243
<span class="title">Available Networks</span>
244244
<span class="header">SSID BSSID SECURITY SIGNAL CHANNEL</span>
@@ -304,13 +304,13 @@ admin@example:/config/interface/wifi0/> <b>leave</b>
304304
The connection attempt will start immediately. You can verify the connection status:
305305

306306
<pre class="cli"><code>admin@example:/> <b>show interface wifi0</b>
307-
name : wifi0
308-
type : wifi
309-
operational status : up
310-
physical address : f0:09:0d:36:5f:86
311-
mode : station
312-
ssid : MyHomeNetwork
313-
signal : -52 dBm (good)
307+
name : wifi0
308+
type : wifi
309+
operational status : up
310+
physical address : f0:09:0d:36:5f:86
311+
mode : station
312+
ssid : MyHomeNetwork
313+
signal : -52 dBm (good)
314314
</code></pre>
315315

316316
**Station configuration parameters:**

0 commit comments

Comments
 (0)