From 027910d236d1e6bf07f665240f7c1ef7c3524b51 Mon Sep 17 00:00:00 2001
From: Michael Ablassmeier <abi@grinser.de>
Date: Mon, 16 Nov 2020 16:11:59 +0100
Subject: [PATCH] Support setting ovs interface id (#1156)

Support setting the ovs interfaceid parameter

Fixes: #1155
---
 README.md                                               | 1 +
 lib/vagrant-libvirt/action/create_network_interfaces.rb | 1 +
 lib/vagrant-libvirt/templates/public_interface.xml.erb  | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3b8c849..a9238c0 100644
--- a/README.md
+++ b/README.md
@@ -788,6 +788,7 @@ virtual network.
 * `:portgroup` - Name of Libvirt portgroup to connect to.
 * `:ovs` - Support to connect to an Open vSwitch bridge device. Default is
   'false'.
+* :ovs_interfaceid - Add Open vSwitch 'interfaceid' parameter.
 * `:trust_guest_rx_filters` - Support trustGuestRxFilters attribute. Details
   are listed [here](http://www.libvirt.org/formatdomain.html#elementsNICSDirect).
   Default is 'false'.
diff --git a/lib/vagrant-libvirt/action/create_network_interfaces.rb b/lib/vagrant-libvirt/action/create_network_interfaces.rb
index 130b37c..eb585e4 100644
--- a/lib/vagrant-libvirt/action/create_network_interfaces.rb
+++ b/lib/vagrant-libvirt/action/create_network_interfaces.rb
@@ -95,6 +95,7 @@ module VagrantPlugins
               template_name = 'public_interface'
               @logger.info("Setting up public interface using device #{@device} in mode #{@mode}")
               @ovs = iface_configuration.fetch(:ovs, false)
+              @ovs_interfaceid = iface_configuration.fetch(:ovs_interfaceid, false)
               @trust_guest_rx_filters = iface_configuration.fetch(:trust_guest_rx_filters, false)
             # configuration for udp or tcp tunnel interfaces (p2p conn btwn guest OSes)
             elsif iface_configuration.fetch(:tunnel_type, nil)
diff --git a/lib/vagrant-libvirt/templates/public_interface.xml.erb b/lib/vagrant-libvirt/templates/public_interface.xml.erb
index da541db..5d57de8 100644
--- a/lib/vagrant-libvirt/templates/public_interface.xml.erb
+++ b/lib/vagrant-libvirt/templates/public_interface.xml.erb
@@ -18,7 +18,11 @@
     <driver name='<%=@driver_name%>'/>
   <% end %>
   <% if @ovs %>
-  <virtualport type='openvswitch'/>
+  <virtualport type='openvswitch'>
+    <% if @ovs_interfaceid %>
+      <parameters interfaceid='<%=@ovs_interfaceid%>'/>
+    <% end %>
+  </virtualport>
   <% end %>
   <% if @pci_bus and @pci_slot %>
   <address type='pci' bus='<%=@pci_bus%>' slot='<%=@pci_slot%>' />