Refactor of code to allow several virt techs. Minor bugs. Closes #8.

[nodemanager.git] / sliver_lxc.py

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 81af037..e68a0b4 100644 (file)
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -6,94 +6,74 @@ import accounts
 import logger
 import subprocess
 import os
+import libvirt
+import sys
+from string import Template
+import sliver_libvirt as lv
+
+URI = 'lxc://'
 
 class Sliver_LXC(accounts.Account):
     """This class wraps LXC commands"""
-
-    SHELL = '/bin/sh' 
-    # Using /bin/bash triggers destroy root/site_admin (?!?)
+   
+    SHELL = '/bin/sshsh' 
+    
     TYPE = 'sliver.LXC'
     # Need to add a tag at myplc to actually use this account
     # type = 'sliver.LXC'
 
+
+    @staticmethod
+    def create(name, rec=None):
+        conn = lv.getConnection(URI)
+        
+        # Template for libvirt sliver configuration
+        try:
+            with open('/vservers/.lvref/config_template.xml') as f:
+                template = Template(f.read())
+                config   = template.substitute(name=name)
+        except IOError:
+            logger.log('Cannot find XML template file')
+            return
+        
+        lv.create(name, config, rec, conn)
+
+    @staticmethod
+    def destroy(name):
+        conn = lv.getConnection(URI)
+        lv.destroy(name, conn)
+
     def __init__(self, rec):
         self.name = rec['name']
-        print "LXC __init__ %s"%(self.name)
-        logger.verbose ('sliver_lxc: %s init'%self.name)
-    
+        logger.verbose ('sliver_lxc: %s init'%(self.name))
+         
         self.dir = '/vservers/%s'%(self.name)
         
         # Assume the directory with the image and config files
         # are in place
         
-        self.config = '%s/config'%(self.dir)
-        self.fstab  = '%s/fstab'%(self.dir)
-        self.lxc_log  = '%s/lxc.log'%(self.dir)
         self.keys = ''
         self.rspec = {}
         self.slice_id = rec['slice_id']
         self.disk_usage_initialized = False
         self.initscript = ''
         self.enabled = True
-        self.configure(rec)
-
-    @staticmethod
-    def create(name, rec = None):
-        ''' Create dirs, copy fs image, lxc_create '''
-        print "LXC create %s"%(name)
-        logger.verbose ('sliver_lxc: %s create'%name)
-        dir = '/vservers/%s'%(name)
-        config = '%s/config'%(dir)
-        lxc_log = '%s/lxc.log'%(dir)
-        
-        if not (os.path.isdir(dir) and 
-            os.access(dir, os.R_OK | os.W_OK | os.X_OK)):
-            print 'lxc_create: directory %s does not exist or wrong perms'%(dir)
-            return
-        # Assume for now that the directory is there and with a FS
-        command=[]
-        # be verbose
-        command += ['/bin/bash','-x',]
-        command += ['/usr/bin/lxc-create', '-n', name, '-f', config, '&']
-        print command
-        subprocess.call(command, stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=False)
-        
-    @staticmethod
-    def destroy(name):
-        ''' lxc_destroy '''
-        print "LXC destroy %s"%(name)
-        dir = '/vservers/%s'%(name)
-        lxc_log = '%s/lxc.log'%(dir)
-        command=[]
-        command += ['/usr/bin/lxc-destroy', '-n', name]
-
-        subprocess.call(command, stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=False)
-        print "LXC destroy DONE"
-
-    def configure(self, rec):
-        print "LXC configure %s"%(self.name) 
+        self.conn = lv.getConnection(URI)
+        try:
+            self.container = self.conn.lookupByName(self.name)
+        except:
+            logger.verbose('sliver_libvirt: Unexpected error on %s: %s'%(self.name, sys.exc_info()[0]))
 
     def start(self, delay=0):
-        ''' Check existence? lxc_start '''
-        print "LXC start %s"%(self.name)
-        command=[]
-        command += ['/usr/bin/lxc-start', '-n', self.name, '-d']
-        print command
-        subprocess.call(command, stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=False)
+        lv.start(self.container)
 
     def stop(self):
-        ''' lxc_stop '''
-        print "LXC stop %s"%(self.name)
-    
+        lv.stop(self.container)
+
     def is_running(self):
-        print "LXC is_running %s"%(self.name)
-        command = []
-        command += ['/usr/bin/lxc-info -n %s'%(self.name)]
-        print command
-        p = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-        state = p.communicate()[0].split(' ')[2]
-        print state
-        if state == 'RUNNING': return True
-        else: return False
+        lv.is_running(self.container)
 
-  
+    def configure(self, rec):
+        ''' Allocate resources and fancy configuration stuff '''
+        logger.verbose('sliver_libvirt: %s configure'%(self.name))
+        accounts.Account.configure(self, rec)