Merge "Manage Neutron AAS test packages when Neutron is available"

This commit is contained in:
Jenkins 2016-04-04 20:42:11 +00:00 committed by Gerrit Code Review
commit af1bac396e
3 changed files with 33 additions and 1 deletions

View File

@ -442,6 +442,21 @@ class tempest(
name => $::tempest::params::python_neutron_tests,
tag => ['openstack', 'tempest-package'],
}
package { 'python-neutron-fwaas-tests':
ensure => present,
name => $::tempest::params::python_fwaas_tests,
tag => ['openstack', 'tempest-package'],
}
package { 'python-neutron-lbaas-tests':
ensure => present,
name => $::tempest::params::python_lbaas_tests,
tag => ['openstack', 'tempest-package'],
}
package { 'python-neutron-vpnaas-tests':
ensure => present,
name => $::tempest::params::python_vpnaas_tests,
tag => ['openstack', 'tempest-package'],
}
}
if $nova_available and $::tempest::params::python_nova_tests {
package { 'python-nova-tests':

View File

@ -21,6 +21,9 @@ class tempest::params {
$python_keystone_tests = 'python-keystone-tests'
$python_murano_tests = 'python-murano-tests'
$python_neutron_tests = 'python-neutron-tests'
$python_fwaas_tests = 'python-neutron-fwaas-tests'
$python_lbaas_tests = 'python-neutron-lbaas-tests'
$python_vpnaas_tests = 'python-neutron-vpnaas-tests'
$python_nova_tests = 'python-nova-tests'
$python_sahara_tests = 'python-sahara-tests'
$python_swift_tests = 'python-swift-tests'

View File

@ -278,10 +278,24 @@ describe 'tempest' do
:aodh_available => true }
end
describe "should install keystone tests package" do
describe "should install aodh tests package" do
it { expect { is_expected.to contain_package('python-aodh-tests') } }
end
end
context 'with when managing tests packages for neutron (optional service)' do
let :params do
{ :manage_tests_packages => true,
:neutron_available => true }
end
describe "should install neutron and *aas tests packages" do
it { expect { is_expected.to contain_package('python-neutron-tests') } }
it { expect { is_expected.to contain_package('python-neutron-fwaas-tests') } }
it { expect { is_expected.to contain_package('python-neutron-lbaas-tests') } }
it { expect { is_expected.to contain_package('python-neutron-vpnaas-tests') } }
end
end
end