ceph.in/ceph_argparse.py: move find_cmd_target() to ceph_argparse.py

Signed-off-by: Dan Mick <dan.mick@inktank.com>

diff --git a/src/ceph.in b/src/ceph.in
index dbb7fb5a8cdc5853fade366da340197fb4b48587..27d96f46355ec4b604bfd0ec6a827a5381fccdda 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -389,34 +389,6 @@ PGID_MATCH = { \
     'return_key': 'pgid', \
 }
 
-def find_cmd_target(childargs):
-    """
-    Using a minimal validation, figure out whether the command
-    should be sent to a monitor or an osd.  We do this before even
-    asking for the 'real' set of command signatures, so we can ask the
-    right daemon.
-    Returns ('osd', osdid), ('pg', pgid), or ('mon', '')
-    """
-    sig = parse_funcsig(['tell', {'name':'target','type':'CephName'}])
-    try:
-        valid_dict = validate(childargs, sig, partial=True);
-        if len(valid_dict) == 2:
-            name = CephName()
-            name.valid(valid_dict['target'])
-            return name.nametype, name.nameid
-    except ArgumentError:
-        pass
-
-    sig = parse_funcsig(['pg', {'name':'pgid','type':'CephPgid'}])
-    try:
-        valid_dict = validate(childargs, sig, partial=True);
-        if len(valid_dict) == 2:
-            return 'pg', valid_dict['pgid']
-    except ArgumentError:
-        pass
-
-    return 'mon', ''
-
 def complete(sigdict, args, target):
     """
     Command completion.  Match as much of [args] as possible,

diff --git a/src/pybind/ceph_argparse.py b/src/pybind/ceph_argparse.py
index 72b36dd50a53654a8c338538c6a210cec7c17f5c..907d2ec2b33f824075f385f49ad1cbd2527a9d74 100644 (file)
--- a/src/pybind/ceph_argparse.py
+++ b/src/pybind/ceph_argparse.py
@@ -887,6 +887,34 @@ def validate_command(parsed_args, sigdict, args, verbose=False):
 
         return valid_dict
 
+def find_cmd_target(childargs):
+    """
+    Using a minimal validation, figure out whether the command
+    should be sent to a monitor or an osd.  We do this before even
+    asking for the 'real' set of command signatures, so we can ask the
+    right daemon.
+    Returns ('osd', osdid), ('pg', pgid), or ('mon', '')
+    """
+    sig = parse_funcsig(['tell', {'name':'target','type':'CephName'}])
+    try:
+        valid_dict = validate(childargs, sig, partial=True);
+        if len(valid_dict) == 2:
+            name = CephName()
+            name.valid(valid_dict['target'])
+            return name.nametype, name.nameid
+    except ArgumentError:
+        pass
+
+    sig = parse_funcsig(['pg', {'name':'pgid','type':'CephPgid'}])
+    try:
+        valid_dict = validate(childargs, sig, partial=True);
+        if len(valid_dict) == 2:
+            return 'pg', valid_dict['pgid']
+    except ArgumentError:
+        pass
+
+    return 'mon', ''
+
 def send_command(cluster, target=('mon', ''), cmd=[], inbuf='', timeout=0, 
                  verbose=False):
     """