machine: Improve log messages and stop process of a machine

[nitsi.git] / src / nitsi / machine.py

diff --git a/src/nitsi/machine.py b/src/nitsi/machine.py
index 4e60323a159420531cbf1e652a6d34040a3bbacd..3e97ecff1bce985fd96a930a81984b34a870d1ab 100644 (file)
--- a/src/nitsi/machine.py
+++ b/src/nitsi/machine.py
@@ -5,8 +5,8 @@ import logging
 import os
 import xml.etree.ElementTree as ET
 
-from .disk import disk
-from .serial_connection import serial_connection
+from . import disk
+from . import serial_connection
 
 logger = logging.getLogger("nitsi.machine")
 
@@ -14,6 +14,12 @@ class machine():
     def __init__(self, libvirt_con, vm_xml_file, snapshot_xml_file, image, root_uid, username, password):
         self.log = logger.getChild(os.path.basename(vm_xml_file))
         self.con = libvirt_con
+        # self.dom should be always defined
+        self.dom = None
+        # self.snapshot should be also at least None
+        self.snapshot = None
+
+
         try:
             with open(vm_xml_file) as fobj:
                 self.vm_xml = fobj.read()
@@ -41,46 +47,62 @@ class machine():
             self.log.error("No such file: {}".format(self.image))
 
         self.root_uid = root_uid
-        self.disk = disk(image)
+        self.disk = disk.disk(image)
 
         self.username = username
         self.password = password
 
     def define(self):
+        self.log.info("Defining virtual machine")
         self.dom = self.con.defineXML(self.vm_xml)
         if self.dom == None:
             self.log.error("Could not define VM")
             raise BaseException
 
     def start(self):
+        self.log.info("Starting virtual machine")
         if self.dom.create() < 0:
             self.log.error("Could not start VM")
             raise BaseException
 
     def shutdown(self):
         if self.is_running():
+            self.log.info("Shutting down virtual machine")
             if self.dom.shutdown() < 0:
                 self.log.error("Could not shutdown VM")
                 raise BaseException
         else:
-            self.log.error("Domain is not running")
+            self.log.warn("Cannot shutdown a not running domain")
 
     def undefine(self):
-        self.dom.undefine()
+        # We cannot undefine a not defined dom object
+        if self.dom != None:
+            self.log.info("Undefining virtual machine")
+            self.dom.undefine()
+        else:
+            self.log.warn("Cannot undefine a not defined domain")
 
     def create_snapshot(self):
-
+        self.log.info("Creating snapshot of virtual machine")
         self.snapshot = self.dom.snapshotCreateXML(self.snapshot_xml)
 
-        if not self.snapshot:
+        if self.snapshot == None:
             self.log.error("Could not create snapshot")
             raise BaseException
 
     def revert_snapshot(self):
-        self.dom.revertToSnapshot(self.snapshot)
-        self.snapshot.delete()
+        if self.snapshot != None:
+            self.log.info("Reverting snapshot")
+            self.dom.revertToSnapshot(self.snapshot)
+            self.log.info("Deleting snapshot")
+            self.snapshot.delete()
+        else:
+            self.log.warn("No active snapshot. Cannot revert and delete snapshot")
 
     def is_running(self):
+        # Only if we have a valid dom object we can check the dom state
+        if self.dom == None:
+            return False
 
         state, reason = self.dom.state()
 
@@ -106,7 +128,7 @@ class machine():
         return elem.text
 
     def check_is_booted_up(self):
-        serial_con = serial_connection(self.get_serial_device())
+        serial_con = serial_connection.serial_connection(self.get_serial_device())
 
         serial_con.write("\n")
         # This will block till the domain is booted up
@@ -116,7 +138,7 @@ class machine():
 
     def login(self, log_file, log_start_time=None, longest_machine_name=10):
         try:
-            self.serial_con = serial_connection(self.get_serial_device(),
+            self.serial_con = serial_connection.serial_connection(self.get_serial_device(),
                                 username=self.username,
                                 log_file=log_file,
                                 log_start_time=log_start_time,