Ensure vnic_type_blacklist is unset by default
... and fix some ineffective unit test cases. Change-Id: Ibc6c12c39d9a924f22c499d33856cb0c7fdf8cd7
This commit is contained in:
parent
ce4c032d17
commit
c1a3259fde
manifests/plugins/ml2
spec/classes
@ -23,9 +23,14 @@ class neutron::plugins::ml2::ovs_driver (
|
||||
$vnic_type_blacklist = [],
|
||||
){
|
||||
|
||||
validate_legacy(Array, 'validate_array', $vnic_type_blacklist)
|
||||
if !empty($vnic_type_blacklist) {
|
||||
neutron_plugin_ml2 {
|
||||
'ovs_driver/vnic_type_blacklist': value => join(any2array($vnic_type_blacklist), ',');
|
||||
}
|
||||
} else {
|
||||
neutron_plugin_ml2 {
|
||||
'ovs_driver/vnic_type_blacklist': value => $::os_service_default;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -23,9 +23,14 @@ class neutron::plugins::ml2::sriov_driver (
|
||||
$vnic_type_blacklist= [],
|
||||
){
|
||||
|
||||
validate_legacy(Array, 'validate_array', $vnic_type_blacklist)
|
||||
if !empty($vnic_type_blacklist) {
|
||||
neutron_plugin_ml2 {
|
||||
'sriov_driver/vnic_type_blacklist': value => join(any2array($vnic_type_blacklist), ',');
|
||||
}
|
||||
} else {
|
||||
neutron_plugin_ml2 {
|
||||
'sriov_driver/vnic_type_blacklist': value => $::os_service_default;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -17,6 +17,16 @@ require 'spec_helper'
|
||||
describe 'neutron::plugins::ml2::ovs_driver' do
|
||||
|
||||
shared_examples 'neutron::plugins::ml2::ovs_driver' do
|
||||
context 'with defaults' do
|
||||
let :params do
|
||||
{}
|
||||
end
|
||||
|
||||
it 'should set the default values' do
|
||||
should contain_neutron_plugin_ml2('ovs_driver/vnic_type_blacklist').with_value("<SERVICE DEFAULT>")
|
||||
end
|
||||
end
|
||||
|
||||
context 'when vnic_type_blacklist is not empty list' do
|
||||
let :params do
|
||||
{ :vnic_type_blacklist => ['direct'] }
|
||||
|
@ -17,6 +17,16 @@ require 'spec_helper'
|
||||
describe 'neutron::plugins::ml2::sriov_driver' do
|
||||
|
||||
shared_examples 'neutron::plugins::ml2::sriov_driver' do
|
||||
context 'with defaults' do
|
||||
let :params do
|
||||
{}
|
||||
end
|
||||
|
||||
it 'should set the default values' do
|
||||
should contain_neutron_plugin_ml2('sriov_driver/vnic_type_blacklist').with_value("<SERVICE DEFAULT>")
|
||||
end
|
||||
end
|
||||
|
||||
context 'when vnic_type_blacklist is not empty list' do
|
||||
let :params do
|
||||
{ :vnic_type_blacklist => ['direct'] }
|
||||
|
Loading…
x
Reference in New Issue
Block a user