Minor changes

1 files changed, 31 insertions, 6 deletions

diff --git a/clusterman/__main__.py b/clusterman/__main__.py
index 8f3c416..4980427 100644
--- a/clusterman/__main__.py
+++ b/clusterman/__main__.py
@@ -4,10 +4,22 @@ from  clusterman.commands import node
 
 def main():
     parser = argparse.ArgumentParser()
-    subparsers = parser.add_subparsers(dest="command", help='Target')
-    cmd_node = subparsers.add_parser("node")
-    cmd_frontend = subparsers.add_parser("frontend")
+    subparsers = parser.add_subparsers(dest="target", help='Target')
+
+    ##### Node commands #####
+    target_node = subparsers.add_parser("node")
+    node_subparsers=target_node.add_subparsers(dest="command", help='Command')
+    # Scan
+    node_cmd_scan=node_subparsers.add_parser("scan")
+    node_cmd_scan.add_argument("-t", "--timeout" ,help="Timeout", type=float)
+    # Check
+    node_cmd_scan=node_subparsers.add_parser("check")
+    node_cmd_scan.add_argument("-t", "--timeout" ,help="Timeout", type=float)
+    
+    ##### Frontend commands #####
+    target_frontend = subparsers.add_parser("frontend")
 
+    
     # Check if command specified:
     if len(sys.argv)==1:
         parser.print_help(sys.stderr)
@@ -16,11 +28,24 @@ def main():
     args = parser.parse_args()
 
     # Run the proper handler
-    if args.command == "node":
+    if args.target == "node":
         print("Do node related stuff")
         #node.scan("10.0.0.1","10.0.0.10")
-        node.check()
-    if args.command == "frontend":
+        if args.command == "scan":
+            if args.timeout:
+                node.scan(node_cmd_scan.timeout)
+            else:
+                node.scan(CONF["timeout"])
+        elif args.command == "check":
+            if args.timeout:
+                node.check(node_cmd_scan.timeout)
+            else:
+                node.check(CONF["timeout"])
+        else:
+            target_node.print_help(sys.stderr)
+            sys.exit(1)    
+        
+    if args.target == "frontend":
         print("Do frontend related stuff")