Merge "Nuage: remove check on mechanism driver"

This commit is contained in:
Zuul 2020-07-08 23:31:57 +00:00 committed by Gerrit Code Review
commit 13b3d3d298
2 changed files with 0 additions and 22 deletions

View File

@ -106,8 +106,4 @@ class neutron::plugins::ml2::nuage (
'RESTPROXY/cms_id': value => $nuage_cms_id;
'PLUGIN/default_allow_non_ip': value => $nuage_default_allow_non_ip;
}
if $::neutron::core_plugin != 'ml2' or !('nuage' in $::neutron::plugins::ml2::mechanism_drivers) {
fail('Nuage should be the mechanism driver in neutron.conf')
}
}

View File

@ -56,15 +56,6 @@ describe 'neutron::plugins::ml2::nuage' do
should contain_neutron_plugin_nuage('PLUGIN/default_allow_non_ip').with_value(params[:nuage_default_allow_non_ip])
end
context 'configure ml2 nuage with wrong core_plugin configuration' do
let :pre_condition do
"class { 'neutron':
core_plugin => 'foo' }"
end
it { should raise_error(Puppet::Error, /Nuage should be the mechanism driver in neutron.conf/) }
end
it 'should have a nuage plugin conf file' do
should contain_file(platform_params[:nuage_conf_file]).with(
:ensure => platform_params[:nuage_file_ensure],
@ -80,15 +71,6 @@ describe 'neutron::plugins::ml2::nuage' do
should contain_neutron_plugin_nuage('PLUGIN/default_allow_non_ip').with_value(true)
end
end
context 'configure ml2 nuage with wrong mechanism_driver configuration' do
let :pre_condition do
"class { 'neutron::plugins::ml2':
mechanism_drivers => ['bar'] }"
end
it { should raise_error(Puppet::Error, /Nuage should be the mechanism driver in neutron.conf/) }
end
end
on_supported_os({