X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=6ae8eebf104acb9ca9619d32d906a1e73ffc9263;hb=96ebd6473ca6e19c2596a40c23d6fb3c33155885;hp=753b0c3a297dfb112d38801cec8948f6267750d6;hpb=34bbf772786e0e674d2b83ddfb079cb060830ff1;p=nodemanager.git
diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 753b0c3..6ae8eeb 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -4,6 +4,7 @@ import sys
import os, os.path
import subprocess
import pprint
+import random
import libvirt
@@ -109,7 +110,7 @@ class Sliver_Libvirt(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
@@ -171,14 +172,19 @@ class Sliver_Libvirt(Account):
# Call the upper configure method (ssh keys...)
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:
@@ -198,14 +204,17 @@ class Sliver_Libvirt(Account):
%s
+
- """ % (interface['bridge'], vlanxml)
+ """ % (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)