X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_libvirt.py;h=6ae8eebf104acb9ca9619d32d906a1e73ffc9263;hb=38340f784c7178599e559e8ac3fa04e3880e8a7a;hp=753b0c3a297dfb112d38801cec8948f6267750d6;hpb=52c1df6319be531a465620d500e36c8d1920923f;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 = """
     <interface type='network'>
       <source network='default'/>
+      <target dev='%s'/>
     </interface>
-"""
+""" % (Sliver_Libvirt.get_unique_vif())
         try:
             tags = rec['rspec']['tags']
             if 'interface' in tags:
@@ -198,14 +204,17 @@ class Sliver_Libvirt(Account):
           <source bridge='%s'/>
           %s
           <virtualport type='openvswitch'/>
+          <target dev='%s'/>
         </interface>
-    """ % (interface['bridge'], vlanxml)
+    """ % (interface['bridge'], vlanxml, Sliver_Libvirt.get_unique_vif())
                     else:
                         tag_xml = tag_xml + """
         <interface type='network'>
           <source network='default'/>
+          <target dev='%s'/>
         </interface>
-    """
+    """ % (Sliver_Libvirt.get_unique_vif())
+
                 xml = tag_xml
                 logger.log('sliver_libvirty.py: interface XML is: %s' % xml)