vmbuilder/console
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of 10.10.10.10:sws/swscloudcore

Browse source
This commit is contained in:
Vyacheslav Anzhiganov 2016-06-25 02:26:49 +03:00
commit 3bda766bf6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SWSCloudCore/controllers/ips/__init__.py
View file

@ -9,9 +9,11 @@ class ControllerIps:
def getfree(self, datacenter_id):
# select IP
return models.Ips.select().where(
models.Ips.datacenter == datacenter_id and models.Ips.status == 0
).get()
return models.Ips.select().join(models.Servers).where(
models.Ips.datacenter == datacenter_id,
models.Servers.status == 1,
models.Ips.status == 0
).first()
def setbusy(self, ip_id):
# mark ip as busy (taken)