Incorporating old pl_mom into NM.

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 4dad45d..8963c15 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -33,7 +33,12 @@ class Sliver_VS(accounts.Account, vserver.VServer):
     TYPE = 'sliver.VServer'
 
     def __init__(self, rec):
-        vserver.VServer.__init__(self, rec['name'])
+        try:
+            vserver.VServer.__init__(self, rec['name'])
+        except vserver.NoSuchVServer:
+            self.create(rec['name'], rec['type'])
+            vserver.VServer.__init__(self, rec['name'])
+
         self.keys = ''
         self.rspec = {}
         self.initscript = ''
@@ -41,7 +46,11 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         self.configure(rec)
 
     @staticmethod
-    def create(name): logger.log_call('/usr/sbin/vuseradd', name)
+    def create(name, vref = None):
+        if vref is not None:
+            logger.log_call('/usr/sbin/vuseradd', '-t', vref, name)
+        else:
+            logger.log_call('/usr/sbin/vuseradd', name)
 
     @staticmethod
     def destroy(name): logger.log_call('/usr/sbin/vuserdel', name)
@@ -97,14 +106,14 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             logger.log('%s: failed to set max disk usage' % self.name)
             logger.log_exc()
 
-        net_limits = (self.rspec['net_min'], self.rspec['net_max'], self.rspec['net2_min'], self.rspec['net2_max'], self.rspec['net_share'])
+        net_limits = (self.rspec['net_min_rate'], self.rspec['net_max_rate'], self.rspec['net_i2_min_rate'], self.rspec['net_i2_max_rate'], self.rspec['net_share'])
         logger.log('%s: setting net limits to %s bps' % (self.name, net_limits[:-1]))
         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_share = self.rspec['cpu_share']
-        if self.rspec['enabled']:
+        if self.rspec['enabled'] > 0:
             if cpu_min >= 50:  # at least 5%: keep people from shooting themselves in the foot
                 logger.log('%s: setting cpu share to %d%% guaranteed' % (self.name, cpu_min/10.0))
                 self.set_sched_config(cpu_min, vserver.SCHED_CPU_GUARANTEED)