Remove gratuitous long_output
This commit is contained in:
parent
54541c991c
commit
97cd90ce88
|
@ -672,10 +672,6 @@ def net_remove(net):
|
||||||
@click.argument(
|
@click.argument(
|
||||||
'vni'
|
'vni'
|
||||||
)
|
)
|
||||||
@click.option(
|
|
||||||
'-l', '--long', 'long_output', is_flag=True, default=False,
|
|
||||||
help='Display more detailed information.'
|
|
||||||
)
|
|
||||||
def net_info(vni, long_output):
|
def net_info(vni, long_output):
|
||||||
"""
|
"""
|
||||||
Show information about virtual network VNI.
|
Show information about virtual network VNI.
|
||||||
|
@ -683,7 +679,7 @@ def net_info(vni, long_output):
|
||||||
|
|
||||||
# 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, long_output)
|
retcode, retmsg = pvc_network.get_info(zk_conn, vni)
|
||||||
cleanup(retcode, retmsg, zk_conn)
|
cleanup(retcode, retmsg, zk_conn)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
|
@ -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, long_output):
|
def get_info(zk_conn, network):
|
||||||
# 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, long_output)
|
information = getNetworkInformation(zk_conn, net_vni)
|
||||||
click.echo(information)
|
click.echo(information)
|
||||||
click.echo('')
|
click.echo('')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue