some minor glitch cleanup in device_control, and adding logging to

abowersox-cb · abowersox-cb · commit f3750817dcb0 · 2019-12-03T15:42:29.000-07:00
download_device_list (this is increasingly looking like a server bug)
diff --git a/examples/psc/device_control.py b/examples/psc/device_control.py
@@ -14,55 +14,57 @@ def toggle_value(args):
 def main():
     parser = build_cli_parser("Send control messages to device")
     parser.add_argument("-d", "--device_id", type=int, required=True, help="The ID of the device to be controlled")
-    subparsers = parser.add_subparsers(required=True, dest="command", help="Device command help")
+    subparsers = parser.add_subparsers(dest="command", help="Device command help")
     
     bgscan_p = subparsers.add_parser("background_scan", help="Set background scanning status")
     toggle = bgscan_p.add_mutually_exclusive_group(required=True)
-    group.add_argument("--on", action="store_true", help="Turn background scanning on")
-    group.add_argument("--off", action="store_true", help="Turn background scanning off")    
+    toggle.add_argument("--on", action="store_true", help="Turn background scanning on")
+    toggle.add_argument("--off", action="store_true", help="Turn background scanning off")    
     
     bypass_p = subparsers.add_parser("bypass", help="Set bypass mode")
     toggle = bypass_p.add_mutually_exclusive_group(required=True)
-    group.add_argument("--on", action="store_true", help="Enable bypass mode")
-    group.add_argument("--off", action="store_true", help="Disable bypass mode")
+    toggle.add_argument("--on", action="store_true", help="Enable bypass mode")
+    toggle.add_argument("--off", action="store_true", help="Disable bypass mode")
     
     subparsers.add_parser("delete", help="Delete sensor")
     subparsers.add_parser("uninstall", help="Uninstall sensor")
     
     quarantine_p = subparsers.add_parser("quarantine", help="Set quarantine mode")
     toggle = quarantine_p.add_mutually_exclusive_group(required=True)
-    group.add_argument("--on", action="store_true", help="Enable quarantine mode")
-    group.add_argument("--off", action="store_true", help="Disable quarantine mode")
+    toggle.add_argument("--on", action="store_true", help="Enable quarantine mode")
+    toggle.add_argument("--off", action="store_true", help="Disable quarantine mode")
     
     policy_p = subparsers.add_parser("policy", help="Update policy for node")
     policy_p.add_argument("-p", "--policy_id", type=int, required=True, help="New policy ID to set for node")
     
-    sensorv_p = subparses_parser("sensor_version", help="Update sensor version for node")
+    sensorv_p = subparsers.add_parser("sensor_version", help="Update sensor version for node")
     sensorv_p.add_argument("-o", "--os", required=True, help="Operating system for sensor")
     sensorv_p.add_argument("-V", "--version", required=True, help="Version number of sensor")
     
     args = parser.parse_args()
     cb = get_cb_psc_object(args)
     dev = cb.get_device(args.device_id)
     
-    if args.command == "background_scan":
-        dev.background_scan(toggle_value(args))
-    elif args.command == "bypass":
-        dev.bypass(toggle_value(args))
-    elif args.command == "delete":
-        dev.delete_sensor()
-    elif args.command == "uninstall":
-        dev.uninstall_sensor()
-    elif args.command == "quarantine":
-        dev.quarantine(toggle_value(args))
-    elif args.command == "policy":
-        dev.update_policy(args.policy_id)
-    elif args.command == "sensor_version":
-        dev.update_sensor_version({args.os: args.version})
+    if args.command:
+        if args.command == "background_scan":
+            dev.background_scan(toggle_value(args))
+        elif args.command == "bypass":
+            dev.bypass(toggle_value(args))
+        elif args.command == "delete":
+            dev.delete_sensor()
+        elif args.command == "uninstall":
+            dev.uninstall_sensor()
+        elif args.command == "quarantine":
+            dev.quarantine(toggle_value(args))
+        elif args.command == "policy":
+            dev.update_policy(args.policy_id)
+        elif args.command == "sensor_version":
+            dev.update_sensor_version({args.os: args.version})
+        else:
+            raise NotImplementedError("Unknown command")
+        print("OK")
     else:
-        raise NotImplementedError("Unknown command")
-    print("OK")
-    
+        print(dev)
     
 if __name__ == "__main__":
     sys.exit(main())
diff --git a/examples/psc/download_device_list.py b/examples/psc/download_device_list.py
@@ -4,6 +4,9 @@
 from cbapi.example_helpers import build_cli_parser, get_cb_psc_object
 from cbapi.psc import Device
 
+import logging
+logging.basicConfig(level=logging.DEBUG)    
+
 def main():
     parser = build_cli_parser("Download device list in CSV format")
     parser.add_argument("-q", "--query", help="Query string for looking for devices")
