From 8269930d40cc81fe3943e2adbc74d16d640ed24d Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 13 Jun 2021 18:20:40 -0400 Subject: [PATCH] Fix bad entry in network add --- daemon-common/network.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/daemon-common/network.py b/daemon-common/network.py index d23b22f6..fc12ffe7 100644 --- a/daemon-common/network.py +++ b/daemon-common/network.py @@ -255,14 +255,14 @@ def add_network(zkhandler, vni, description, nettype, domain = '{}.local'.format(description) # Add the new network to Zookeeper - zkhandler.write([ + result = zkhandler.write([ (('network', vni), description), (('network.type', vni), nettype), (('network.domain', vni), domain), (('network.nameservers', vni), name_servers), (('network.ip6.network', vni), ip6_network), (('network.ip6.gateway', vni), ip6_gateway), - (('network.ip4.dhcp', vni), dhcp6_flag), + (('network.ip6.dhcp', vni), dhcp6_flag), (('network.ip4.network', vni), ip4_network), (('network.ip4.gateway', vni), ip4_gateway), (('network.ip4.dhcp', vni), dhcp4_flag), @@ -275,7 +275,10 @@ def add_network(zkhandler, vni, description, nettype, (('network.rule.out', vni), '') ]) - return True, 'Network "{}" added successfully!'.format(description) + if result: + return True, 'Network "{}" added successfully!'.format(description) + else: + return False, 'ERROR: Failed to add network.' def modify_network(zkhandler, vni, description=None, domain=None, name_servers=None,