review imports in sliver_{libvirt,lxc}

[nodemanager.git] / sliver_lxc.py

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 1b038d5..246c5f0 100644 (file)
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -2,17 +2,18 @@
 
 """LXC slivers"""
 
-import accounts
-import logger
 import subprocess
+import sys
 import os, os.path
+import grp
 import libvirt
-import sys
 from string import Template
+
+import logger
 import bwlimit
-import sliver_libvirt as lv
+from sliver_libvirt import Sliver_Libvirt
 
-class Sliver_LXC(lv.Sliver_Libvirt):
+class Sliver_LXC(Sliver_Libvirt):
     """This class wraps LXC commands"""
 
     SHELL = '/bin/sshsh'
@@ -27,7 +28,7 @@ class Sliver_LXC(lv.Sliver_Libvirt):
     def create(name, rec=None):
         ''' Create dirs, copy fs image, lxc_create '''
         logger.verbose ('sliver_lxc: %s create'%(name))
-        conn = lv.getConnection(Sliver_LXC.TYPE)
+        conn = Sliver_Libvirt.getConnection(Sliver_LXC.TYPE)
 
         # Get the type of image from vref myplc tags specified as:
         # pldistro = lxc
@@ -44,16 +45,23 @@ class Sliver_LXC(lv.Sliver_Libvirt):
         # check the template exists -- there's probably a better way..
         if not os.path.isdir(refImgDir):
             logger.log('sliver_lxc: %s: ERROR Could not create sliver - reference image %s not found' % (name,vref))
-            logger.log('sliver_lxc: %s: ERROR ctd expected reference image in %s'%(name,refImgDir))
+            logger.log('sliver_lxc: %s: ERROR Expected reference image in %s'%(name,refImgDir))
             return
 
         # Snapshot the reference image fs (assume the reference image is in its own
         # subvolume)
         command = ['btrfs', 'subvolume', 'snapshot', refImgDir, containerDir]
-        logger.log_call(command, timeout=15*60)
+        if not logger.log_call(command, timeout=15*60):
+            logger.log('sliver_lxc: ERROR Could not create BTRFS snapshot at', containDir)
+            return
         command = ['chmod', '755', containerDir]
         logger.log_call(command, timeout=15*60)
 
+        # customize prompt for slice owner
+        dot_profile=os.path.join(containerDir,"root/.profile")
+        with open(dot_profile,'w') as f:
+            f.write("export PS1='%s@\H \$ '\n"%(name))
+
         # TODO: set quotas...
 
         # Set hostname. A valid hostname cannot have '_'
@@ -61,8 +69,11 @@ class Sliver_LXC(lv.Sliver_Libvirt):
         #    print >>f, name.replace('_', '-')
 
         # Add slices group if not already present
-        command = ['/usr/sbin/groupadd', 'slices']
-        logger.log_call(command, timeout=15*60)
+        try:
+            group = grp.getgrnam('slices')
+        except:
+            command = ['/usr/sbin/groupadd', 'slices']
+            logger.log_call(command, timeout=15*60)
 
         # Add unix account (TYPE is specified in the subclass)
         command = ['/usr/sbin/useradd', '-g', 'slices', '-s', Sliver_LXC.SHELL, name, '-p', '*']
@@ -90,20 +101,12 @@ class Sliver_LXC(lv.Sliver_Libvirt):
         xid = bwlimit.get_xid(name)
 
         # Template for libvirt sliver configuration
-#        template_filename = Sliver_LXC.REF_IMG_BASE_DIR + '/lxc_template.xml'
-        # for compat with lxc-reference package, hopefully temporary
-        template_filename_lxcreference = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR,'config_template.xml')
         template_filename_sliceimage = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR,'lxc_template.xml')
-        if os.path.isfile (template_filename_lxcreference):
-            logger.log("WARNING: using compat template %s"%template_filename_lxcreference)
-            template_filename=template_filename_lxcreference
-        elif os.path.isfile (template_filename_sliceimage):
+        if os.path.isfile (template_filename_sliceimage):
             logger.log("WARNING: using compat template %s"%template_filename_sliceimage)
             template_filename=template_filename_sliceimage
         else:
-            logger.log("Cannot find XML template")
-            logger.log("neither %s"%template_filename_lxcreference)
-            logger.log("nor     %s"%template_filename_sliceimage)
+            logger.log("Cannot find XML template %s"%template_filename_sliceimage)
             return
         try:
             with open(template_filename) as f:
@@ -119,13 +122,13 @@ class Sliver_LXC(lv.Sliver_Libvirt):
             dom = conn.lookupByName(name)
         except:
             dom = conn.defineXML(xml)
-        logger.verbose('lxc_create: %s -> %s'%(name, lv.debuginfo(dom)))
+        logger.verbose('lxc_create: %s -> %s'%(name, Sliver_Libvirt.debuginfo(dom)))
 
 
     @staticmethod
     def destroy(name):
         logger.verbose ('sliver_lxc: %s destroy'%(name))
-        conn = lv.getConnection(Sliver_LXC.TYPE)
+        conn = Sliver_Libvirt.getConnection(Sliver_LXC.TYPE)
 
         containerDir = Sliver_LXC.CON_BASE_DIR + '/%s'%(name)
 
@@ -133,15 +136,17 @@ class Sliver_LXC(lv.Sliver_Libvirt):
             # Destroy libvirt domain
             dom = conn.lookupByName(name)
         except:
-            logger.verbose('sliver_lxc: Domain %s does not exist! UNEXPECTED'%name)
-            return
+            logger.verbose('sliver_lxc: Domain %s does not exist!' % name)
 
         try:
             dom.destroy()
         except:
-            logger.verbose('sliver_lxc: Domain %s not running... continuing.'%name)
+            logger.verbose('sliver_lxc: Domain %s not running... continuing.' % name)
 
-        dom.undefine()
+        try:
+            dom.undefine()
+        except:
+            logger.verbose('sliver_lxc: Domain %s is not defined... continuing.' % name)
 
         # Remove user after destroy domain to force logout
         command = ['/usr/sbin/userdel', '-f', '-r', name]