diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-19 20:07:39 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-07-19 20:07:39 +0000 |
| commit | a232ba0fda12a98e9da4345a6911a86b68f91826 (patch) | |
| tree | 3e45898c6f4a58fd17759ad29d8117294d4914ad /nova/tests | |
| parent | d52925f1f3293a4ad1692bd1aab846c713f7c3de (diff) | |
| parent | 19a8556917ffebf9f85e68df4a841e1ea97124d2 (diff) | |
Fixes to dhcp lease code to use a flagfile
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/network_unittest.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index a822cc1d9..444063d0f 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -19,16 +19,15 @@ import IPy import os import logging -import unittest from nova import flags from nova import test -from nova import exception -from nova.compute.exception import NoMoreAddresses -from nova.compute import network -from nova.auth import users from nova import utils +from nova.auth import users +from nova.compute import network +from nova.compute.exception import NoMoreAddresses +FLAGS = flags.FLAGS class NetworkTestCase(test.TrialTestCase): def setUp(self): @@ -180,14 +179,20 @@ def binpath(script): class FakeDNSMasq(object): def issue_ip(self, mac, ip, hostname, interface): - cmd = "%s add %s %s %s" % (binpath('dhcpleasor.py'), mac, ip, hostname) - env = {'DNSMASQ_INTERFACE': interface, 'TESTING' : '1'} + cmd = "%s add %s %s %s" % (binpath('nova-dhcpbridge'), + mac, ip, hostname) + env = {'DNSMASQ_INTERFACE': interface, + 'TESTING' : '1', + 'FLAGFILE' : FLAGS.dhcpbridge_flagfile} (out, err) = utils.execute(cmd, addl_env=env) logging.debug("ISSUE_IP: %s, %s " % (out, err)) def release_ip(self, mac, ip, hostname, interface): - cmd = "%s del %s %s %s" % (binpath('dhcpleasor.py'), mac, ip, hostname) - env = {'DNSMASQ_INTERFACE': interface, 'TESTING' : '1'} + cmd = "%s del %s %s %s" % (binpath('nova-dhcpbridge'), + mac, ip, hostname) + env = {'DNSMASQ_INTERFACE': interface, + 'TESTING' : '1', + 'FLAGFILE' : FLAGS.dhcpbridge_flagfile} (out, err) = utils.execute(cmd, addl_env=env) logging.debug("RELEASE_IP: %s, %s " % (out, err)) |