parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Split the name_servers in the right place

This commit is contained in:
Joshua Boniface 2019-12-27 12:14:34 -05:00
parent 33e5dcd5e8
commit bc22c008dd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client-api/api_lib/pvcapi_helper.py
View File

@ -657,6 +657,9 @@ def net_add(vni, description, nettype, domain, name_servers,
""" """
Add a virtual client network to the PVC cluster. 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']) zk_conn = pvc_common.startZKConnection(config['coordinators'])
retflag, retdata = pvc_network.add_network(zk_conn, vni, description, nettype, domain, name_servers, retflag, retdata = pvc_network.add_network(zk_conn, vni, description, nettype, domain, name_servers,
ip4_network, ip4_gateway, ip6_network, ip6_gateway, 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. 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']) zk_conn = pvc_common.startZKConnection(config['coordinators'])
retflag, retdata = pvc_network.modify_network(zk_conn, vni, description, domain, name_servers, retflag, retdata = pvc_network.modify_network(zk_conn, vni, description, domain, name_servers,
ip4_network, ip4_gateway, ip6_network, ip6_gateway, ip4_network, ip4_gateway, ip6_network, ip6_gateway,

4
client-api/pvc-api.py
View File

@ -1644,7 +1644,7 @@ class API_Network_Element(Resource):
reqargs.get('description', None), reqargs.get('description', None),
reqargs.get('nettype', None), reqargs.get('nettype', None),
reqargs.get('domain', None), reqargs.get('domain', None),
reqargs.get('name_servers', None).split(','), reqargs.get('name_servers', None),
reqargs.get('ip4_network', None), reqargs.get('ip4_network', None),
reqargs.get('ip4_gateway', None), reqargs.get('ip4_gateway', None),
reqargs.get('ip6_network', None), reqargs.get('ip6_network', None),
@ -1735,7 +1735,7 @@ class API_Network_Element(Resource):
return api_helper.net_modify( return api_helper.net_modify(
reqargs.get('description', None), reqargs.get('description', None),
reqargs.get('domain', None), reqargs.get('domain', None),
reqargs.get('name_servers', None).split(','), reqargs.get('name_servers', None),
reqargs.get('ip4_network', None), reqargs.get('ip4_network', None),
reqargs.get('ip4_gateway', None), reqargs.get('ip4_gateway', None),
reqargs.get('ip6_network', None), reqargs.get('ip6_network', None),