projects
/
osm
/
openvim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix minor bugs related with dhcp
[osm/openvim.git]
/
osm_openvim
/
vim_db.py
diff --git
a/osm_openvim/vim_db.py
b/osm_openvim/vim_db.py
index
b034342
..
5d7fb16
100644
(file)
--- a/
osm_openvim/vim_db.py
+++ b/
osm_openvim/vim_db.py
@@
-37,7
+37,7
@@
import uuid as myUuid
import auxiliary_functions as af
import json
import logging
import auxiliary_functions as af
import json
import logging
-from netaddr import IPNetwork, IP
Set, IPRange, all_matching_cidr
s
+from netaddr import IPNetwork, IP
Addres
s
HTTP_Bad_Request = 400
HTTP_Unauthorized = 401
HTTP_Bad_Request = 400
HTTP_Unauthorized = 401
@@
-1538,15
+1538,15
@@
class vim_db():
:param ip_used_list: contain all used ips to avoid ip collisions
:return:
"""
:param ip_used_list: contain all used ips to avoid ip collisions
:return:
"""
-
ip_tools = IPNetwork(cidr)
cidr_len = ip_tools.prefixlen
ips = IPNetwork(first_ip + '/' + str(cidr_len))
ip_tools = IPNetwork(cidr)
cidr_len = ip_tools.prefixlen
ips = IPNetwork(first_ip + '/' + str(cidr_len))
- ip_used_list.append(str(ips[0])) # first ip
- ip_used_list.append(str(ips[1])) # gw ip
- ip_used_list.append(str(ips[-1])) # broadcast ip
+
+ ip_used_list.append(str(ips[1])) # gw ip
+ ip_used_list.append(str(ips[-1])) # broadcast ip
+
for vm_ip in ips:
for vm_ip in ips:
- if str(vm_ip) not in ip_used_list:
+ if str(vm_ip) not in ip_used_list
and IPAddress(first_ip) <= IPAddress(vm_ip) <= IPAddress(last_ip)
:
return vm_ip
return None
return vm_ip
return None