x/python-ganttclient
Code Issues Proposed changes

dhcpbridge fixes from review

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-09-07 19:48:38 -07:00
parent 2aba4b149c
commit 993e5121a5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/nova-dhcpbridge
View File

@@ -34,12 +34,13 @@ from nova import db
from nova import flags from nova import flags
from nova import rpc from nova import rpc
from nova import utils from nova import utils
from nova import datastore # for redis_db flag
from nova.auth import manager # for auth flags
from nova.network import linux_net from nova.network import linux_net
from nova.network import manager # for network flags
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
flags.DECLARE('auth_driver', 'nova.auth.manager')
flags.DECLARE('redis_db', 'nova.datastore')
flags.DECLARE('network_size', 'nova.network.manager')
flags.DECLARE('num_networks', 'nova.network.manager')
def add_lease(_mac, ip_address, _hostname, _interface): def add_lease(_mac, ip_address, _hostname, _interface):
@@ -80,7 +81,6 @@ def init_leases(interface):
def main(): def main():
global network_manager
"""Parse environment and arguments and call the approproate action.""" """Parse environment and arguments and call the approproate action."""
flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile) flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile)
utils.default_flagfile(flagfile) utils.default_flagfile(flagfile)
@@ -99,7 +99,6 @@ def main():
'_trial_temp', '_trial_temp',
'nova.sqlite')) 'nova.sqlite'))
FLAGS.sql_connection = 'sqlite:///%s' % path FLAGS.sql_connection = 'sqlite:///%s' % path
#FLAGS.sql_connection = 'mysql://root@localhost/test'
action = argv[1] action = argv[1]
if action in ['add', 'del', 'old']: if action in ['add', 'del', 'old']:
mac = argv[2] mac = argv[2]