X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=python%2Fvserver.py;h=b2ad6a8d20581ead3367c33e99076b57749bcc2d;hb=HEAD;hp=315edbbdf96db0336c6f36bf51930d3ed437bc0e;hpb=0420b6b2adea04ecab404c4889b9dbf95e0a745c;p=util-vserver-pl.git

diff --git a/python/vserver.py b/python/vserver.py
index 315edbb..b2ad6a8 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -16,10 +16,12 @@ import commands
 import resource
 
 import vserverimpl
-import cpulimit, bwlimit
+import cpulimit
+import plnode.bwlimit as bwlimit
 
 from vserverimpl import DLIMIT_INF
 from vserverimpl import VC_LIM_KEEP
+from vserverimpl import VC_LIM_INFINITY
 from vserverimpl import VLIMIT_NSOCK
 from vserverimpl import VLIMIT_OPENFD
 from vserverimpl import VLIMIT_ANON
@@ -192,7 +194,7 @@ class VServer:
 
     def get_prefix_from_capabilities(self, capabilities, prefix):
         split_caps = capabilities.split(',')
-        return ",".join(["%s" % (c) for c in split_caps if c.startswith(prefix.upper()) or c.startswith(prefix.lower())])
+        return ",".join(["%s" % (c[len(prefix):]) for c in split_caps if c.startswith(prefix.upper()) or c.startswith(prefix.lower())])
 
     def get_bcaps_from_capabilities(self, capabilities):
         return self.get_prefix_from_capabilities(capabilities, "cap_")
@@ -229,18 +231,25 @@ class VServer:
 
     def set_ipaddresses(self, addresses):
         vserverimpl.netremove(self.ctx, "all")
-        for a in addresses.split(","):
-            vserverimpl.netadd(self.ctx, a)
+        for ip in addresses:
+            vserverimpl.netadd(self.ctx, ip)
+
+    def set_ipaddresses_config(self, addresses, add_loopback=True):
+        ip_addresses = addresses.split(",")
+
+        # add looopback interface
+        if not ip_addresses.__contains__("127.0.0.1") and add_loopback:
+            ip_addresses.append("127.0.0.1")
 
-    def set_ipaddresses_config(self, addresses):
-        return # acb
         i = 0
-        for a in addresses.split(","):
-            self.config.update("interfaces/%d/ip" % i, a)
+        for ip in ip_addresses:
+            self.config.update("interfaces/%d/ip" % i, ip)
+            # create emtpy nodev files to silent "No device specified for" warnings
+            self.config.update("interfaces/%d/nodev" % i, "")
             i += 1
-        while self.config.unset("interfaces/%d/ip" % i):
+        while self.config.unset("interfaces/%d/ip" % i) and self.config.update("interfaces/%d/nodev" % i, ""):
             i += 1
-        self.set_ipaddresses(addresses)
+        self.set_ipaddresses(ip_addresses)
 
     def get_ipaddresses_config(self):
         i = 0
@@ -327,7 +336,7 @@ class VServer:
     def set_sched_config(self, cpu_min, cpu_share):
         """ Write current CPU scheduler parameters to the vserver
         configuration file. Currently, 'cpu_min' is not supported. """
-        self.config.update('cgroup/cpu.shares', cpu_share * CPU_SHARE_MULT)
+        self.config.update('cgroup/cpu.shares', int(cpu_share) * CPU_SHARE_MULT)
         if self.is_running():
             self.set_sched(cpu_min, cpu_share)
 
@@ -335,8 +344,8 @@ class VServer:
         """ Update kernel CPU scheduling parameters for this context.
         Currently, 'cpu_min' is not supported. """
         try:
-            cgroup = open('/dev/cgroup/%s/cpu.shares' % name, 'w')
-            cgroup.write('%s' % (cpu_share * CPU_SHARE_MULT))
+            cgroup = open('/dev/cgroup/%s/cpu.shares' % self.name, 'w')
+            cgroup.write('%s' % (int(cpu_share) * CPU_SHARE_MULT))
             cgroup.close()
         except:
             pass
@@ -389,7 +398,7 @@ class VServer:
                 os._exit(0)	# Exit parent (the first child) of the second child.
             # the grandson is the working one
             os.chdir('/')
-            os.umask(0)
+            os.umask(0022)
             try:
                 # start the vserver
                 subprocess.call(["/usr/sbin/vserver",self.name,"start"])
@@ -460,12 +469,3 @@ def create(vm_name, static = False, ctor = VServer):
     vm_id = pwd.getpwnam(vm_name)[2]
 
     return ctor(vm_name, vm_id)
-
-
-def close_nonstandard_fds():
-    """Close all open file descriptors other than 0, 1, and 2."""
-    _SC_OPEN_MAX = 4
-    for fd in range(3, os.sysconf(_SC_OPEN_MAX)):
-        try: os.close(fd)
-        except OSError: pass  # most likely an fd that isn't open
-