x/python-ganttclient
Code Issues Proposed changes

Merged trunk.

Browse Source
This commit is contained in:
Josh Kearney
2011-08-03 11:38:01 -05:00
parent 4494306172 3cf2b1410c
commit dffb87fe41
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bin/nova-manage
View File

@@ -662,8 +662,9 @@ class NetworkCommands(object):
# check for certain required inputs # check for certain required inputs
if not label: if not label:
raise exception.NetworkNotCreated(req='--label') raise exception.NetworkNotCreated(req='--label')
if not fixed_range_v4: if not (fixed_range_v4 or fixed_range_v6):
raise exception.NetworkNotCreated(req='--fixed_range_v4') req = '--fixed_range_v4 or --fixed_range_v6'
raise exception.NetworkNotCreated(req=req)
bridge = bridge or FLAGS.flat_network_bridge bridge = bridge or FLAGS.flat_network_bridge
if not bridge: if not bridge:
@@ -689,16 +690,6 @@ class NetworkCommands(object):
if FLAGS.network_manager in interface_required: if FLAGS.network_manager in interface_required:
raise exception.NetworkNotCreated(req='--bridge_interface') raise exception.NetworkNotCreated(req='--bridge_interface')
if FLAGS.use_ipv6:
fixed_range_v6 = fixed_range_v6 or FLAGS.fixed_range_v6
if not fixed_range_v6:
raise exception.NetworkNotCreated(req='with use_ipv6, '
'--fixed_range_v6')
gateway_v6 = gateway_v6 or FLAGS.gateway_v6
if not gateway_v6:
raise exception.NetworkNotCreated(req='with use_ipv6, '
'--gateway_v6')
# sanitize other input using FLAGS if necessary # sanitize other input using FLAGS if necessary
if not num_networks: if not num_networks:
num_networks = FLAGS.num_networks num_networks = FLAGS.num_networks
@@ -735,8 +726,8 @@ class NetworkCommands(object):
def list(self): def list(self):
"""List all created networks""" """List all created networks"""
print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % ( print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (
_('network'), _('IPv4'),
_('netmask'), _('IPv6'),
_('start address'), _('start address'),
_('DNS1'), _('DNS1'),
_('DNS2'), _('DNS2'),
@@ -745,7 +736,7 @@ class NetworkCommands(object):
for network in db.network_get_all(context.get_admin_context()): for network in db.network_get_all(context.get_admin_context()):
print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % ( print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s" % (
network.cidr, network.cidr,
network.netmask, network.cidr_v6,
network.dhcp_start, network.dhcp_start,
network.dns1, network.dns1,
network.dns2, network.dns2,

4
nova/tests/test_db_api.py
View File

@@ -57,7 +57,7 @@ class DbApiTestCase(test.TestCase):
def test_instance_get_project_vpn(self): def test_instance_get_project_vpn(self):
values = {'instance_type_id': FLAGS.default_instance_type, values = {'instance_type_id': FLAGS.default_instance_type,
'image_ref': FLAGS.vpn_image_id, 'image_ref': FLAGS.vpn_image_id,
'project_id': self.project_id 'project_id': self.project_id,
} }
instance = db.instance_create(self.context, values) instance = db.instance_create(self.context, values)
result = db.instance_get_project_vpn(self.context.elevated(), result = db.instance_get_project_vpn(self.context.elevated(),
@@ -67,7 +67,7 @@ class DbApiTestCase(test.TestCase):
def test_instance_get_project_vpn_joins(self): def test_instance_get_project_vpn_joins(self):
values = {'instance_type_id': FLAGS.default_instance_type, values = {'instance_type_id': FLAGS.default_instance_type,
'image_ref': FLAGS.vpn_image_id, 'image_ref': FLAGS.vpn_image_id,
'project_id': self.project_id 'project_id': self.project_id,
} }
instance = db.instance_create(self.context, values) instance = db.instance_create(self.context, values)
_setup_networking(instance['id']) _setup_networking(instance['id'])