Merge branch 'mhicks'

1 files changed, 36 insertions, 0 deletions

diff --git a/func/minion/modules/virt.py b/func/minion/modules/virt.py
index ba5759e..2c68ab4 100644
--- a/func/minion/modules/virt.py
+++ b/func/minion/modules/virt.py
@@ -122,6 +122,9 @@ class FuncLibvirtConnection(object):
     def nodeinfo(self):
         return self.conn.getInfo()
 
+    def get_type(self):
+        return self.conn.getType()
+
 
 class Virt(func_module.FuncModule):
 
@@ -184,6 +187,39 @@ class Virt(func_module.FuncModule):
                 pass
         return results
 
+    def virttype(self):
+	return self.__get_conn().get_type()
+
+    def autostart(self, vm):
+	self.conn = self.__get_conn()
+	if self.conn.get_type() == "Xen":
+	    autostart_args = [
+		"/bin/ln",
+		"-s",
+		"/etc/xen/%s" % vm,
+		"/etc/xen/auto"
+	    ]
+        else:
+            # When using KVM, we need to make sure the autostart
+            # directory exists
+	    mkdir_args = [
+		"/bin/mkdir",
+		"-p",
+		"/etc/libvirt/qemu/autostart"
+	    ]
+            sub_process.call(mkdir_args,shell=False,close_fds=True)
+
+            # We aren't using virsh autostart because we want
+            # the command to work even when the VM isn't running
+	    autostart_args = [
+		"/bin/ln",
+		"-s",
+		"/etc/libvirt/qemu/%s.xml" % vm,
+		"/etc/libvirt/qemu/autostart/%s.xml" % vm
+	    ]
+
+        return sub_process.call(autostart_args,shell=False,close_fds=True)
+
     def freemem(self):
         self.conn = self.__get_conn()
         # Start with the physical memory and subtract