Revision 3c286190 lib/client/gnt_network.py
b/lib/client/gnt_network.py | ||
---|---|---|
44 | 44 |
return utils.UnescapeAndSplit(ips, sep=",") |
45 | 45 |
return None |
46 | 46 |
|
47 |
|
|
47 | 48 |
def AddNetwork(opts, args): |
48 | 49 |
"""Add a network to the cluster. |
49 | 50 |
|
... | ... | |
61 | 62 |
else: |
62 | 63 |
tags = [] |
63 | 64 |
|
64 |
op = opcodes.OpNetworkAdd(network_name=network_name,
|
|
65 |
gateway=opts.gateway,
|
|
66 |
network=opts.network,
|
|
67 |
gateway6=opts.gateway6,
|
|
68 |
network6=opts.network6,
|
|
69 |
mac_prefix=opts.mac_prefix,
|
|
70 |
network_type=opts.network_type,
|
|
71 |
add_reserved_ips=\
|
|
72 |
_HandleReservedIPs(opts.add_reserved_ips),
|
|
73 |
tags=tags)
|
|
65 |
op = opcodes.OpNetworkAdd( |
|
66 |
network_name=network_name,
|
|
67 |
gateway=opts.gateway,
|
|
68 |
network=opts.network,
|
|
69 |
gateway6=opts.gateway6,
|
|
70 |
network6=opts.network6,
|
|
71 |
mac_prefix=opts.mac_prefix,
|
|
72 |
network_type=opts.network_type,
|
|
73 |
add_reserved_ips=_HandleReservedIPs(opts.add_reserved_ips),
|
|
74 |
tags=tags) |
|
74 | 75 |
SubmitOpCode(op, opts=opts) |
75 | 76 |
|
76 | 77 |
|
... | ... | |
202 | 203 |
ToStdout(" type: %s", network_type) |
203 | 204 |
ToStdout(" size: %d", size) |
204 | 205 |
ToStdout(" free: %d (%.2f%%)", free_count, |
205 |
100 * float(free_count)/float(size))
|
|
206 |
100 * float(free_count) / float(size))
|
|
206 | 207 |
ToStdout(" usage map:") |
207 | 208 |
idx = 0 |
208 | 209 |
for line in wrap(mapping, width=64): |
... | ... | |
229 | 230 |
["nic.ips", "nic.networks"], |
230 | 231 |
use_locking=False) |
231 | 232 |
|
232 |
l = lambda value: ", ".join(str(idx)+":"+str(ip)
|
|
233 |
l = lambda value: ", ".join(str(idx) + ":" + str(ip)
|
|
233 | 234 |
for idx, (ip, net) in enumerate(value) |
234 | 235 |
if net == name) |
235 | 236 |
|
Also available in: Unified diff