Ver Fonte

实现创建虚拟机时,忽略已保留的 IP。

James Iter há 7 anos atrás
pai
commit
dd00e36d10
1 ficheiros alterados com 5 adições e 0 exclusões
  1. 5 0
      jimvc/api/guest.py

+ 5 - 0
jimvc/api/guest.py

@@ -20,6 +20,7 @@ from jimvc.models import app_config
 from jimvc.models import GuestState
 from jimvc.models import GuestState
 from jimvc.models import Service
 from jimvc.models import Service
 from jimvc.models import IPPool
 from jimvc.models import IPPool
+from jimvc.models import ReservedIP
 from jimvc.models import DiskState, Host
 from jimvc.models import DiskState, Host
 from jimvc.models import Database as db
 from jimvc.models import Database as db
 from jimvc.models import Config
 from jimvc.models import Config
@@ -192,6 +193,10 @@ def r_create():
             occupied_ips.append(row['ip'])
             occupied_ips.append(row['ip'])
             occupied_vnc_ports.append(row['vnc_port'])
             occupied_vnc_ports.append(row['vnc_port'])
 
 
+        rows, count = ReservedIP.get_all()
+        for row in rows:
+            occupied_ips.append(row['ip'])
+
         rows, count = IPPool.get_by_filter(filter_str=':'.join(['activity', 'eq', '1']))
         rows, count = IPPool.get_by_filter(filter_str=':'.join(['activity', 'eq', '1']))
         if count < 1:
         if count < 1:
             ret['state'] = ji.Common.exchange_state(50350)
             ret['state'] = ji.Common.exchange_state(50350)