X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=4c084b97a3b424a667b2f3948198072ff2c255d4;hb=fcb917ff5570d207bbe2bf357321855097bd8260;hp=ea0d21d6190630fc0b864ff09f2f16c59b8619d2;hpb=91077a5b37a3a3eec3c05e1d67b6a68efa75063a;p=nodemanager.git

diff --git a/sliver_vs.py b/sliver_vs.py
index ea0d21d..4c084b9 100644
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -80,7 +80,11 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         logger.verbose('sliver_vs: %s: create'%name)
         if vref is None:
             logger.log("sliver_vs: %s: ERROR - no vref attached, this is unexpected"%(name))
-            return
+            # added by caglar
+            # band-aid for short period as old API doesn't have GetSliceFamily function
+            #return
+            vref = "planetlab-f8-i386"
+
         # used to look in /etc/planetlab/family,
         # now relies on the 'GetSliceFamily' extra attribute in GetSlivers()
         # which for legacy is still exposed here as the 'vref' key
@@ -192,7 +196,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
     def is_running(self):
         return vserver.VServer.is_running(self)
 
-    def set_resources(self,setup=False):
+    def set_resources(self):
         disk_max = self.rspec['disk_max']
         logger.log('sliver_vs: %s: setting max disk usage to %d KiB' % (self.name, disk_max))
         try:  # if the sliver is over quota, .set_disk_limit will throw an exception
@@ -229,21 +233,29 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         cpu_pct = self.rspec['cpu_pct']
         cpu_share = self.rspec['cpu_share']
 
-        if setup:
-            for key in self.rspec.keys():
-                if key.find('sysctl.') == 0:
-                    sysctl=key.split('.')
+        count = 1
+        for key in self.rspec.keys():
+            if key.find('sysctl.') == 0:
+                sysctl=key.split('.')
+                try:
+                    # /etc/vservers/<guest>/sysctl/<id>/
+                    dirname = "/etc/vservers/%s/sysctl/%s" % (self.name, count)
                     try:
-                        path="/proc/sys/%s" % ("/".join(sysctl[1:]))
-                        logger.log("sliver_vs: %s: opening %s"%(self.name,path))
-                        flags = os.O_WRONLY
-                        fd = os.open(path, flags)
-                        logger.log("sliver_vs: %s: writing %s=%s"%(self.name,key,self.rspec[key]))
-                        os.write(fd,self.rspec[key])
-                        os.close(fd)
-                    except IOError, e:
-                        logger.log("sliver_vs: %s: could not set %s=%s"%(self.name,key,self.rspec[key]))
-                        logger.log("sliver_vs: %s: error = %s"%(self.name,e))
+                        os.makedirs(dirname, 0755)
+                    except:
+                        pass
+                    setting = open("%s/setting" % dirname, "w")
+                    setting.write("%s\n" % key.lstrip("sysctl."))
+                    setting.close()
+                    value = open("%s/value" % dirname, "w")
+                    value.write("%s\n" % self.rspec[key])
+                    value.close()
+                    count += 1
+
+                    logger.log("sliver_vs: %s: writing %s=%s"%(self.name,key,self.rspec[key]))
+                except IOError, e:
+                    logger.log("sliver_vs: %s: could not set %s=%s"%(self.name,key,self.rspec[key]))
+                    logger.log("sliver_vs: %s: error = %s"%(self.name,e))
 
 
         if self.rspec['enabled'] > 0: