X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=cad14cba8774fbc0028cdd7f872d42b2fdceb973;hb=23735d93362da4ab1cd84f40d9c6e7fdb005f4ff;hp=56ab8ac6cada6d6d9122ee1297475b5ff23b4b27;hpb=41bbd0186435d3a61b0fa889f87c40b92cea0177;p=nodemanager.git

diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 56ab8ac..cad14cb 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -4,12 +4,13 @@ import sys
 import os, os.path
 import subprocess
 import pprint
+import random
 
 import libvirt
 
 from account import Account
 import logger
-import bwlimit
+import plnode.bwlimit as bwlimit
 import cgroups
 
 STATES = {
@@ -55,7 +56,7 @@ class Sliver_Libvirt(Account):
         self.rspec = {}
         self.slice_id = rec['slice_id']
         self.enabled = True
-        self.conn = getConnection(rec['type'])
+        self.conn = Sliver_Libvirt.getConnection(rec['type'])
         self.xid = bwlimit.get_xid(self.name)
 
         dom = None
@@ -63,7 +64,7 @@ class Sliver_Libvirt(Account):
             dom = self.conn.lookupByName(self.name)
         except:
             logger.log('sliver_libvirt: Domain %s does not exist. ' \
-                       'Will try to create it again.' \ % (self.name))
+                       'Will try to create it again.' % (self.name))
             self.__class__.create(rec['name'], rec)
             dom = self.conn.lookupByName(self.name)
         self.dom = dom
@@ -135,31 +136,90 @@ 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
+        if rec.has_key("rspec") and rec["rspec"].has_key("tags"):
+            if cgroups.get_cgroup_path(self.name) == None:
+                # If configure is called before start, then the cgroups won't exist
+                # yet. NM will eventually re-run configure on the next iteration.
+                # TODO: Add a post-start configure, and move this stuff there
+                logger.log("Configure: postponing tag check on %s as cgroups are not yet populated" % self.name)
             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)
+                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)
 
+    @staticmethod
+    def get_unique_vif():
+        return 'veth%s' % random.getrandbits(32)
+
+    # A placeholder until we get true VirtualInterface objects
+    @staticmethod
+    def get_interfaces_xml(rec):
+        xml = """
+    <interface type='network'>
+      <source network='default'/>
+      <target dev='%s'/>
+    </interface>
+""" % (Sliver_Libvirt.get_unique_vif())
+        try:
+            tags = rec['rspec']['tags']
+            if 'interface' in tags:
+                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'/>
+          <target dev='%s'/>
+        </interface>
+    """ % (interface['bridge'], vlanxml, Sliver_Libvirt.get_unique_vif())
+                    else:
+                        tag_xml = tag_xml + """
+        <interface type='network'>
+          <source network='default'/>
+          <target dev='%s'/>
+        </interface>
+    """ % (Sliver_Libvirt.get_unique_vif())
+
+                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'])
+
+        return xml