From 221dba959294faa8935ff8918811afdf35f49006 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Tue, 14 Mar 2017 14:36:20 +0400
Subject: [PATCH] Override all dependent ovs providers

Take into account (i.e. make override actions for)
dpdk enabled interfaces as well.

Change-Id: I8d35814ccc9ddda4c904a4abf6a51105baa12b9a
Closes-Bug: #1672695
---
 .../lib/puppet/parser/functions/remove_ovs_usage.rb   |  5 +++--
 .../spec/functions/remove_ovs_usage_spec.rb           | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/remove_ovs_usage.rb b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/remove_ovs_usage.rb
index 4a391c06ca..febfae75e0 100644
--- a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/remove_ovs_usage.rb
+++ b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/remove_ovs_usage.rb
@@ -37,7 +37,8 @@ Puppet::Parser::Functions::newfunction( :remove_ovs_usage,
     overrides = []
 
     network_scheme['transformations'].each do |tr|
-      if tr['provider'] == 'ovs'
+      # get all dependent ovs providers
+      if tr['provider'] =~ /ovs/
         if tr['action'] == 'add-patch'
           overrides << {
             'action'   => 'override',
@@ -62,4 +63,4 @@ Puppet::Parser::Functions::newfunction( :remove_ovs_usage,
 
     return rv.to_yaml() + "\n"
 end
-# vim: set ts=2 sw=2 et :
\ No newline at end of file
+# vim: set ts=2 sw=2 et :
diff --git a/deployment/puppet/osnailyfacter/spec/functions/remove_ovs_usage_spec.rb b/deployment/puppet/osnailyfacter/spec/functions/remove_ovs_usage_spec.rb
index 89e1864338..5030362401 100644
--- a/deployment/puppet/osnailyfacter/spec/functions/remove_ovs_usage_spec.rb
+++ b/deployment/puppet/osnailyfacter/spec/functions/remove_ovs_usage_spec.rb
@@ -23,6 +23,12 @@ describe 'remove_ovs_usage' do
           'provider' => 'ovs',
           'action' => 'foo',
           'name' => 'bar',
+        },
+        {
+          'provider' => 'dpdkovs',
+          'bridge' => 'bridge-0',
+          'action' => 'add-port',
+          'name' => 'ethx',
         }
       ],
     }
@@ -37,6 +43,11 @@ describe 'remove_ovs_usage' do
             'action' => 'override',
             'override' => 'bar',
             'provider' => 'lnx',
+          },
+          {
+            'action' => 'override',
+            'override' => 'ethx',
+            'provider' => 'lnx',
           }
         ]
       }