Merge "Rebranding of Eqlx to Dell EMC PS Series"

2 files changed, 15 insertions, 15 deletions

diff --git a/spec/classes/tripleo_profile_base_cinder_volume_eqlx_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_dellps_spec.rb
index 1a188aa..313b87c 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_eqlx_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_dellps_spec.rb
@@ -16,8 +16,8 @@
 
 require 'spec_helper'
 
-describe 'tripleo::profile::base::cinder::volume::eqlx' do
-  shared_examples_for 'tripleo::profile::base::cinder::volume::eqlx' do
+describe 'tripleo::profile::base::cinder::volume::dellps' do
+  shared_examples_for 'tripleo::profile::base::cinder::volume::dellps' do
     before :each do
       facts.merge!({ :step => params[:step] })
     end
@@ -26,10 +26,10 @@ describe 'tripleo::profile::base::cinder::volume::eqlx' do
       let(:params) { { :step => 3 } }
 
       it 'should do nothing' do
-        is_expected.to contain_class('tripleo::profile::base::cinder::volume::eqlx')
+        is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellps')
         is_expected.to contain_class('tripleo::profile::base::cinder::volume')
         is_expected.to contain_class('tripleo::profile::base::cinder')
-        is_expected.to_not contain_cinder__backend__eqlx('tripleo_eqlx')
+        is_expected.to_not contain_cinder__backend__eqlx('tripleo_dellps')
       end
     end
 
@@ -40,7 +40,7 @@ describe 'tripleo::profile::base::cinder::volume::eqlx' do
 
       it 'should trigger complete configuration' do
         # TODO(aschultz): check hiera parameters
-        is_expected.to contain_cinder__backend__eqlx('tripleo_eqlx')
+        is_expected.to contain_cinder__backend__eqlx('tripleo_dellps')
       end
     end
   end
@@ -52,7 +52,7 @@ describe 'tripleo::profile::base::cinder::volume::eqlx' do
         facts.merge({ :hostname => 'node.example.com' })
       end
 
-      it_behaves_like 'tripleo::profile::base::cinder::volume::eqlx'
+      it_behaves_like 'tripleo::profile::base::cinder::volume::dellps'
     end
   end
 end
diff --git a/spec/classes/tripleo_profile_base_cinder_volume_spec.rb b/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
index e0ec9de..f4501c8 100644
--- a/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_volume_spec.rb
@@ -74,21 +74,21 @@ describe 'tripleo::profile::base::cinder::volume' do
         end
       end
 
-      context 'with only eqlx' do
+      context 'with only dellps' do
         before :each do
           params.merge!({
-            :cinder_enable_eqlx_backend => true,
+            :cinder_enable_dellps_backend => true,
             :cinder_enable_iscsi_backend  => false,
           })
         end
-        it 'should configure only eqlx' do
-          is_expected.to contain_class('tripleo::profile::base::cinder::volume::eqlx')
+        it 'should configure only dellps' do
+          is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellps')
           is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::iscsi')
           is_expected.to contain_class('tripleo::profile::base::cinder::volume')
           is_expected.to contain_class('tripleo::profile::base::cinder')
           is_expected.to contain_class('cinder::volume')
           is_expected.to contain_class('cinder::backends').with(
-            :enabled_backends => ['tripleo_eqlx']
+            :enabled_backends => ['tripleo_dellps']
           )
         end
       end
@@ -160,7 +160,7 @@ describe 'tripleo::profile::base::cinder::volume' do
         it 'should configure only user backend' do
           is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::iscsi')
           is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellsc')
-          is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::eqlx')
+          is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellps')
           is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::netapp')
           is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::nfs')
           is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::rbd')
@@ -178,7 +178,7 @@ describe 'tripleo::profile::base::cinder::volume' do
           params.merge!({
             :cinder_enable_iscsi_backend  => true,
             :cinder_enable_dellsc_backend => true,
-            :cinder_enable_eqlx_backend => true,
+            :cinder_enable_dellps_backend => true,
             :cinder_enable_netapp_backend => true,
             :cinder_enable_nfs_backend => true,
             :cinder_enable_rbd_backend => true,
@@ -187,7 +187,7 @@ describe 'tripleo::profile::base::cinder::volume' do
         it 'should configure all backends' do
           is_expected.to contain_class('tripleo::profile::base::cinder::volume::iscsi')
           is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellsc')
-          is_expected.to contain_class('tripleo::profile::base::cinder::volume::eqlx')
+          is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellps')
           is_expected.to contain_class('tripleo::profile::base::cinder::volume::netapp')
           is_expected.to contain_class('tripleo::profile::base::cinder::volume::nfs')
           is_expected.to contain_class('tripleo::profile::base::cinder::volume::rbd')
@@ -195,7 +195,7 @@ describe 'tripleo::profile::base::cinder::volume' do
           is_expected.to contain_class('tripleo::profile::base::cinder')
           is_expected.to contain_class('cinder::volume')
           is_expected.to contain_class('cinder::backends').with(
-            :enabled_backends => ['tripleo_iscsi', 'tripleo_ceph', 'tripleo_eqlx',
+            :enabled_backends => ['tripleo_iscsi', 'tripleo_ceph', 'tripleo_dellps', 
                                   'tripleo_dellsc', 'tripleo_netapp','tripleo_nfs']
           )
         end