From f74e9b84fb292a66de171fbf735bfb0e9e2e324a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 1 Apr 2020 15:57:52 +0900 Subject: [PATCH] Refactor os distro/version check in client ut ... so that we can easilty understand which distro and which version we expect python3 packages. Change-Id: I385a4a5b123519961791ef6d842ab84990ea00c9 --- .../openstacklib_openstackclient_spec.rb | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/spec/classes/openstacklib_openstackclient_spec.rb b/spec/classes/openstacklib_openstackclient_spec.rb index 29b984a4..f6c5d490 100644 --- a/spec/classes/openstacklib_openstackclient_spec.rb +++ b/spec/classes/openstacklib_openstackclient_spec.rb @@ -32,15 +32,20 @@ describe 'openstacklib::openstackclient' do end let(:platform_params) do - if facts[:osfamily] == 'Debian' or (facts[:os_package_type] == 'rpm' \ - and facts[:operatingsystemrelease].to_i > 7) then - openstackclient_package_name = 'python3-openstackclient' - else - openstackclient_package_name = 'python-openstackclient' + case facts[:osfamily] + when 'Debian' + { :openstackclient_package_name => 'python3-openstackclient' } + when 'RedHat' + if facts[:operatingsystem] == 'Fedora' + { :openstackclient_package_name => 'python3-openstackclient' } + else + if facts[:operatingsystemmajrelease] > '7' + { :openstackclient_package_name => 'python3-openstackclient' } + else + { :openstackclient_package_name => 'python-openstackclient' } + end + end end - { - :openstackclient_package_name => openstackclient_package_name - } end it_behaves_like 'openstacklib::openstackclient'