Revision 495cfdf0
b/lib/rapi/rlib2.py | ||
---|---|---|
34 | 34 |
I_FIELDS = ["name", "admin_state", "os", |
35 | 35 |
"pnode", "snodes", |
36 | 36 |
"disk_template", |
37 |
"nic.ips", "nic.macs", "nic.bridges",
|
|
37 |
"nic.ips", "nic.macs", "nic.modes", "nic.links",
|
|
38 | 38 |
"network_port", |
39 | 39 |
"disk.sizes", "disk_usage", |
40 | 40 |
"beparams", "hvparams", |
... | ... | |
236 | 236 |
" be an integer") |
237 | 237 |
disks.append({"size": d}) |
238 | 238 |
# nic processing (one nic only) |
239 |
nics = [{"mac": fn("mac", constants.VALUE_AUTO), |
|
240 |
"ip": fn("ip", None), |
|
241 |
"bridge": fn("bridge", None)}] |
|
239 |
nics = [{"mac": fn("mac", constants.VALUE_AUTO)}] |
|
240 |
if fn("ip", None) is not None: |
|
241 |
nics[0]["ip"] = fn("ip") |
|
242 |
if fn("mode", None) is not None: |
|
243 |
nics[0]["mode"] = fn("mode") |
|
244 |
if fn("link", None) is not None: |
|
245 |
nics[0]["link"] = fn("link") |
|
246 |
if fn("bridge", None) is not None: |
|
247 |
nics[0]["bridge"] = fn("bridge") |
|
242 | 248 |
|
243 | 249 |
op = opcodes.OpCreateInstance( |
244 | 250 |
mode=constants.INSTANCE_CREATE, |
Also available in: Unified diff