fix memlock_hard and other tags not being written to cgroups

[nodemanager.git] / sliver_libvirt.py

diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 778eb10..f4998b0 100644 (file)
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -135,30 +135,32 @@ class Sliver_Libvirt(Account):
 
         # Btrfs support quota per volumes
 
-        # It will depend on the FS selection
-        if rec.has_key('disk_max'):
-            disk_max = rec['disk_max']
-            if disk_max == 0:
-                # unlimited 
-                pass
-            else:
-                # limit to certain number
-                pass
-
-        # Memory allocation
-        if rec.has_key('memlock_hard'):
-            mem = rec['memlock_hard'] * 1024 # hard limit in bytes
-            cgroups.write(self.name, 'memory.limit_in_bytes', mem)
-        if rec.has_key('memlock_soft'):
-            mem = rec['memlock_soft'] * 1024 # soft limit in bytes
-            cgroups.write(self.name, 'memory.soft_limit_in_bytes', mem)
-
-        # CPU allocation
-        # Only cpu_shares until figure out how to provide limits and guarantees
-        # (RT_SCHED?)
-        if rec.has_key('cpu_share'):
-            cpu_share = rec['cpu_share']
-            cgroups.write(self.name, 'cpu.shares', cpu_share)
+        if rec.has_key("rspec") and rec["rspec"].has_key("tags"):
+            tags = rec["rspec"]["tags"]
+            # It will depend on the FS selection
+            if tags.has_key('disk_max'):
+                disk_max = tags['disk_max']
+                if disk_max == 0:
+                    # unlimited
+                    pass
+                else:
+                    # limit to certain number
+                    pass
+
+            # Memory allocation
+            if tags.has_key('memlock_hard'):
+                mem = str(int(tags['memlock_hard']) * 1024) # hard limit in bytes
+                cgroups.write(self.name, 'memory.limit_in_bytes', mem, subsystem="memory")
+            if tags.has_key('memlock_soft'):
+                mem = str(int(tags['memlock_soft']) * 1024) # soft limit in bytes
+                cgroups.write(self.name, 'memory.soft_limit_in_bytes', mem, subsystem="memory")
+
+            # CPU allocation
+            # Only cpu_shares until figure out how to provide limits and guarantees
+            # (RT_SCHED?)
+            if tags.has_key('cpu_share'):
+                cpu_share = tags['cpu_share']
+                cgroups.write(self.name, 'cpu.shares', cpu_share)
 
         # Call the upper configure method (ssh keys...)
         Account.configure(self, rec)
@@ -174,15 +176,33 @@ class Sliver_Libvirt(Account):
         try:
             tags = rec['rspec']['tags']
             if 'interface' in tags:
-                interface = eval(tags['interface'])
-                if 'bridge' in interface:
-                    xml = """
-    <interface type='bridge'>
-      <source bridge='%s'/>
-      <virtualport type='openvswitch'/>
-    </interface>
-""" % interface['bridge']
-                    logger.log('sliver_libvirty.py: interface XML is: %s' % xml)
+                interfaces = eval(tags['interface'])
+                if not isinstance(interfaces, (list, tuple)):
+                    # if interface is not a list, then make it into a singleton list
+                    interfaces = [interfaces]
+                tag_xml = ""
+                for interface in interfaces:
+                    if 'vlan' in interface:
+                        vlanxml = "<vlan><tag id='%s'/></vlan>" % interface['vlan']
+                    else:
+                        vlanxml = ""
+                    if 'bridge' in interface:
+                        tag_xml = tag_xml + """
+        <interface type='bridge'>
+          <source bridge='%s'/>
+          %s
+          <virtualport type='openvswitch'/>
+        </interface>
+    """ % (interface['bridge'], vlanxml)
+                    else:
+                        tag_xml = tag_xml + """
+        <interface type='network'>
+          <source network='default'/>
+        </interface>
+    """
+                xml = tag_xml
+                logger.log('sliver_libvirty.py: interface XML is: %s' % xml)
+
         except:
             logger.log('sliver_libvirt.py: ERROR parsing "interface" tag for slice %s' % rec['name'])
             logger.log('sliver_libvirt.py: tag value: %s' % tags['interface'])