Revision 9675661c lib/client/gnt_network.py
b/lib/client/gnt_network.py | ||
---|---|---|
186 | 186 |
"mac_prefix", "network_type", |
187 | 187 |
"free_count", "reserved_count", |
188 | 188 |
"map", "group_list", "inst_list", |
189 |
"external_reservations"], |
|
189 |
"external_reservations", |
|
190 |
"serial_no", "uuid"], |
|
190 | 191 |
names=args, use_locking=False) |
191 | 192 |
|
192 | 193 |
for (name, network, gateway, network6, gateway6, |
193 | 194 |
mac_prefix, network_type, free_count, reserved_count, |
194 |
mapping, group_list, instances, ext_res) in result: |
|
195 |
mapping, group_list, instances, ext_res, serial, uuid) in result:
|
|
195 | 196 |
size = free_count + reserved_count |
196 | 197 |
ToStdout("Network name: %s", name) |
197 |
ToStdout(" subnet: %s", network) |
|
198 |
ToStdout(" gateway: %s", gateway) |
|
199 |
ToStdout(" subnet6: %s", network6) |
|
200 |
ToStdout(" gateway6: %s", gateway6) |
|
201 |
ToStdout(" mac prefix: %s", mac_prefix) |
|
202 |
ToStdout(" type: %s", network_type) |
|
203 |
ToStdout(" size: %d", size) |
|
204 |
ToStdout(" free: %d (%.2f%%)", free_count, |
|
205 |
100 * float(free_count) / float(size)) |
|
206 |
ToStdout(" usage map:") |
|
198 |
ToStdout("UUID: %s", uuid) |
|
199 |
ToStdout("Serial number: %d", serial) |
|
200 |
ToStdout(" Subnet: %s", network) |
|
201 |
ToStdout(" Gateway: %s", gateway) |
|
202 |
ToStdout(" IPv6 Subnet: %s", network6) |
|
203 |
ToStdout(" IPv6 Gateway: %s", gateway6) |
|
204 |
ToStdout(" Mac Prefix: %s", mac_prefix) |
|
205 |
ToStdout(" Type: %s", network_type) |
|
206 |
ToStdout(" Size: %d", size) |
|
207 |
ToStdout(" Free: %d (%.2f%%)", free_count, |
|
208 |
100 * float(free_count)/float(size)) |
|
209 |
ToStdout(" Usage map:") |
|
207 | 210 |
idx = 0 |
208 | 211 |
for line in wrap(mapping, width=64): |
209 | 212 |
ToStdout(" %s %s %d", str(idx).rjust(3), line.ljust(64), idx + 63) |
Also available in: Unified diff