Revision 5c8076b6 snf-cyclades-app/synnefo/logic/backend.py

b/snf-cyclades-app/synnefo/logic/backend.py
96 96
        # Commission for this change has not been issued, or the issued
97 97
        # commission was unaware of the current change. Reject all previous
98 98
        # commissions and create a new one in forced mode!
99
        previous_serial = vm.serial
100
        if previous_serial and not previous_serial.resolved:
101
            quotas.resolve_vm_commission(previous_serial)
102 99
        commission_name = ("client: dispatcher, resource: %s, ganeti_job: %s"
103 100
                           % (vm, job_id))
104
        serial = quotas.issue_commission(user=vm.userid,
105
                                         source=quotas.DEFAULT_SOURCE,
106
                                         provisions=commission_info,
107
                                         name=commission_name,
108
                                         force=True,
109
                                         auto_accept=True)
110
        # Clear VM's serial. Expected job may arrive later. However correlated
111
        # serial must not be accepted, since it reflects a previous VM state
112
        vm.serial = None
101
        quotas.handle_resource_commission(vm, action,
102
                                          commission_info=commission_info,
103
                                          commission_name=commission_name,
104
                                          force=True,
105
                                          auto_accept=True)
106
        log.debug("Issued new commission: %s", vm.serial)
113 107

  
114 108
    return vm
115 109

  

Also available in: Unified diff