x/python-ganttclient
Code Issues Proposed changes

merged trunk rev569

Browse Source
This commit is contained in:
Kei Masumoto
2011-01-17 04:12:27 +09:00
parent 953061dae8 b555ac50be
commit 2b85f06583
14 changed files with 471 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/nova-manage
View File

@@ -93,6 +93,7 @@ flags.DECLARE('num_networks', 'nova.network.manager')
flags.DECLARE('network_size', 'nova.network.manager')
flags.DECLARE('vlan_start', 'nova.network.manager')
flags.DECLARE('vpn_start', 'nova.network.manager')
flags.DECLARE('fixed_range_v6', 'nova.network.manager')
class VpnCommands(object):
@@ -441,11 +442,12 @@ class NetworkCommands(object):
"""Class for managing networks."""
def create(self, fixed_range=None, num_networks=None,
network_size=None, vlan_start=None, vpn_start=None):
network_size=None, vlan_start=None, vpn_start=None,
fixed_range_v6=None):
"""Creates fixed ips for host by range
arguments: [fixed_range=FLAG], [num_networks=FLAG],
[network_size=FLAG], [vlan_start=FLAG],
[vpn_start=FLAG]"""
[vpn_start=FLAG], [fixed_range_v6=FLAG]"""
if not fixed_range:
fixed_range = FLAGS.fixed_range
if not num_networks:
@@ -456,11 +458,13 @@ class NetworkCommands(object):
vlan_start = FLAGS.vlan_start
if not vpn_start:
vpn_start = FLAGS.vpn_start
if not fixed_range_v6:
fixed_range_v6 = FLAGS.fixed_range_v6
net_manager = utils.import_object(FLAGS.network_manager)
net_manager.create_networks(context.get_admin_context(),
fixed_range, int(num_networks),
int(network_size), int(vlan_start),
int(vpn_start))
int(vpn_start), fixed_range_v6)
class InstanceCommands(object):
@@ -477,7 +481,7 @@ class InstanceCommands(object):
raise exception.Error(msg)
if FLAGS.volume_driver != 'nova.volume.driver.AOEDriver':
instance_ref = db.instance_get(instance_id)
instance_ref = db.instance_get(ctxt, instance_id)
if len(instance_ref['volumes']) != 0:
msg = _(("""Volumes attached by ISCSIDriver"""
""" are not supported. Sorry!"""))
@@ -505,7 +509,7 @@ class HostCommands(object):
logging.basicConfig()
service_refs = db.service_get_all(context.get_admin_context())
hosts = [ h['host'] for h in service_refs]
hosts = [h['host'] for h in service_refs]
hosts = list(set(hosts))
for host in hosts:
print host