X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=ca5d144780509a43c2582eb1830cacce8db71f76;hb=ac32a7847ed26019377496b0849df5127f3b479b;hp=ab5c3917cd49b659e232e9ce24357c1e878bf428;hpb=8a7ca2937db392c6605ffa800077490ab5a64bde;p=nodemanager.git

diff --git a/sliver_vs.py b/sliver_vs.py
index ab5c391..ca5d144 100644
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -17,7 +17,7 @@ don't have to guess if there is a running process or not.
 """
 
 import errno
-import os
+import os, os.path
 import time
 import vserver
 
@@ -67,10 +67,55 @@ class Sliver_VS(accounts.Account, vserver.VServer):
     @staticmethod
     def create(name, vref = None):
         logger.verbose('Sliver_VS:create - name=%s'%name)
-        if vref is not None:
-            logger.log_call('/usr/sbin/vuseradd', '-t', vref, name)
-        else:
-            logger.log_call('/usr/sbin/vuseradd', name)
+        if vref is None:
+            vref='default'
+        try:
+            ### locating the right slicefamily
+            # this is a first draft, and more a proof of concept thing
+            # the idea is to parse vref for dash-separated wishes,
+            # and to project these against the defaults
+            # however for cases like when vref is 'planetflow', if we do not understand
+            # any of the wishes we take vref as is
+            # this could be improved by having the vserver-reference init script be a bit smarter
+            # so we could take planetflow as the pldistro part here
+            as_is=None
+            # defaults
+            default=file("/etc/planetlab/defaultvref").read()
+            (pldistro,fcdistro,arch) = default.split("-")
+            # from the slice attribute: cut dashes and try to figure the meaning
+            slice_wishes = vref.split("-")
+            for wish in slice_wishes:
+                if wish == "i386" or wish == "x86_64":
+                    arch=wish
+                elif wish == "planetlab" or wish == "onelab" or wish == "vini":
+                    pldistro=wish
+                elif wish == "f8" or wish == "centos5" :
+                    fcdistro=wish
+                else:
+                    # if we find something like e.g. planetflow, use it as-is
+                    as_is=vref
+                    break
+            if as_is:
+                refname=as_is
+            else:
+                refname="-".join( (pldistro,fcdistro,arch) )
+            # check the templates exists -- there's probably a better way..
+            if not os.path.isdir ("/vservers/.vref/%s"%refname):
+                log.verbose("%s (%s) : vref %s not found, using default %s"%(
+                        name,vref,refname,default))
+                refname=default
+            except IOError:
+                # have not found defaultvref
+                logger.verbose("%s (%s): using fallback vrefname 'default'"%(name,vref))
+                # for legacy nodes
+                refname="default"
+            except:
+                import traceback
+                logger.log("%s (%s) : unexpected error follows - using 'default'"%(
+                        name,vref))
+                logger.log(traceback.format_exc())
+            
+            logger.log_call('/usr/sbin/vuseradd', '-t', refname, name)
         open('/vservers/%s/etc/slicename' % name, 'w').write(name)
 
     @staticmethod
@@ -141,7 +186,10 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             minimum  = self.rspec['%s_min'%type]
             soft = self.rspec['%s_soft'%type]
             hard = self.rspec['%s_hard'%type]
-            self.set_rlimit_config(limit, hard, soft, minimum)
+            update = self.set_rlimit(limit, hard, soft, minimum)
+            if update:
+                logger.log('%s: setting rlimit %s to (%d, %d, %d)'
+                           % (self.name, type, hard, soft, minimum))
 
         self.set_capabilities_config(self.rspec['capabilities'])
         if self.rspec['capabilities']:
@@ -159,21 +207,21 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             logger.log('%s: setting net share to %d' % (self.name, net_limits[-1]))
             self.set_bwlimit(*net_limits)
 
-        cpu_min = self.rspec['cpu_min']
+        cpu_pct = self.rspec['cpu_pct']
         cpu_share = self.rspec['cpu_share']
 
         if self.rspec['enabled'] > 0:
-            if cpu_min > 0:
-                logger.log('%s: setting cpu to %d%% guaranteed' % (self.name, cpu_min))
+            if cpu_pct > 0:
+                logger.log('%s: setting cpu reservation to %d%%' % (self.name, cpu_pct))
             else:
-                cpu_min = 0
+                cpu_pct = 0
 
             if cpu_share > 0:
                 logger.log('%s: setting cpu share to %d' % (self.name, cpu_share))
             else:
                 cpu_share = 0
 
-            self.set_sched_config(cpu_min, cpu_share)
+            self.set_sched_config(cpu_pct, cpu_share)
             # if IP address isn't set (even to 0.0.0.0), sliver won't be able to use network
             if self.rspec['ip_addresses'] != '0.0.0.0':
                 logger.log('%s: setting IP address(es) to %s' % (self.name, self.rspec['ip_addresses']))