tcf/get: move command implementation to new API

Shall be more scalable for big deployments

Author: inaky-intc

tcf

@@ -101,22 +101,6 @@ servers: {len(tcfl.ttb_client.rest_target_brokers)}""")
 
 
 
-def _target_get(args):
-    # pure target get w/o going through the cache
-
-    if args.projection:
-        data = { 'projections': json.dumps(args.projection) }
-    else:
-        data = None
-    rtb, rt = ttb_client._rest_target_find_by_id(args.target)
-    r = rtb.send_request("GET", "targets/" + rt['id'], data = data,
-                         raw = True)
-    # Keep the order -- even if json spec doesn't contemplate it, we
-    # use it so the client can tell (if they want) the order in which
-    # for example, power rail components are defined in interfaces.power
-    rt = json.loads(r.text, object_pairs_hook = collections.OrderedDict)
-    print(json.dumps(rt, skipkeys = True, indent = 4))
-
 def _target_patch(args):
     # set data
     data = collections.OrderedDict()	# respect user's order
@@ -448,18 +432,7 @@ if __name__ == "__main__":
 
     # Semi advanced commands
 
-    ap = arg_subparsers.add_parser(
-        "get", help = "Return target information straight from the "
-        "server formated as JSON (unlike 'list', which will add some "
-        "client fields)")
-    ap.add_argument(
-        "-p", "--projection", action = "append",
-        help = "List of fields to return (*? [CHARS] or [!CHARS] supported)"
-        " as per python's fnmatch module")
-    ap.add_argument("target", metavar = "TARGET", action = "store",
-                    default = None, help = "Target's name")
-    ap.set_defaults(func = _target_get)
-
+    tcfl.ui_cli_targets._cmdline_setup_advanced(arg_subparsers)
 
     ap = arg_subparsers.add_parser("property-set",
                                    help = "Set a target's property")

tcfl/ui_cli_targets.py

@@ -20,17 +20,19 @@
 
 """
 
+import argparse
+import json
 import logging
 import math
 import os
 import sys
 
 import commonl
+import tcfl.ui_cli
 
 logger = logging.getLogger("ui_cli_testcases")
 
 
-
 def _cmdline_targets_init(args):
     # initialize reporting based on what the commandline wants
 
@@ -51,6 +53,24 @@ def _cmdline_targets_init(args):
 
 
 
+def _cmdline_target_get(cli_args: argparse.Namespace):
+
+    def _target_get(target, _cli_args):
+        projections = cli_args.project
+        server = tcfl.server_c.servers[target.rt['server']]
+        rt = server.targets_get(target_id = target.id,
+                                projections = cli_args.project)
+        # rt is a list of dicts keyed by fullid, we care only for the first
+        json.dump(rt[0][target.fullid], sys.stdout, indent = 4)
+
+    return tcfl.ui_cli.run_fn_on_each_targetspec(
+        # note we scan ignoring --projections, since that we'll use
+        # later; we want to identify the target to get as soon as
+        # possible and then in _target_get() we do the stuff
+        _target_get, cli_args, only_one = True)
+
+
+
 def _targets_list_v0_table(l):
 
     if not l:		# avoid divide by zero errors
@@ -211,3 +231,19 @@ def _cmdline_setup(arg_subparsers):
         help = "consider only the given fields "
         "(default depends on verbosity")
     ap.set_defaults(func = _cmdline_ls)
+
+
+
+def _cmdline_setup_advanced(arg_subparsers):
+    ap = arg_subparsers.add_parser(
+        "get", help = "Return target information straight from the "
+        "server formated as JSON (unlike 'ls', which will add some "
+        "client fields)")
+    tcfl.ui_cli.args_verbosity_add(ap)
+    tcfl.ui_cli.args_targetspec_add(ap, targetspec_n = 1)
+    ap.add_argument(
+        "-p", "--project", "--projection", metavar = "FIELD",
+        action = "append", type = str,
+        help = "consider only the given fields "
+        "(default depends on verbosity")
+    ap.set_defaults(func = _cmdline_target_get)