commit 5defb35d57f013397c73b48892565c28f4d9a140
author Scott Baker <smbaker@gmail.com> Wed Nov 29 15:09:38 2017 -0800
committer Scott Baker <scottb@onlab.us> Thu Nov 30 23:04:18 2017 +0000
tree 3bffeabe6f5642a43786483482324e162184685b
parent 99f94c9e4416c813a8bbb0761dab9c455e9e08bc

CORD-2316 remove code in ControllerNetwork syncstep that breaks subnet

Change-Id: I6a0ac372045cf9503e7eccc820dc1f47e0d20d62
(cherry picked from commit 02b686767387c4456698bf124d13f0d6791aba37)

xos/synchronizer/steps/sync_controller_networks.py

diff --git a/xos/synchronizer/steps/sync_controller_networks.py b/xos/synchronizer/steps/sync_controller_networks.py
index 8f8f358..e7be0c8 100644
--- a/xos/synchronizer/steps/sync_controller_networks.py
+++ b/xos/synchronizer/steps/sync_controller_networks.py
@@ -85,8 +85,8 @@
         else:
             end_ip = None
 
-        self.cidr=cidr
         slice = controller_network.network.owner
+        controller_network.subnet = cidr
 
         controller_network.gateway = self.alloc_gateway(cidr)
 
@@ -112,7 +112,6 @@
         network_id = res[0]['network']['id']
         subnet_id = res[1]['subnet']['id']
         controller_network.net_id = network_id
-        controller_network.subnet = self.cidr
         controller_network.subnet_id = subnet_id
 	controller_network.backend_status = 'OK'
 	controller_network.backend_code = 1