Revision bfd04b01 snf-cyclades-app/synnefo/logic/reconciliation.py
| b/snf-cyclades-app/synnefo/logic/reconciliation.py | ||
|---|---|---|
| 336 | 336 |
self.log.info("Cleared pending task for server '%s", server_id)
|
| 337 | 337 |
|
| 338 | 338 |
|
| 339 |
NIC_MSG = ": %s\t".join(["ID", "State", "IP", "Network", "MAC", "Firewall"])\
|
|
| 340 |
+ ": %s" |
|
| 339 |
NIC_MSG = ": %s\t".join(["ID", "State", "IP", "Network", "MAC", "Index",
|
|
| 340 |
"Firewall"]) + ": %s"
|
|
| 341 | 341 |
|
| 342 | 342 |
|
| 343 | 343 |
def format_db_nic(nic): |
| 344 | 344 |
return NIC_MSG % (nic.id, nic.state, nic.ipv4, nic.network_id, nic.mac, |
| 345 |
nic.firewall_profile) |
|
| 345 |
nic.index, nic.firewall_profile)
|
|
| 346 | 346 |
|
| 347 | 347 |
|
| 348 | 348 |
def format_gnt_nic(nic): |
| 349 | 349 |
nic_name, nic = nic |
| 350 | 350 |
return NIC_MSG % (nic_name, nic["state"], nic["ipv4"], nic["network"], |
| 351 |
nic["mac"], nic["firewall_profile"]) |
|
| 351 |
nic["mac"], nic["index"], nic["firewall_profile"])
|
|
| 352 | 352 |
|
| 353 | 353 |
|
| 354 | 354 |
# |
Also available in: Unified diff