X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=c5b4bbce9c81385df443b020de48b89c5d5a99ec;hb=844f6a075205a46f96d816a2ee89677afc3f6318;hp=1f308bf6820aee9891ece99d321589b00f9dc53f;hpb=e75fc68a386f2842531f23e72facd49cb9a58015;p=nodemanager.git

diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 1f308bf..c5b4bbc 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.verbose('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,35 @@ 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 = """
+    <interface type='network'>
+      <source network='default'/>
+    </interface>
+"""
+        try:
+            tags = rec['rspec']['tags']
+            if 'interface' in tags:
+                interface = eval(tags['interface'])
+                if 'vlan' in interface:
+                    vlanxml = "<vlan><tag id='%s'/></vlan>" % interface['vlan']
+                else:
+                    vlanxml = ""
+                if 'bridge' in interface:
+                    xml = """
+    <interface type='bridge'>
+      <source bridge='%s'/>
+      %s
+      <virtualport type='openvswitch'/>
+    </interface>
+""" % (interface['bridge'], vlanxml)
+                    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