X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=cad14cba8774fbc0028cdd7f872d42b2fdceb973;hb=97535a7d1df44a3745eee7cc1464f6488370acf8;hp=ed430885894c85a7a5312a56836caac849af9a7f;hpb=d21e9214c45a1fa8703b8d8dd1900024fb3b8ebc;p=nodemanager.git
diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index ed43088..cad14cb 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -4,6 +4,7 @@ import sys
import os, os.path
import subprocess
import pprint
+import random
import libvirt
@@ -135,42 +136,55 @@ 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 = """
+
-"""
+""" % (Sliver_Libvirt.get_unique_vif())
try:
tags = rec['rspec']['tags']
if 'interface' in tags:
@@ -190,14 +204,17 @@ class Sliver_Libvirt(Account):
%s
+
- """ % (interface['bridge'], vlanxml)
+ """ % (interface['bridge'], vlanxml, Sliver_Libvirt.get_unique_vif())
else:
tag_xml = tag_xml + """
+
- """
+ """ % (Sliver_Libvirt.get_unique_vif())
+
xml = tag_xml
logger.log('sliver_libvirty.py: interface XML is: %s' % xml)