From f42806956740faa2f01bf9d9b89e4b390f544f74 Mon Sep 17 00:00:00 2001
From: andersbs <anders@svanqvist.se>
Date: Tue, 10 Mar 2015 15:28:41 +0100
Subject: [PATCH] Basic support for portgroups in network resource

---
 manifests/network.pp      |  2 ++
 templates/network.xml.erb | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/manifests/network.pp b/manifests/network.pp
index 1a03440..2eb5425 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -72,11 +72,13 @@
   $autostart          = false,
   $bridge             = undef,
   $forward_mode       = undef,
+  $virtualport        = false,
   $forward_dev        = undef,
   $forward_interfaces = [],
   $ip                 = undef,
   $ipv6               = undef,
   $mac                = undef,
+  $portgroups         = {},
 ) {
   validate_bool ($autostart)
   validate_re ($ensure, '^(present|defined|enabled|running|undefined|absent)$',
diff --git a/templates/network.xml.erb b/templates/network.xml.erb
index 98be69f..bea673e 100644
--- a/templates/network.xml.erb
+++ b/templates/network.xml.erb
@@ -15,6 +15,22 @@
   <%- if @bridge -%>
   <bridge name='<%= @bridge -%>'<%- if @forward_mode and @forward_mode != 'bridge' -%> stp='on' delay='0'<%-end-%>/>
   <%- end -%>
+  <%- if @virtualport -%>
+  <virtualport type='openvswitch'/>
+  <%- end -%>
+  <%- if !@portgroups.empty? -%>
+  <%-   @portgroups.each do |n, pg| -%>
+  <portgroup name='<%= n -%>'<%- if pg.has_key?('default') -%> default='<%= pg['default'] -%>'<%- end -%> >
+    <%- if pg.has_key?('vlan') -%>
+    <vlan>
+      <%- [pg['vlan']].flatten.each do |v| -%>
+      <tag id='<%= v -%>'/>
+      <%- end -%>
+    </vlan>
+    <%- end -%>
+  </portgroup>
+  <%-   end -%>
+  <%- end -%>
   <%-if @ip -%>
   <%-  @ip.each do |ip| -%>
   <ip<%-if ip['address']-%> address='<%=ip['address']-%>'<%-end-%><%-if ip['netmask']-%> netmask='<%=ip['netmask']-%>'<%-end-%><%-if ip['prefix']-%> prefix='<%=ip['prefix']-%>'<%-end-%><%- unless ip['dhcp'] %>/<%- end -%>>