From 6efc36bd95fb811dee2a59d92d48fe48883d199f Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Mon, 26 Nov 2018 13:22:46 -0700
Subject: [PATCH] Update python packaging version for RHEL8

The novaclient is python3-novaclient for RHEL8

Change-Id: I4595f4a5dce28d40deb3bd1147a9804802d474a0
---
 manifests/params.pp                         |  3 +-
 spec/classes/nova_migration_libvirt_spec.rb | 56 ++++++-------------
 spec/classes/nova_scheduler_spec.rb         | 43 +++++++-------
 spec/classes/nova_serial_proxy_spec.rb      | 62 +++++++--------------
 spec/classes/nova_spicehtml5proxy_spec.rb   | 11 +++-
 spec/defines/nova_generic_service_spec.rb   |  2 +-
 spec/defines/nova_manage_networks_spec.rb   |  2 +-
 7 files changed, 69 insertions(+), 110 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index c4f220e3e..6cc306c50 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,7 +4,8 @@
 # should be considered to be constant
 class nova::params {
   include ::openstacklib::defaults
-  if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') {
+  if ($::os_package_type == 'debian') or ($::operatingsystem == 'Fedora') or
+     ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
     $pyvers = '3'
   } else {
     $pyvers = ''
diff --git a/spec/classes/nova_migration_libvirt_spec.rb b/spec/classes/nova_migration_libvirt_spec.rb
index d500d2340..827f874bb 100644
--- a/spec/classes/nova_migration_libvirt_spec.rb
+++ b/spec/classes/nova_migration_libvirt_spec.rb
@@ -217,44 +217,24 @@ describe 'nova::migration::libvirt' do
 
   end
 
-  # TODO (degorenko): switch to on_supported_os function when we got Xenial
-  context 'on Debian platforms with Ubuntu release 16' do
-    let :facts do
-      @default_facts.merge({
-        :osfamily => 'Debian',
-        :operatingsystem => 'Ubuntu',
-        :operatingsystemmajrelease => '16'
-      })
+  on_supported_os({
+    :supported_os => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts({ :os_workers => 5 }))
+      end
+
+      let (:platform_params) do
+        case facts[:osfamily]
+        when 'Debian'
+            it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => 'libvirtd_opts="-l"') }
+        when 'RedHat'
+            it { is_expected.to contain_file_line('/etc/sysconfig/libvirtd libvirtd args').with(:line => 'LIBVIRTD_ARGS="--listen"') }
+        end
+      end
+
+      it_configures 'nova migration with libvirt'
     end
-
-    it_configures 'nova migration with libvirt'
-    it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => 'libvirtd_opts="-l"') }
   end
-
-  context 'on Debian platforms release' do
-    let :facts do
-      @default_facts.merge({
-        :osfamily => 'Debian',
-        :operatingsystem => 'Debian',
-        :operatingsystemmajrelease => '8'
-      })
-    end
-
-    it_configures 'nova migration with libvirt'
-    it { is_expected.to contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => 'libvirtd_opts="-l"') }
-  end
-
-  context 'on RedHat platforms' do
-    let :facts do
-      @default_facts.merge({
-        :osfamily => 'RedHat',
-        :operatingsystem => 'CentOS',
-        :operatingsystemmajrelease => '7.0'
-      })
-    end
-
-    it_configures 'nova migration with libvirt'
-    it { is_expected.to contain_file_line('/etc/sysconfig/libvirtd libvirtd args').with(:line => 'LIBVIRTD_ARGS="--listen"') }
-  end
-
 end
diff --git a/spec/classes/nova_scheduler_spec.rb b/spec/classes/nova_scheduler_spec.rb
index c374ef3d2..697467db3 100644
--- a/spec/classes/nova_scheduler_spec.rb
+++ b/spec/classes/nova_scheduler_spec.rb
@@ -95,30 +95,27 @@ describe 'nova::scheduler' do
 
   end
 
-  context 'on Debian platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'Debian', :os_workers => 4 })
+  on_supported_os({
+    :supported_os => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts({ :os_workers => 4 }))
+      end
+
+      let (:platform_params) do
+        case facts[:osfamily]
+        when 'Debian'
+          { :scheduler_package_name => 'nova-scheduler',
+            :scheduler_service_name => 'nova-scheduler' }
+        when 'RedHat'
+          { :scheduler_package_name => 'openstack-nova-scheduler',
+            :scheduler_service_name => 'openstack-nova-scheduler' }
+        end
+      end
+
+      it_configures 'nova-scheduler'
     end
-
-    let :platform_params do
-      { :scheduler_package_name => 'nova-scheduler',
-        :scheduler_service_name => 'nova-scheduler' }
-    end
-
-    it_configures 'nova-scheduler'
-  end
-
-  context 'on Redhat platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat', :os_workers => 4 })
-    end
-
-    let :platform_params do
-      { :scheduler_package_name => 'openstack-nova-scheduler',
-        :scheduler_service_name => 'openstack-nova-scheduler' }
-    end
-
-    it_configures 'nova-scheduler'
   end
 
 end
diff --git a/spec/classes/nova_serial_proxy_spec.rb b/spec/classes/nova_serial_proxy_spec.rb
index 50b82d66d..ced6be493 100644
--- a/spec/classes/nova_serial_proxy_spec.rb
+++ b/spec/classes/nova_serial_proxy_spec.rb
@@ -48,50 +48,26 @@ describe 'nova::serialproxy' do
     end
   end
 
-  context 'on Ubuntu system' do
-    let :facts do
-      @default_facts.merge({
-        :osfamily        => 'Debian',
-        :operatingsystem => 'Ubuntu'
-      })
+  on_supported_os({
+    :supported_os => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts({}))
+      end
+
+      let (:platform_params) do
+        case facts[:osfamily]
+        when 'Debian'
+          { :serialproxy_package_name => 'nova-serialproxy',
+            :serialproxy_service_name => 'nova-serialproxy' }
+        when 'RedHat'
+          { :serialproxy_package_name => 'openstack-nova-serialproxy',
+            :serialproxy_service_name => 'openstack-nova-serialproxy' }
+        end
+      end
+      it_configures 'nova-serialproxy'
     end
-
-    let :platform_params do
-      { :serialproxy_package_name => 'nova-serialproxy',
-        :serialproxy_service_name => 'nova-serialproxy' }
-    end
-
-    it_configures 'nova-serialproxy'
-  end
-
-  context 'on Debian system' do
-    let :facts do
-     @default_facts.merge({
-       :osfamily                  => 'Debian',
-       :operatingsystem           => 'Debian',
-       :operatingsystemmajrelease => '9'
-      })
-    end
-
-    let :platform_params do
-      { :serialproxy_package_name => 'nova-serialproxy',
-        :serialproxy_service_name => 'nova-serialproxy' }
-    end
-
-    it_configures 'nova-serialproxy'
-  end
-
-  context 'on Redhat platforms' do
-    let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
-    end
-
-    let :platform_params do
-      { :serialproxy_package_name => 'openstack-nova-serialproxy',
-        :serialproxy_service_name => 'openstack-nova-serialproxy' }
-    end
-
-    it_configures 'nova-serialproxy'
   end
 
 end
diff --git a/spec/classes/nova_spicehtml5proxy_spec.rb b/spec/classes/nova_spicehtml5proxy_spec.rb
index 5ad851ff5..7c0903a6d 100644
--- a/spec/classes/nova_spicehtml5proxy_spec.rb
+++ b/spec/classes/nova_spicehtml5proxy_spec.rb
@@ -66,6 +66,7 @@ describe 'nova::spicehtml5proxy' do
         :osfamily        => 'Debian',
         :operatingsystem => 'Ubuntu',
         :os_package_type => 'ubuntu',
+        :os => { :family => 'Debian', :release => { :major => '16'}}
       })
     end
 
@@ -83,7 +84,8 @@ describe 'nova::spicehtml5proxy' do
         :osfamily                  => 'Debian',
         :operatingsystem           => 'Debian',
         :operatingsystemmajrelease => '9',
-        :os_package_type           => 'debian'
+        :os_package_type           => 'debian',
+        :os => { :family => 'Debian', :release => { :major => '9'}}
       })
     end
 
@@ -101,7 +103,8 @@ describe 'nova::spicehtml5proxy' do
       @default_facts.merge({
         :osfamily        => 'Debian',
         :operatingsystem => 'Ubuntu',
-        :os_package_type => 'debian'
+        :os_package_type => 'debian',
+        :os => { :family => 'Debian', :release => { :major => '16'}}
       })
     end
 
@@ -117,7 +120,9 @@ describe 'nova::spicehtml5proxy' do
 
   context 'on Redhat platforms' do
     let :facts do
-      @default_facts.merge({ :osfamily => 'RedHat' })
+      @default_facts.merge({ :osfamily => 'RedHat',
+        :os => { :family => 'RedHat', :release => { :major => '7'}}
+      })
     end
 
     let :platform_params do
diff --git a/spec/defines/nova_generic_service_spec.rb b/spec/defines/nova_generic_service_spec.rb
index c5ce7ce38..b78b77338 100644
--- a/spec/defines/nova_generic_service_spec.rb
+++ b/spec/defines/nova_generic_service_spec.rb
@@ -14,7 +14,7 @@ describe 'nova::generic_service' do
     end
 
     let :facts do
-      @default_facts.merge({ :osfamily => 'Debian' })
+      @default_facts.merge({ :osfamily => 'RedHat', :os => { :family => 'RedHat', :release => { :major => '8'}}})
     end
 
     let :title do
diff --git a/spec/defines/nova_manage_networks_spec.rb b/spec/defines/nova_manage_networks_spec.rb
index 338a7e3c1..519d79799 100644
--- a/spec/defines/nova_manage_networks_spec.rb
+++ b/spec/defines/nova_manage_networks_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'nova::manage::network' do
 
   let :facts do
-    @default_facts.merge({:osfamily => 'RedHat'})
+    @default_facts.merge({ :osfamily => 'RedHat', :os => { :family => 'RedHat', :release => { :major => '8'}}})
   end
 
   let :pre_condition do