X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=c5b4bbce9c81385df443b020de48b89c5d5a99ec;hb=017b153a7cfd73df8cbbc1b7ecbfd7def0a66d0d;hp=54b11f1025ab62f995dd8af02a12a949e1d6bb4f;hpb=e35cdeb5ae4e37a7205150195735ab8c69e6d522;p=nodemanager.git
diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 54b11f1..c5b4bbc 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -9,7 +9,7 @@ import libvirt
from account import Account
import logger
-import bwlimitlxc as bwlimit
+import plnode.bwlimit as bwlimit
import cgroups
STATES = {
@@ -163,3 +163,33 @@ class Sliver_Libvirt(Account):
# Call the upper configure method (ssh keys...)
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 'vlan' in interface:
+ vlanxml = "" % interface['vlan']
+ else:
+ vlanxml = ""
+ if 'bridge' in interface:
+ xml = """
+
+
+ %s
+
+
+""" % (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