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

Revert "Remove gratuitous long_output" 

This reverts commit 97cd90ce88.
This commit is contained in:
Joshua Boniface 2018-09-25 01:32:03 -04:00
parent 03f0600ea3
commit 98d9c4d70b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli-client/pvc.py
View File

@ -672,14 +672,18 @@ def net_remove(net):
@click.argument( @click.argument(
'vni' 'vni'
) )
def net_info(vni): @click.option(
'-l', '--long', 'long_output', is_flag=True, default=False,
help='Display more detailed information.'
)
def net_info(vni, long_output):
""" """
Show information about virtual network VNI. Show information about virtual network VNI.
""" """
# Open a Zookeeper connection # Open a Zookeeper connection
zk_conn = pvc_common.startZKConnection(zk_host) zk_conn = pvc_common.startZKConnection(zk_host)
retcode, retmsg = pvc_network.get_info(zk_conn, vni) retcode, retmsg = pvc_network.get_info(zk_conn, vni, long_output)
cleanup(retcode, retmsg, zk_conn) cleanup(retcode, retmsg, zk_conn)
############################################################################### ###############################################################################

4
client-common/client_lib/network.py
View File

@ -201,13 +201,13 @@ def remove_network(zk_conn, network):
return True, 'Network "{}" removed successfully!'.format(description) return True, 'Network "{}" removed successfully!'.format(description)
def get_info(zk_conn, network): def get_info(zk_conn, network, long_output):
# Validate and obtain alternate passed value # Validate and obtain alternate passed value
net_vni = getNetworkVNI(zk_conn, network) net_vni = getNetworkVNI(zk_conn, network)
if net_vni == None: if net_vni == None:
return False, 'ERROR: Could not find network "{}" in the cluster!'.format(network) return False, 'ERROR: Could not find network "{}" in the cluster!'.format(network)
information = getNetworkInformation(zk_conn, net_vni) information = getNetworkInformation(zk_conn, net_vni, long_output)
click.echo(information) click.echo(information)
click.echo('') click.echo('')