X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=6ae8eebf104acb9ca9619d32d906a1e73ffc9263;hb=refs%2Fheads%2Fsystemd;hp=209cb71bfab972d0cadf6de38e14e97f28f827f9;hpb=55afbcaa2f8e9646bec3962e406f150f5d31b47b;p=nodemanager.git
diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 209cb71..6ae8eeb 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -1,18 +1,17 @@
"""LibVirt slivers"""
-import accounts
-import logger
-import subprocess
-import os
-import os.path
-import libvirt
import sys
-import shutil
-import bwlimit
-import cgroups
+import os, os.path
+import subprocess
import pprint
+import random
+
+import libvirt
-from string import Template
+from account import Account
+import logger
+import plnode.bwlimit as bwlimit
+import cgroups
STATES = {
libvirt.VIR_DOMAIN_NOSTATE: 'no state',
@@ -26,23 +25,25 @@ STATES = {
connections = dict()
-# Helper methods
+# Common Libvirt code
-def getConnection(sliver_type):
- # TODO: error checking
- # vtype is of the form sliver.[LXC/QEMU] we need to lower case to lxc/qemu
- vtype = sliver_type.split('.')[1].lower()
- uri = vtype + '://'
- return connections.setdefault(uri, libvirt.open(uri))
+class Sliver_Libvirt(Account):
-def debuginfo(dom):
- ''' Helper method to get a "nice" output of the info struct for debug'''
- [state, maxmem, mem, ncpu, cputime] = dom.info()
- return '%s is %s, maxmem = %s, mem = %s, ncpu = %s, cputime = %s' % (dom.name(), STATES.get(state, state), maxmem, mem, ncpu, cputime)
+ # Helper methods
-# Common Libvirt code
+ @staticmethod
+ def getConnection(sliver_type):
+ # TODO: error checking
+ # vtype is of the form sliver.[LXC/QEMU] we need to lower case to lxc/qemu
+ vtype = sliver_type.split('.')[1].lower()
+ uri = vtype + '://'
+ return connections.setdefault(uri, libvirt.open(uri))
-class Sliver_Libvirt(accounts.Account):
+ @staticmethod
+ def debuginfo(dom):
+ ''' Helper method to get a "nice" output of the info struct for debug'''
+ [state, maxmem, mem, ncpu, cputime] = dom.info()
+ return '%s is %s, maxmem = %s, mem = %s, ncpu = %s, cputime = %s' % (dom.name(), STATES.get(state, state), maxmem, mem, ncpu, cputime)
def __init__(self, rec):
self.name = rec['name']
@@ -55,14 +56,18 @@ class Sliver_Libvirt(accounts.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
try:
- self.dom = self.conn.lookupByName(self.name)
+ dom = self.conn.lookupByName(self.name)
except:
- logger.log('sliver_libvirt: Domain %s does not exist ' \
- 'UNEXPECTED: %s'%(self.name, sys.exc_info()[1]))
+ logger.log('sliver_libvirt: Domain %s does not exist. ' \
+ 'Will try to create it again.' % (self.name))
+ self.__class__.create(rec['name'], rec)
+ dom = self.conn.lookupByName(self.name)
+ self.dom = dom
def start(self, delay=0):
''' Just start the sliver '''
@@ -105,7 +110,7 @@ class Sliver_Libvirt(accounts.Account):
logger.verbose('sliver_libvirt: %s is RUNNING'%self.name)
return True
else:
- info = debuginfo(self.dom)
+ info = Sliver_Libvirt.debuginfo(self.dom)
logger.verbose('sliver_libvirt: %s is ' \
'NOT RUNNING...\n%s'%(self.name, info))
return False
@@ -131,31 +136,90 @@ class Sliver_Libvirt(accounts.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...)
- accounts.Account.configure(self, rec)
+ 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:
+ 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 = "" % interface['vlan']
+ else:
+ vlanxml = ""
+ if 'bridge' in interface:
+ tag_xml = tag_xml + """
+
+
+ %s
+
+
+
+ """ % (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)
+
+ 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