openstack/fuel-main
Code Issues Proposed changes

Fix ip allocation

Browse Source
This commit is contained in:
vic 2012-09-17 16:45:49 +04:00 committed by default
parent acdd17b06a
commit 37fed00260
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
devops/devops/controller.py
View File

@ -56,6 +56,7 @@ class Controller:
for interface in node.interfaces: for interface in node.interfaces:
interface.node = node interface.node = node
interface.network.interfaces.append(interface) interface.network.interfaces.append(interface)
logger.info("Calculated interfaces '%s' '%s'" % (interface.node, interface.network.name))
for disk in node.disks: for disk in node.disks:
if disk.base_image and disk.base_image.find('://') != -1: if disk.base_image and disk.base_image.find('://') != -1:
@ -84,27 +85,23 @@ class Controller:
for address in interface.ip_addresses: for address in interface.ip_addresses:
if address in network.ip_addresses: if address in network.ip_addresses:
allocated_addresses.append(address) allocated_addresses.append(address)
logger.info("Allocate addresses are calculated for '%s'" % network.name)
next_address_index = 2 dhcp_allowed_addresses = list(network.ip_addresses)[2:-2]
for interface in network.interfaces: for interface in network.interfaces:
if not len(interface.ip_addresses): logger.info("Enumerated interfaces '%s' '%s'" % (interface.node, interface.network.name))
while next_address_index < network.ip_addresses.numhosts and\ logger.info(list(interface.ip_addresses))
network.ip_addresses[ if not len(list(interface.ip_addresses)):
next_address_index] in allocated_addresses: address = self.get_first_free_address(
next_address_index += 1 dhcp_allowed_addresses,
allocated_addresses)
if next_address_index >= network.ip_addresses.numhosts: if address is None:
raise DevopsError, "Failed to allocated IP address for node '%s' in network '%s': no more addresses left" % (node.name, network.name) raise DevopsError, "Failed to allocate IP address for node '%s' in network '%s': no more addresses left" % (interface.node.name, network.name)
address = network.ip_addresses[next_address_index]
interface.ip_addresses.append(address) interface.ip_addresses.append(address)
allocated_addresses.append(next_address_index) logger.info("Allocate IP address '%s' for node '%s' in network '%s'" % (address, interface.node.name, network.name))
next_address_index += 1 allocated_addresses.append(address)
network.dhcp_dynamic_address_start = network.ip_addresses[ network.dhcp_dynamic_address_start = dhcp_allowed_addresses[0]
next_address_index] network.dhcp_dynamic_address_end = dhcp_allowed_addresses[-1]
network.dhcp_dynamic_address_end = network.ip_addresses[
network.ip_addresses.numhosts - 2]
for network in environment.networks: for network in environment.networks:
logger.info("Building network %s" % network.name) logger.info("Building network %s" % network.name)
@ -303,3 +300,9 @@ class Controller:
return cached_path return cached_path
def get_first_free_address(self, allowed_addresses, allocated_addresses):
s = set(allocated_addresses)
for x in allowed_addresses:
if x not in s:
return x
return None

14
devops/devops/driver/libvirt.py
View File

@ -70,11 +70,11 @@ class LibvirtXMLBuilder:
else: else:
end = network.ip_addresses[ end = network.ip_addresses[
network.ip_addresses.numhosts - 2] network.ip_addresses.numhosts - 2]
allowed_addresses = list(network.ip_addresses)[2: network.ip_addresses.numhosts - 2]
network_xml.range(start=str(start), end=str(end)) network_xml.range(start=str(start), end=str(end))
for interface in network.interfaces: for interface in network.interfaces:
address = find( address = find(
lambda ip: ip in network.ip_addresses, lambda ip: ip in allowed_addresses,
interface.ip_addresses) interface.ip_addresses)
if address and interface.mac_address: if address and interface.mac_address:
network_xml.host( network_xml.host(
@ -282,11 +282,12 @@ class Libvirt:
process.wait() process.wait()
if process.returncode: if process.returncode:
logger.error( logger.error(
"Command '%s' returned %d, stderr: %s" % ( "Command '{0:>s}' returned {1:d}, stderr: {2:>s}".format(
command, process.returncode, process.stderr.read())) command, process.returncode, process.stderr.read()))
else: else:
logger.debug( logger.debug(
"Command '%s' returned %d" % (command, process.returncode)) "Command '{0:>s}' returned {1:d}".format(command,
process.returncode))
snapshot_ids = [] snapshot_ids = []
for line in process.stdout.readlines()[2:]: for line in process.stdout.readlines()[2:]:
@ -389,8 +390,7 @@ class Libvirt:
process.wait() process.wait()
if process.returncode: if process.returncode:
logger.error( logger.error(
"Command '%s' returned code %d:\n%s" % ( "Command '{0:>s}' returned code {1:d}:\n{2:>s}".format(command,
command,
process.returncode, process.returncode,
process.stderr.read())) process.stderr.read()))
raise LibvirtException, "Failed to execute command '%s'" % command raise LibvirtException, "Failed to execute command '%s'" % command

8
devops/devops/model.py
View File

@ -1,10 +1,15 @@
from itertools import chain from itertools import chain
class EnvironmentException(object):
pass
class ManagedObject(object): class ManagedObject(object):
def __init__(self): def __init__(self):
super(ManagedObject, self).__init__() super(ManagedObject, self).__init__()
self._driver = None self._driver = None
self.name = None
@property @property
def driver(self): def driver(self):
@ -154,7 +159,8 @@ class Disk(object):
class Interface(ManagedObject): class Interface(ManagedObject):
def __init__(self, network, ip_addresses=[]): def __init__(self, network, ip_addresses=None):
if not ip_addresses: ip_addresses = []
self.node = None self.node = None
self.network = network self.network = network
if not isinstance(ip_addresses, (list, tuple)): if not isinstance(ip_addresses, (list, tuple)):