Update dependencies to use latest version of requests

[osm/osmclient.git] / osmclient / cli_commands / vim.py

diff --git a/osmclient/cli_commands/vim.py b/osmclient/cli_commands/vim.py
index b2a073d..2f7bbfc 100755 (executable)
--- a/osmclient/cli_commands/vim.py
+++ b/osmclient/cli_commands/vim.py
@@ -304,23 +304,15 @@ def vim_delete(ctx, name, force, wait):
     is_flag=True,
     help="get more details of the NS (project, vim, deployment status, configuration status.",
 )
-@click.option(
-    "-o",
-    default="table",
-    is_eager=True,
-    callback=print_output.validate_command_output,
-    help="get more details of the NS (project, vim, deployment status, configuration status.",
-)
+@print_output.output_option
 @click.pass_context
-def vim_list(ctx, filter, long, o):
+def vim_list(ctx, filter, long, output):
     """list all VIM accounts"""
     logger.debug("")
     if filter:
         filter = "&".join(filter)
         utils.check_client_version(ctx.obj, "--filter")
-    fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
-    if fullclassname == "osmclient.sol005.client.Client":
-        resp = ctx.obj.vim.list(filter)
+    resp = ctx.obj.vim.list(filter)
     if long:
         table = PrettyTable(
             ["vim name", "uuid", "project", "operational state", "error details"]
@@ -355,9 +347,7 @@ def vim_list(ctx, filter, long, o):
             table.add_row(
                 [vim["name"], vim["uuid"], vim["_admin"].get("operationalState", "-")]
             )
-    table.align = "l"
-    # print(table)
-    print_output.print_output(o, table.field_names, table._rows)
+    print_output.print_output(output, table.field_names, table._rows)
 
 
 @click.command(name="vim-show", short_help="shows the details of a VIM account")
@@ -368,15 +358,9 @@ def vim_list(ctx, filter, long, o):
     help="restricts the information to the fields in the filter",
 )
 @click.option("--literal", is_flag=True, help="print literally, no pretty table")
-@click.option(
-    "-o",
-    default="table",
-    is_eager=True,
-    callback=print_output.validate_command_output,
-    help="adapt the output as table, yaml, csv, json, jsonpath",
-)
+@print_output.output_option
 @click.pass_context
-def vim_show(ctx, name, filter, literal, o):
+def vim_show(ctx, name, filter, literal, output):
     """shows the details of a VIM account
 
     NAME: name or ID of the VIM account
@@ -395,6 +379,4 @@ def vim_show(ctx, name, filter, literal, o):
     for k, v in list(resp.items()):
         if not filter or k in filter:
             table.add_row([k, utils.wrap_text(text=json.dumps(v, indent=2), width=100)])
-    table.align = "l"
-    # print(table)
-    print_output.print_output(o, table.field_names, table._rows)
+    print_output.print_output(output, table.field_names, table._rows)