x/python-ganttclient
Code Issues Proposed changes

Support fixed_ip range that is a subnet of the network block

Browse Source 
This enables flat deployments where the instances live on the
'general' network.  For example, a typical home router uses
192.168.0.0/16 for the private network.  Cloud machines can be
assigned 192.168.100.0/24.  An example network create command:

nova-manage network create private 192.168.0.0/16 1 65536 \
   --fixed_cidr=192.168.100.0/24 --gateway=192.168.1.1

Change-Id: I17edd81e9bc21ca3320233b606c99e03e25201bc
This commit is contained in:
Justin Santa Barbara
2012-02-06 11:25:40 -08:00
parent 4a94613f90
commit 566fd9bdf9
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/nova-manage
View File

@@ -770,6 +770,8 @@ class NetworkCommands(object):
@args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS') @args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS')
@args('--uuid', dest="uuid", metavar="<network uuid>", @args('--uuid', dest="uuid", metavar="<network uuid>",
help='Network UUID') help='Network UUID')
@args('--fixed_cidr', dest="fixed_cidr", metavar='<x.x.x.x/yy>',
help='IPv4 subnet for fixed IPS (ex: 10.20.0.0/16)')
@args('--project_id', dest="project_id", metavar="<project id>", @args('--project_id', dest="project_id", metavar="<project id>",
help='Project id') help='Project id')
@args('--priority', dest="priority", metavar="<number>", @args('--priority', dest="priority", metavar="<number>",
@@ -779,7 +781,7 @@ class NetworkCommands(object):
vpn_start=None, fixed_range_v6=None, gateway=None, vpn_start=None, fixed_range_v6=None, gateway=None,
gateway_v6=None, bridge=None, bridge_interface=None, gateway_v6=None, bridge=None, bridge_interface=None,
dns1=None, dns2=None, project_id=None, priority=None, dns1=None, dns2=None, project_id=None, priority=None,
uuid=None): uuid=None, fixed_cidr=None):
"""Creates fixed ips for host by range""" """Creates fixed ips for host by range"""
# check for certain required inputs # check for certain required inputs
@@ -831,6 +833,9 @@ class NetworkCommands(object):
if not network_size: if not network_size:
network_size = FLAGS.network_size network_size = FLAGS.network_size
if fixed_cidr:
fixed_cidr = netaddr.IPNetwork(fixed_cidr)
# create the network # create the network
net_manager = utils.import_object(FLAGS.network_manager) net_manager = utils.import_object(FLAGS.network_manager)
net_manager.create_networks(context.get_admin_context(), net_manager.create_networks(context.get_admin_context(),
@@ -850,7 +855,8 @@ class NetworkCommands(object):
dns2=dns2, dns2=dns2,
project_id=project_id, project_id=project_id,
priority=priority, priority=priority,
uuid=uuid) uuid=uuid,
fixed_cidr=fixed_cidr)
def list(self): def list(self):
"""List all created networks""" """List all created networks"""

2
nova/tests/test_network.py
View File

@@ -849,7 +849,7 @@ class CommonNetworkTestCase(test.TestCase):
super(CommonNetworkTestCase, self).setUp() super(CommonNetworkTestCase, self).setUp()
self.context = context.RequestContext('fake', 'fake') self.context = context.RequestContext('fake', 'fake')
def fake_create_fixed_ips(self, context, network_id): def fake_create_fixed_ips(self, context, network_id, fixed_cidr=None):
return None return None
def test_remove_fixed_ip_from_instance(self): def test_remove_fixed_ip_from_instance(self):