X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=778eb1044ad21d0235eb57a0a2ba606f70ab4339;hb=70203faa181d96414acbbf6f0779c5d1344aea7c;hp=209cb71bfab972d0cadf6de38e14e97f28f827f9;hpb=55afbcaa2f8e9646bec3962e406f150f5d31b47b;p=nodemanager.git
diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 209cb71..778eb10 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -1,18 +1,16 @@
"""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
-from string import Template
+import libvirt
+
+from account import Account
+import logger
+import plnode.bwlimit as bwlimit
+import cgroups
STATES = {
libvirt.VIR_DOMAIN_NOSTATE: 'no state',
@@ -26,23 +24,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 +55,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 '''
@@ -157,5 +161,30 @@ class Sliver_Libvirt(accounts.Account):
cgroups.write(self.name, 'cpu.shares', cpu_share)
# Call the upper configure method (ssh keys...)
- accounts.Account.configure(self, rec)
+ Account.configure(self, rec)
+
+ # A placeholder until we get true VirtualInterface objects
+ @staticmethod
+ def get_interfaces_xml(rec):
+ xml = """
+
+
+
+"""
+ try:
+ tags = rec['rspec']['tags']
+ if 'interface' in tags:
+ interface = eval(tags['interface'])
+ if 'bridge' in interface:
+ xml = """
+
+
+
+
+""" % interface['bridge']
+ 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