From 5e4676706961bef4595dd07e8505d5d6f4a91576 Mon Sep 17 00:00:00 2001
From: Kien Nguyen <kiennt@vn.fujitsu.com>
Date: Mon, 11 Sep 2017 15:49:50 +0700
Subject: [PATCH] Allow create/run container with network which has same cidr

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
---
 zun/network/kuryr_network.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/zun/network/kuryr_network.py b/zun/network/kuryr_network.py
index 42db0ca0d..4b5014aa0 100644
--- a/zun/network/kuryr_network.py
+++ b/zun/network/kuryr_network.py
@@ -57,33 +57,43 @@ class KuryrNetwork(network.Network):
             raise exception.ZunException(_(
                 "The Neutron network %s has no subnet") % neutron_net_id)
 
+        # IPAM driver specific options
         ipam_options = {
             "Driver": CONF.network.driver_name,
             "Options": {},
             "Config": []
         }
+
+        # Driver specific options
+        options = {
+            'neutron.net.uuid': neutron_net_id
+        }
+
         if v4_subnet:
             ipam_options["Options"]['neutron.pool.uuid'] = (
                 v4_subnet.get('subnetpool_id'))
+            ipam_options['Options']['neutron.subnet.uuid'] = \
+                v4_subnet.get('id')
             ipam_options["Config"].append({
                 "Subnet": v4_subnet['cidr'],
                 "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:
             ipam_options["Options"]['neutron.pool.v6.uuid'] = (
                 v6_subnet.get('subnetpool_id'))
+            ipam_options['Options']['neutron.subnet.v6.uuid'] = \
+                v6_subnet.get('id')
             ipam_options["Config"].append({
                 "Subnet": v6_subnet['cidr'],
                 "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.subnet.v6.uuid'] = v6_subnet.get('id')
+
         LOG.debug("Calling docker.create_network to create network %s, "
                   "ipam_options %s, options %s", name, ipam_options, options)
         docker_network = self.docker.create_network(