Revision 5cfa6c37 lib/client/gnt_network.py
b/lib/client/gnt_network.py | ||
---|---|---|
36 | 36 |
|
37 | 37 |
#: default list of fields for L{ListNetworks} |
38 | 38 |
_LIST_DEF_FIELDS = ["name", "network", "gateway", |
39 |
"network_type", "mac_prefix", "group_list", "tags"]
|
|
39 |
"mac_prefix", "group_list", "tags"] |
|
40 | 40 |
|
41 | 41 |
|
42 | 42 |
def _HandleReservedIPs(ips): |
... | ... | |
77 | 77 |
gateway6=opts.gateway6, |
78 | 78 |
network6=opts.network6, |
79 | 79 |
mac_prefix=opts.mac_prefix, |
80 |
network_type=opts.network_type, |
|
81 | 80 |
add_reserved_ips=reserved_ips, |
82 | 81 |
conflicts_check=opts.conflicts_check, |
83 | 82 |
tags=tags) |
... | ... | |
202 | 201 |
cl = GetClient() |
203 | 202 |
result = cl.QueryNetworks(fields=["name", "network", "gateway", |
204 | 203 |
"network6", "gateway6", |
205 |
"mac_prefix", "network_type",
|
|
204 |
"mac_prefix", |
|
206 | 205 |
"free_count", "reserved_count", |
207 | 206 |
"map", "group_list", "inst_list", |
208 | 207 |
"external_reservations", |
... | ... | |
210 | 209 |
names=args, use_locking=False) |
211 | 210 |
|
212 | 211 |
for (name, network, gateway, network6, gateway6, |
213 |
mac_prefix, network_type, free_count, reserved_count,
|
|
212 |
mac_prefix, free_count, reserved_count, |
|
214 | 213 |
mapping, group_list, instances, ext_res, serial, uuid) in result: |
215 | 214 |
size = free_count + reserved_count |
216 | 215 |
ToStdout("Network name: %s", name) |
... | ... | |
221 | 220 |
ToStdout(" IPv6 Subnet: %s", network6) |
222 | 221 |
ToStdout(" IPv6 Gateway: %s", gateway6) |
223 | 222 |
ToStdout(" Mac Prefix: %s", mac_prefix) |
224 |
ToStdout(" Type: %s", network_type) |
|
225 | 223 |
ToStdout(" Size: %d", size) |
226 | 224 |
ToStdout(" Free: %d (%.2f%%)", free_count, |
227 | 225 |
100 * float(free_count) / float(size)) |
... | ... | |
277 | 275 |
"add_reserved_ips": _HandleReservedIPs(opts.add_reserved_ips), |
278 | 276 |
"remove_reserved_ips": _HandleReservedIPs(opts.remove_reserved_ips), |
279 | 277 |
"mac_prefix": opts.mac_prefix, |
280 |
"network_type": opts.network_type, |
|
281 | 278 |
"gateway6": opts.gateway6, |
282 | 279 |
"network6": opts.network6, |
283 | 280 |
} |
... | ... | |
312 | 309 |
"add": ( |
313 | 310 |
AddNetwork, ARGS_ONE_NETWORK, |
314 | 311 |
[DRY_RUN_OPT, NETWORK_OPT, GATEWAY_OPT, ADD_RESERVED_IPS_OPT, |
315 |
MAC_PREFIX_OPT, NETWORK_TYPE_OPT, NETWORK6_OPT, GATEWAY6_OPT,
|
|
312 |
MAC_PREFIX_OPT, NETWORK6_OPT, GATEWAY6_OPT, |
|
316 | 313 |
NOCONFLICTSCHECK_OPT, TAG_ADD_OPT, PRIORITY_OPT, SUBMIT_OPT], |
317 | 314 |
"<network_name>", "Add a new IP network to the cluster"), |
318 | 315 |
"list": ( |
... | ... | |
331 | 328 |
"modify": ( |
332 | 329 |
SetNetworkParams, ARGS_ONE_NETWORK, |
333 | 330 |
[DRY_RUN_OPT, SUBMIT_OPT, ADD_RESERVED_IPS_OPT, REMOVE_RESERVED_IPS_OPT, |
334 |
GATEWAY_OPT, MAC_PREFIX_OPT, NETWORK_TYPE_OPT, NETWORK6_OPT, GATEWAY6_OPT,
|
|
331 |
GATEWAY_OPT, MAC_PREFIX_OPT, NETWORK6_OPT, GATEWAY6_OPT, |
|
335 | 332 |
PRIORITY_OPT], |
336 | 333 |
"<network_name>", "Alters the parameters of a network"), |
337 | 334 |
"connect": ( |
Also available in: Unified diff