Move machine class into an own file

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/machine.py b/machine.py
new file mode 100644 (file)
index 0000000..035c010
--- /dev/null
+++ b/machine.py
@@ -0,0 +1,122 @@
+#!/usr/bin/python3
+
+import xml.etree.ElementTree as ET
+
+from disk import disk
+
+from serial_connection import serial_connection
+
+from test import libvirt_con
+
+import os
+import libvirt
+
+
+class machine():
+    def __init__(self, vm_xml_file, snapshot_xml_file, image, root_uid, username, password):
+        self.log = log(4)
+        self.con = libvirt_con("qemu:///system")
+        try:
+            with open(vm_xml_file) as fobj:
+                self.vm_xml = fobj.read()
+        except FileNotFoundError as error:
+            self.log.error("No such file: {}".format(vm_xml_file))
+
+        try:
+            with open(snapshot_xml_file) as fobj:
+                self.snapshot_xml = fobj.read()
+        except FileNotFoundError as error:
+            self.log.error("No such file: {}".format(snapshot_xml_file))
+
+        self.image = image
+
+        if not os.path.isfile(self.image):
+            self.log.error("No such file: {}".format(self.image))
+
+        self.root_uid = root_uid
+        self.disk = disk(image)
+
+        self.username = username
+        self.password = password
+
+    def define(self):
+        self.dom = self.con.con.defineXML(self.vm_xml)
+        if self.dom == None:
+            self.log.error("Could not define VM")
+            raise BaseException
+
+    def start(self):
+        if self.dom.create() < 0:
+            self.log.error("Could not start VM")
+            raise BaseException
+
+    def shutdown(self):
+        if self.is_running():
+            if self.dom.shutdown() < 0:
+                self.log.error("Could not shutdown VM")
+                raise BaseException
+        else:
+            self.log.error("Domain is not running")
+
+    def undefine(self):
+        self.dom.undefine()
+
+    def create_snapshot(self):
+
+        self.snapshot = self.dom.snapshotCreateXML(self.snapshot_xml)
+
+        if not self.snapshot:
+            self.log.error("Could not create snapshot")
+            raise BaseException
+
+    def revert_snapshot(self):
+        self.dom.revertToSnapshot(self.snapshot)
+        self.snapshot.delete()
+
+    def is_running(self):
+
+        state, reason = self.dom.state()
+
+        if state == libvirt.VIR_DOMAIN_RUNNING:
+            return True
+        else:
+            return False
+
+    def get_serial_device(self):
+
+        if not self.is_running():
+            raise BaseException
+
+        xml_root = ET.fromstring(self.dom.XMLDesc(0))
+
+        elem = xml_root.find("./devices/serial/source")
+        return elem.get("path")
+
+    def check_is_booted_up(self):
+        serial_con = serial_connection(self.get_serial_device())
+
+        serial_con.write("\n")
+        # This will block till the domain is booted up
+        serial_con.read(1)
+
+        #serial_con.close()
+
+    def login(self):
+        try:
+            self.serial_con = serial_connection(self.get_serial_device(), username=self.username)
+            self.serial_con.login(self.password)
+        except BaseException as e:
+            self.log.error("Could not connect to the domain via serial console")
+
+    def cmd(self, cmd):
+        return self.serial_con.command(cmd)
+
+    def copy_in(self, fr, to):
+        try:
+            self.disk.mount(self.root_uid, "/")
+            self.disk.copy_in(fr, to)
+        except BaseException as e:
+            self.log.error(e)
+        finally:
+            self.disk.umount("/")
+            self.disk.close()
\ No newline at end of file

diff --git a/test.py b/test.py
index b0385d3448060ee18cc06b08c7ecf58ea984dd88..36d5277e4acb223539ab7b54b7482dac93cf642d 100755 (executable)
--- a/test.py
+++ b/test.py
@@ -3,8 +3,6 @@
 
 import libvirt
 
 
 import libvirt
 

-import xml.etree.ElementTree as ET
-

 import os
 
 import configparser
 import os
 
 import configparser


@@ -49,116 +47,6 @@ class libvirt_con():
         return self.connection
 
 
         return self.connection
 
 

-class machine():
-    def __init__(self, vm_xml_file, snapshot_xml_file, image, root_uid, username, password):
-        self.log = log(4)
-        self.con = libvirt_con("qemu:///system")
-        try:
-            with open(vm_xml_file) as fobj:
-                self.vm_xml = fobj.read()
-        except FileNotFoundError as error:
-            self.log.error("No such file: {}".format(vm_xml_file))
-
-        try:
-            with open(snapshot_xml_file) as fobj:
-                self.snapshot_xml = fobj.read()
-        except FileNotFoundError as error:
-            self.log.error("No such file: {}".format(snapshot_xml_file))
-
-        self.image = image
-
-        if not os.path.isfile(self.image):
-            self.log.error("No such file: {}".format(self.image))
-
-        self.root_uid = root_uid
-        self.disk = disk(image)
-
-        self.username = username
-        self.password = password
-
-    def define(self):
-        self.dom = self.con.con.defineXML(self.vm_xml)
-        if self.dom == None:
-            self.log.error("Could not define VM")
-            raise BaseException
-
-    def start(self):
-        if self.dom.create() < 0:
-            self.log.error("Could not start VM")
-            raise BaseException
-
-    def shutdown(self):
-        if self.is_running():
-            if self.dom.shutdown() < 0:
-                self.log.error("Could not shutdown VM")
-                raise BaseException
-        else:
-            self.log.error("Domain is not running")
-
-    def undefine(self):
-        self.dom.undefine()
-
-    def create_snapshot(self):
-
-        self.snapshot = self.dom.snapshotCreateXML(self.snapshot_xml)
-
-        if not self.snapshot:
-            self.log.error("Could not create snapshot")
-            raise BaseException
-
-    def revert_snapshot(self):
-        self.dom.revertToSnapshot(self.snapshot)
-        self.snapshot.delete()
-
-    def is_running(self):
-
-        state, reason = self.dom.state()
-
-        if state == libvirt.VIR_DOMAIN_RUNNING:
-            return True
-        else:
-            return False
-
-    def get_serial_device(self):
-
-        if not self.is_running():
-            raise BaseException
-
-        xml_root = ET.fromstring(self.dom.XMLDesc(0))
-
-        elem = xml_root.find("./devices/serial/source")
-        return elem.get("path")
-
-    def check_is_booted_up(self):
-        serial_con = serial_connection(self.get_serial_device())
-
-        serial_con.write("\n")
-        # This will block till the domain is booted up
-        serial_con.read(1)
-
-        #serial_con.close()
-
-    def login(self):
-        try:
-            self.serial_con = serial_connection(self.get_serial_device(), username=self.username)
-            self.serial_con.login(self.password)
-        except BaseException as e:
-            self.log.error("Could not connect to the domain via serial console")
-
-    def cmd(self, cmd):
-        return self.serial_con.command(cmd)
-
-    def copy_in(self, fr, to):
-        try:
-            self.disk.mount(self.root_uid, "/")
-            self.disk.copy_in(fr, to)
-        except BaseException as e:
-            self.log.error(e)
-        finally:
-            self.disk.umount("/")
-            self.disk.close()
-
-

 
 # A class which define and undefine a virtual network based on an xml file
 class network():
 
 # A class which define and undefine a virtual network based on an xml file
 class network():