Revision bfd04b01

b/snf-cyclades-app/synnefo/logic/backend.py
59 59
# stale and removed from DB.
60 60
BUILDING_NIC_TIMEOUT = 180
61 61

  
62
NIC_FIELDS = ["state", "mac", "ipv4", "ipv6", "network", "firewall_profile"]
62
NIC_FIELDS = ["state", "mac", "ipv4", "ipv6", "network", "firewall_profile",
63
              "index"]
63 64

  
64 65

  
65 66
def handle_vm_quotas(vm, job_id, job_opcode, job_status, job_fields):
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