From 1daf5d1298e46f0b0a52973f4c75ed9820c8c48b Mon Sep 17 00:00:00 2001 From: Vyacheslav Anzhiganov Date: Fri, 24 Jun 2016 03:09:06 +0300 Subject: [PATCH] #69 --- SWSCloudCore/controllers/ips/__init__.py | 8 +++++--- setup.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/SWSCloudCore/controllers/ips/__init__.py b/SWSCloudCore/controllers/ips/__init__.py index 6e80ec4..db30c3d 100644 --- a/SWSCloudCore/controllers/ips/__init__.py +++ b/SWSCloudCore/controllers/ips/__init__.py @@ -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) diff --git a/setup.py b/setup.py index 3fc93f6..49d0d77 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup setup( name='SWSCloudCore', - version='2.5.8', + version='2.5.9', author='Vyacheslav Anzhiganov', author_email='hello@anzhiganov.com', packages=[