38172d5587
This introduces a new flag "quantum_use_dhcp=<boolean>" which indicates whether or not to enable dhcp for all of the networks. If it is set then we start dnsmasq (and provide it with the IP/MACs from Melange) similar to how this was done in linux_net before. Prior to this if you enabled dhcp then you would also get a gateway device.. some people may not want that so we now require that you specify the gateway when creating the network in order to end up with a device that will act as a gateway. If you're using Melange IPAM and you don't specify the gateway you still end up with one because it doesn't allow you to not have one. This lays the groundwork for the option of not having one in the future, at least :) Also, fix quantum/melange ipam interaction We now query for the subnets by net_id/vif_id instead of searching through all the blocks to find the right one. Both of the allocate and deallocate for instance calls are now using the vif_id -> network_id mapping instead of searching the quantum networks. get_port_by_attachment was also changed to take a net_id so that we don't have to search through all of the quantum networks to find the corresponding port. Change-Id: I6a84da35237b6c5f5cdee91ada92642103439a97
134 lines
4.5 KiB
Python
Executable File
134 lines
4.5 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""
|
|
Handle lease database updates from DHCP servers.
|
|
"""
|
|
|
|
import gettext
|
|
import os
|
|
import sys
|
|
|
|
# If ../nova/__init__.py exists, add ../ to Python search path, so that
|
|
# it will override what happens to be installed in /usr/(local/)lib/python...
|
|
possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
|
|
os.pardir,
|
|
os.pardir))
|
|
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
|
|
sys.path.insert(0, possible_topdir)
|
|
|
|
gettext.install('nova', unicode=1)
|
|
|
|
from nova import context
|
|
from nova import db
|
|
from nova import flags
|
|
from nova import log as logging
|
|
from nova import rpc
|
|
from nova import utils
|
|
from nova.network import linux_net
|
|
|
|
FLAGS = flags.FLAGS
|
|
flags.DECLARE('auth_driver', 'nova.auth.manager')
|
|
flags.DECLARE('network_size', 'nova.network.manager')
|
|
flags.DECLARE('num_networks', 'nova.network.manager')
|
|
flags.DECLARE('update_dhcp_on_disassociate', 'nova.network.manager')
|
|
|
|
LOG = logging.getLogger('nova.dhcpbridge')
|
|
|
|
|
|
def add_lease(mac, ip_address):
|
|
"""Set the IP that was assigned by the DHCP server."""
|
|
if FLAGS.fake_rabbit:
|
|
LOG.debug(_("leasing ip"))
|
|
network_manager = utils.import_object(FLAGS.network_manager)
|
|
network_manager.lease_fixed_ip(context.get_admin_context(),
|
|
ip_address)
|
|
else:
|
|
rpc.cast(context.get_admin_context(),
|
|
"%s.%s" % (FLAGS.network_topic, FLAGS.host),
|
|
{"method": "lease_fixed_ip",
|
|
"args": {"address": ip_address}})
|
|
|
|
|
|
def old_lease(mac, ip_address):
|
|
"""Update just as add lease."""
|
|
LOG.debug(_("Adopted old lease or got a change of mac"))
|
|
add_lease(mac, ip_address)
|
|
|
|
|
|
def del_lease(mac, ip_address):
|
|
"""Called when a lease expires."""
|
|
if FLAGS.fake_rabbit:
|
|
LOG.debug(_("releasing ip"))
|
|
network_manager = utils.import_object(FLAGS.network_manager)
|
|
network_manager.release_fixed_ip(context.get_admin_context(),
|
|
ip_address)
|
|
else:
|
|
rpc.cast(context.get_admin_context(),
|
|
"%s.%s" % (FLAGS.network_topic, FLAGS.host),
|
|
{"method": "release_fixed_ip",
|
|
"args": {"address": ip_address}})
|
|
|
|
|
|
def init_leases(network_id):
|
|
"""Get the list of hosts for a network."""
|
|
ctxt = context.get_admin_context()
|
|
network_ref = db.network_get(ctxt, network_id)
|
|
network_manager = utils.import_object(FLAGS.network_manager)
|
|
return network_manager.get_dhcp_leases(ctxt, network_ref)
|
|
|
|
|
|
def main():
|
|
"""Parse environment and arguments and call the approproate action."""
|
|
flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile)
|
|
utils.default_flagfile(flagfile)
|
|
argv = FLAGS(sys.argv)
|
|
logging.setup()
|
|
|
|
if int(os.environ.get('TESTING', '0')):
|
|
from nova.tests import fake_flags
|
|
|
|
#if FLAGS.fake_rabbit:
|
|
# LOG.debug(_("leasing ip"))
|
|
# network_manager = utils.import_object(FLAGS.network_manager)
|
|
## reload(fake_flags)
|
|
# from nova.tests import fake_flags
|
|
|
|
action = argv[1]
|
|
if action in ['add', 'del', 'old']:
|
|
mac = argv[2]
|
|
ip = argv[3]
|
|
msg = _("Called '%(action)s' for mac '%(mac)s' with ip '%(ip)s'") % \
|
|
{"action": action,
|
|
"mac": mac,
|
|
"ip": ip}
|
|
LOG.debug(msg)
|
|
globals()[action + '_lease'](mac, ip)
|
|
else:
|
|
try:
|
|
network_id = int(os.environ.get('NETWORK_ID'))
|
|
except TypeError:
|
|
LOG.error(_("Environment variable 'NETWORK_ID' must be set."))
|
|
sys.exit(1)
|
|
|
|
print init_leases(network_id)
|
|
|
|
if __name__ == "__main__":
|
|
main()
|