From c49cbb57e94cab0ebc588a569f7dcc54763e38c7 Mon Sep 17 00:00:00 2001 From: Aline Manera Date: Tue, 28 Mar 2017 16:09:04 -0300 Subject: [PATCH] Bug fix: Set original VLAN device to network parameters to be updated It is part of the #1087 fix Signed-off-by: Aline Manera --- model/networks.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/model/networks.py b/model/networks.py index b653b233c..59b111b90 100644 --- a/model/networks.py +++ b/model/networks.py @@ -530,6 +530,9 @@ def update(self, name, params): if params.get('vlan_id') or params.get('interfaces'): raise InvalidParameter("KCHNET0032E") + # merge parameters + info.update(params) + # get target device if bridge was created by Kimchi if connection == 'bridge': iface = info['interfaces'][0] @@ -542,18 +545,13 @@ def update(self, name, params): else: info['interfaces'] = original['interfaces'] = [port] - # merge parameters - info.update(params) - # delete original network self.delete(name) try: # create new network - network = self.collection.create(info) + return self.collection.create(info) except: # restore original network self.collection.create(original) raise - - return network