openstack/zun
Code Issues Proposed changes

Allow create/run container with network which has same cidr

Browse Source 
For e.x, we have 2 networks (network1 & network2). Both of them have subnet
with same cidr. We can run 2 container with 2 different networks (but with
same cidr).

$ zun create --net network=network1 cirros
$ zun create --net network=network2 cirros

Change-Id: I1c57ad3d6d195a5f04b5206cde472298a999f2d3
Closes-Bug: #1690284
This commit is contained in:
Kien Nguyen 2017-09-11 15:49:50 +07:00
parent 6e50011b34
commit 5e46767069
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zun/network/kuryr_network.py
View File

@ -57,33 +57,43 @@ class KuryrNetwork(network.Network):
raise exception.ZunException(_( raise exception.ZunException(_(
"The Neutron network %s has no subnet") % neutron_net_id) "The Neutron network %s has no subnet") % neutron_net_id)
# IPAM driver specific options
ipam_options = { ipam_options = {
"Driver": CONF.network.driver_name, "Driver": CONF.network.driver_name,
"Options": {}, "Options": {},
"Config": [] "Config": []
} }
# Driver specific options
options = {
'neutron.net.uuid': neutron_net_id
}
if v4_subnet: if v4_subnet:
ipam_options["Options"]['neutron.pool.uuid'] = ( ipam_options["Options"]['neutron.pool.uuid'] = (
v4_subnet.get('subnetpool_id')) v4_subnet.get('subnetpool_id'))
ipam_options['Options']['neutron.subnet.uuid'] = \
v4_subnet.get('id')
ipam_options["Config"].append({ ipam_options["Config"].append({
"Subnet": v4_subnet['cidr'], "Subnet": v4_subnet['cidr'],
"Gateway": v4_subnet['gateway_ip'] "Gateway": v4_subnet['gateway_ip']
}) })
options['neutron.pool.uuid'] = v4_subnet.get('subnetpool_id')
options['neutron.subnet.uuid'] = v4_subnet.get('id')
if v6_subnet: if v6_subnet:
ipam_options["Options"]['neutron.pool.v6.uuid'] = ( ipam_options["Options"]['neutron.pool.v6.uuid'] = (
v6_subnet.get('subnetpool_id')) v6_subnet.get('subnetpool_id'))
ipam_options['Options']['neutron.subnet.v6.uuid'] = \
v6_subnet.get('id')
ipam_options["Config"].append({ ipam_options["Config"].append({
"Subnet": v6_subnet['cidr'], "Subnet": v6_subnet['cidr'],
"Gateway": v6_subnet['gateway_ip'] "Gateway": v6_subnet['gateway_ip']
}) })
options = {
'neutron.net.uuid': neutron_net_id
}
if v4_subnet:
options['neutron.pool.uuid'] = v4_subnet.get('subnetpool_id')
if v6_subnet:
options['neutron.pool.v6.uuid'] = v6_subnet.get('subnetpool_id') options['neutron.pool.v6.uuid'] = v6_subnet.get('subnetpool_id')
options['neutron.subnet.v6.uuid'] = v6_subnet.get('id')
LOG.debug("Calling docker.create_network to create network %s, " LOG.debug("Calling docker.create_network to create network %s, "
"ipam_options %s, options %s", name, ipam_options, options) "ipam_options %s, options %s", name, ipam_options, options)
docker_network = self.docker.create_network( docker_network = self.docker.create_network(