From: Andy Bavier <acb@cs.princeton.edu>
Date: Tue, 13 Nov 2012 21:16:14 +0000 (-0500)
Subject: Add support for connecting virtual interfaces to VLANs via Open vSwitch.
X-Git-Tag: nodemanager-2.1-13~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=710240acc763663798403b91459873a3d1f0cb84

Add support for connecting virtual interfaces to VLANs via Open vSwitch.
---

diff --git a/plugins/interfaces.py b/plugins/interfaces.py
index 51c7cf2..8563696 100644
--- a/plugins/interfaces.py
+++ b/plugins/interfaces.py
@@ -53,7 +53,7 @@ def GetSlivers(data, config=None, plc=None):
                         continue
 
                     for key, value in mydict.items():
-                        if key in ['bridge']: 
+                        if key in ['bridge', 'vlan']: 
                             continue
                         contents += '%s="%s"\n' % (key, value)
 
diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 778eb10..c5b4bbc 100644
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -175,13 +175,18 @@ class Sliver_Libvirt(Account):
             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']
+""" % (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'])