Commit a0732089 authored by Christos Stavrakakis's avatar Christos Stavrakakis
Browse files

Fix bugs from merging

parent dff6e35b
......@@ -296,9 +296,11 @@ def create_server(serials, request):
nic = {'ip': address, 'network': network.backend_id}
except:
transaction.rollback()
raise
else:
transaction.commit()
try:
# Issue commission
serial = quotas.issue_vm_commission(user_id, flavor)
......
......@@ -533,6 +533,12 @@ class Network(models.Model):
def __str__(self):
return repr(str(self._action))
class DeletedError(Exception):
pass
class BuildingError(Exception):
pass
class BackendNetwork(models.Model):
OPER_STATES = (
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment