X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=ed430885894c85a7a5312a56836caac849af9a7f;hb=1634e61085a950b5e60b7d304d88f01c6ffde758;hp=56ab8ac6cada6d6d9122ee1297475b5ff23b4b27;hpb=41bbd0186435d3a61b0fa889f87c40b92cea0177;p=nodemanager.git
diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 56ab8ac..ed43088 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -9,7 +9,7 @@ import libvirt
from account import Account
import logger
-import bwlimit
+import plnode.bwlimit as bwlimit
import cgroups
STATES = {
@@ -55,7 +55,7 @@ class Sliver_Libvirt(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
@@ -63,7 +63,7 @@ class Sliver_Libvirt(Account):
dom = self.conn.lookupByName(self.name)
except:
logger.log('sliver_libvirt: Domain %s does not exist. ' \
- 'Will try to create it again.' \ % (self.name))
+ 'Will try to create it again.' % (self.name))
self.__class__.create(rec['name'], rec)
dom = self.conn.lookupByName(self.name)
self.dom = dom
@@ -163,3 +163,46 @@ 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:
+ 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)
+ else:
+ tag_xml = tag_xml + """
+
+
+
+ """
+ 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