From 0b396e1315a76112ab978a677e96d7b3a371faa9 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 15 Jul 2010 23:11:33 +0000 Subject: Fixes to dhcp lease code to use a flagfile --- bin/dhcpleasor.py | 90 -------------------------------------------------- bin/nova-dhcpbridge | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 90 deletions(-) delete mode 100755 bin/dhcpleasor.py create mode 100755 bin/nova-dhcpbridge (limited to 'bin') diff --git a/bin/dhcpleasor.py b/bin/dhcpleasor.py deleted file mode 100755 index 31f4433fb..000000000 --- a/bin/dhcpleasor.py +++ /dev/null @@ -1,90 +0,0 @@ -#!/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. - -""" -dhcpleasor.py - -Handle lease database updates from DHCP servers. -""" - -import sys -import os -import logging -sys.path.append(os.path.abspath(os.path.join(__file__, "../../"))) - -logging.debug(sys.path) -import getopt -from os import environ -from nova.compute import linux_net -from nova.compute import network -from nova import rpc - -from nova import flags -FLAGS = flags.FLAGS - - -def add_lease(mac, ip, hostname, interface): - if FLAGS.fake_rabbit: - network.lease_ip(ip) - else: - rpc.cast(FLAGS.cloud_topic, {"method": "lease_ip", - "args" : {"address": ip}}) - -def old_lease(mac, ip, hostname, interface): - logging.debug("Adopted old lease or got a change of mac/hostname") - -def del_lease(mac, ip, hostname, interface): - if FLAGS.fake_rabbit: - network.release_ip(ip) - else: - rpc.cast(FLAGS.cloud_topic, {"method": "release_ip", - "args" : {"address": ip}}) - -def init_leases(interface): - net = network.get_network_by_interface(interface) - res = "" - for host_name in net.hosts: - res += "%s\n" % linux_net.hostDHCP(net, host_name, net.hosts[host_name]) - return res - - -def main(argv=None): - if argv is None: - argv = sys.argv - interface = environ.get('DNSMASQ_INTERFACE', 'br0') - if int(environ.get('TESTING', '0')): - FLAGS.fake_rabbit = True - FLAGS.redis_db = 8 - FLAGS.network_size = 32 - FLAGS.fake_libvirt=True - FLAGS.fake_network=True - FLAGS.fake_users = True - action = argv[1] - if action in ['add','del','old']: - mac = argv[2] - ip = argv[3] - hostname = argv[4] - logging.debug("Called %s for mac %s with ip %s and hostname %s on interface %s" % (action, mac, ip, hostname, interface)) - globals()[action+'_lease'](mac, ip, hostname, interface) - else: - print init_leases(interface) - exit(0) - -if __name__ == "__main__": - sys.exit(main()) diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge new file mode 100755 index 000000000..cd0eab2a8 --- /dev/null +++ b/bin/nova-dhcpbridge @@ -0,0 +1,94 @@ +#!/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. + +""" +nova-dhcpbridge + +Handle lease database updates from DHCP servers. +""" + +import logging +import os +import sys + +#TODO(joshua): there is concern that the user dnsmasq runs under will not +# have nova in the path. This should be verified and if it is +# not true the ugly line below can be removed +sys.path.append(os.path.abspath(os.path.join(__file__, "../../"))) + +from nova import rpc +from nova import utils + +from nova.compute import linux_net +from nova.compute import network + +from nova import flags +FLAGS = flags.FLAGS + + +def add_lease(mac, ip, hostname, interface): + if FLAGS.fake_rabbit: + network.lease_ip(ip) + else: + rpc.cast(FLAGS.cloud_topic, {"method": "lease_ip", + "args" : {"address": ip}}) + +def old_lease(mac, ip, hostname, interface): + logging.debug("Adopted old lease or got a change of mac/hostname") + +def del_lease(mac, ip, hostname, interface): + if FLAGS.fake_rabbit: + network.release_ip(ip) + else: + rpc.cast(FLAGS.cloud_topic, {"method": "release_ip", + "args" : {"address": ip}}) + +def init_leases(interface): + net = network.get_network_by_interface(interface) + res = "" + for host_name in net.hosts: + res += "%s\n" % linux_net.hostDHCP(net, host_name, net.hosts[host_name]) + return res + + +def main(): + flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile) + utils.default_flagfile(flagfile) + argv = FLAGS(sys.argv) + interface = os.environ.get('DNSMASQ_INTERFACE', 'br0') + if int(os.environ.get('TESTING', '0')): + FLAGS.fake_rabbit = True + FLAGS.redis_db = 8 + FLAGS.network_size = 32 + FLAGS.fake_libvirt=True + FLAGS.fake_network=True + FLAGS.fake_users = True + action = argv[1] + if action in ['add','del','old']: + mac = argv[2] + ip = argv[3] + hostname = argv[4] + logging.debug("Called %s for mac %s with ip %s and hostname %s on interface %s" % (action, mac, ip, hostname, interface)) + globals()[action+'_lease'](mac, ip, hostname, interface) + else: + print init_leases(interface) + exit(0) + +if __name__ == "__main__": + sys.exit(main()) -- cgit