various improvements

node_agent/utils/vmctl.py

@@ -17,6 +17,7 @@ import sys
 import pathlib
 import logging
 
+import libvirt
 from docopt import docopt
 
 sys.path.append('/home/ge/Code/node-agent')
@@ -38,13 +39,14 @@ def cli():
     args = docopt(__doc__)
     config = pathlib.Path(args['--config']) or None
     loglvl = args['--loglvl'].upper()
+    machine = args['<machine>']
 
     if loglvl in levels:
         logging.basicConfig(level=levels[loglvl])
 
     with LibvirtSession(config) as session:
         try:
-            vm = VirtualMachine(session, args['<machine>'])
+            vm = VirtualMachine(session, machine)
             if args['status']:
                 print(vm.status)
             if args['is-running']:
@@ -58,7 +60,7 @@ def cli():
             if args['shutdown']:
                 vm.shutdown(force=args['--force'], sigkill=args['sigkill'])
         except VMNotFound as nferr:
-            sys.exit(f'{Color.RED}VM {args["<machine>"]} not found.{Color.NONE}')
+            sys.exit(f'{Color.RED}VM {machine} not found.{Color.NONE}')
         except VMError as vmerr:
             sys.exit(f'{Color.RED}{vmerr}{Color.NONE}')
 

node_agent/utils/vmexec.py

@@ -35,6 +35,7 @@ def cli():
     args = docopt(__doc__)
     config = pathlib.Path(args['--config']) or None
     loglvl = args['--loglvl'].upper()
+    machine = args['<machine>']
 
     if loglvl in levels:
         logging.basicConfig(level=levels[loglvl])
@@ -44,7 +45,7 @@ def cli():
         cmd = args['<command>']
 
         try:
-            ga = QemuAgent(session, args['<machine>'])
+            ga = QemuAgent(session, machine)
             exited, exitcode, stdout, stderr = ga.shellexec(
                 cmd,
                 executable=shell,
@@ -63,14 +64,15 @@ def cli():
             sys.exit(errmsg)
         except VMNotFound as err:
             sys.exit(
-                f'{Color.RED}VM {args["<machine>"]} not found.{Color.NONE}'
+                f'{Color.RED}VM {machine} not found.{Color.NONE}'
             )
 
     if not exited:
         print(
             Color.YELLOW
             +'[NOTE: command may still running]'
-            + Color.NONE
+            + Color.NONE,
+            file=sys.stderr
         )
     else:
         if exitcode == 0:
@@ -80,13 +82,14 @@ def cli():
         print(
             exitcolor
             + f'[command exited with exit code {exitcode}]'
-            + Color.NONE
+            + Color.NONE,
+            file=sys.stderr
         )
 
     if stderr:
-        print(Color.RED + stderr.strip() + Color.NONE)
+        print(Color.RED + stderr.strip() + Color.NONE, file=sys.stderr)
     if stdout:
-        print(Color.GREEN + stdout.strip() + Color.NONE)
+        print(Color.GREEN + stdout.strip() + Color.NONE, file=sys.stdout)
 
 if __name__ == '__main__':
     cli()