Cleanup rspec tests of nova::scheduler

Change-Id: Ie072c21606dd509bf64d764f6efd3ebabe9f857a

spec/classes/nova_scheduler_spec.rb

@@ -6,51 +6,25 @@ describe 'nova::scheduler' do
     'include nova'
   end
 
-  describe 'on debian platforms' do
+  context 'on Debian platforms' do
     let :facts do
       { :osfamily => 'Debian' }
     end
-    it { should contain_service('nova-scheduler').with(
+
-      'name'      => 'nova-scheduler',
+    it_behaves_like 'generic nova service', {
-      'ensure'    => 'stopped',
+      :name         => 'nova-scheduler',
-      'hasstatus' => true,
+      :package_name => 'nova-scheduler',
-      'enable'    => false
+      :service_name => 'nova-scheduler' }
-    )}
-    it { should contain_package('nova-scheduler').with(
-      'name'   => 'nova-scheduler',
-      'ensure' => 'present',
-      'notify' => 'Service[nova-scheduler]'
-    ) }
-    describe 'with enabled as true' do
-      let :params do
-        {:enabled => true}
-      end
-    it { should contain_service('nova-scheduler').with(
-      'name'      => 'nova-scheduler',
-      'ensure'    => 'running',
-      'hasstatus' => true,
-      'enable'    => true
-    )}
-    end
-    describe 'with package version' do
-      let :params do
-        {:ensure_package => '2012.1-2'}
-      end
-      it { should contain_package('nova-scheduler').with(
-        'ensure' => '2012.1-2'
-      )}
-    end
   end
-  describe 'on rhel' do
+
+  context 'on RedHat platforms' do
     let :facts do
       { :osfamily => 'RedHat' }
     end
-    it { should contain_service('nova-scheduler').with(
+
-      'name'      => 'openstack-nova-scheduler',
+    it_behaves_like 'generic nova service', {
-      'ensure'    => 'stopped',
+      :name         => 'nova-scheduler',
-      'hasstatus' => true,
+      :package_name => 'openstack-nova-scheduler',
-      'enable'    => false
+      :service_name => 'openstack-nova-scheduler' }
-    )}
-    it { should contain_package('nova-scheduler').with_name('openstack-nova-scheduler') }
   end
 end