From bc22c008ddc61d015986e3d14918e74914e792ee Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 27 Dec 2019 12:14:34 -0500 Subject: [PATCH] Split the name_servers in the right place --- client-api/api_lib/pvcapi_helper.py | 6 ++++++ client-api/pvc-api.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client-api/api_lib/pvcapi_helper.py b/client-api/api_lib/pvcapi_helper.py index 38ae0012..f206eb8b 100755 --- a/client-api/api_lib/pvcapi_helper.py +++ b/client-api/api_lib/pvcapi_helper.py @@ -657,6 +657,9 @@ def net_add(vni, description, nettype, domain, name_servers, """ Add a virtual client network to the PVC cluster. """ + if name_servers is not None: + name_servers = name_servers.split(',') + zk_conn = pvc_common.startZKConnection(config['coordinators']) retflag, retdata = pvc_network.add_network(zk_conn, vni, description, nettype, domain, name_servers, ip4_network, ip4_gateway, ip6_network, ip6_gateway, @@ -679,6 +682,9 @@ def net_modify(vni, description, domain, name_servers, """ Modify a virtual client network in the PVC cluster. """ + if name_servers is not None: + name_servers = name_servers.split(',') + zk_conn = pvc_common.startZKConnection(config['coordinators']) retflag, retdata = pvc_network.modify_network(zk_conn, vni, description, domain, name_servers, ip4_network, ip4_gateway, ip6_network, ip6_gateway, diff --git a/client-api/pvc-api.py b/client-api/pvc-api.py index 551a53a9..3429c164 100755 --- a/client-api/pvc-api.py +++ b/client-api/pvc-api.py @@ -1644,7 +1644,7 @@ class API_Network_Element(Resource): reqargs.get('description', None), reqargs.get('nettype', None), reqargs.get('domain', None), - reqargs.get('name_servers', None).split(','), + reqargs.get('name_servers', None), reqargs.get('ip4_network', None), reqargs.get('ip4_gateway', None), reqargs.get('ip6_network', None), @@ -1735,7 +1735,7 @@ class API_Network_Element(Resource): return api_helper.net_modify( reqargs.get('description', None), reqargs.get('domain', None), - reqargs.get('name_servers', None).split(','), + reqargs.get('name_servers', None), reqargs.get('ip4_network', None), reqargs.get('ip4_gateway', None), reqargs.get('ip6_network', None),