openstack/puppet-tempest
Code Issues Proposed changes

Renamed python-sahara-tests to python-sahara-tests-tempest

Browse Source 
* Since all the sahara tempest plugin code is moved to sahara-tests.
  In RDO, openstack-sahara-tests package provides python-sahara-tests-tempest
  which contains sahara tempest plugin. So we need to rename the package
  from python-sahara-tests to python-sahara-tests-tempest.

* Fixed python-horizon-tests-tempest package name typo in rspec

Change-Id: Ib556393e6c89fc11234e664d476cb0b6f2cac74f
This commit is contained in:
Chandan Kumar
2016-09-14 13:25:11 +05:30
parent 5d81f40301
commit 15d7524e97
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@@ -592,7 +592,7 @@ class tempest(
} }
} }
if $sahara_available and $::tempest::params::python_sahara_tests { if $sahara_available and $::tempest::params::python_sahara_tests {
package { 'python-sahara-tests': package { 'python-sahara-tests-tempest':
ensure => present, ensure => present,
name => $::tempest::params::python_sahara_tests, name => $::tempest::params::python_sahara_tests,
tag => ['openstack', 'tempest-package'], tag => ['openstack', 'tempest-package'],

2
manifests/params.pp
View File

@@ -29,7 +29,7 @@ class tempest::params {
$python_lbaas_tests = 'python-neutron-lbaas-tests' $python_lbaas_tests = 'python-neutron-lbaas-tests'
$python_vpnaas_tests = 'python-neutron-vpnaas-tests' $python_vpnaas_tests = 'python-neutron-vpnaas-tests'
$python_nova_tests = 'python-nova-tests' $python_nova_tests = 'python-nova-tests'
$python_sahara_tests = 'python-sahara-tests' $python_sahara_tests = 'python-sahara-tests-tempest'
$python_swift_tests = 'python-swift-tests' $python_swift_tests = 'python-swift-tests'
$python_trove_tests = 'python-trove-tests' $python_trove_tests = 'python-trove-tests'
$python_zaqar_tests = 'python-zaqar-tests' $python_zaqar_tests = 'python-zaqar-tests'

13
spec/classes/tempest_spec.rb
View File

@@ -336,6 +336,17 @@ describe 'tempest' do
end end
end end
context 'with when managing tests packages for sahara (optional service)' do
let :params do
{ :manage_tests_packages => true,
:sahara_available => true }
end
describe "should install sahara tests package" do
it { expect { is_expected.to contain_package('python-sahara-tests-tempest') } }
end
end
context 'with when managing tests packages for neutron (optional service)' do context 'with when managing tests packages for neutron (optional service)' do
let :params do let :params do
{ :manage_tests_packages => true, { :manage_tests_packages => true,
@@ -347,7 +358,7 @@ describe 'tempest' do
it { expect { is_expected.to contain_package('python-neutron-fwaas-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-lbaas-tests') } }
it { expect { is_expected.to contain_package('python-neutron-vpnaas-tests') } } it { expect { is_expected.to contain_package('python-neutron-vpnaas-tests') } }
it { expect { is_expected.to contain_package('python-horizon-tests') } } it { expect { is_expected.to contain_package('python-horizon-tests-tempest') } }
end end
end end
end end