unit tests: make Keystone_endpoint match service by name/type

Since a chance in puppet-keystone (1], we now match an endpoint with a
service name/type.
)
[1] http://git.openstack.org/cgit/openstack/puppet-keystone/commit/?id=0a4e06abb0f5b3f324464ff5219d2885816311ce

Closes-Bug: #1528308
Depends-On: I6e411d8f81c7ae5c768d85a236c0942d265c74dd
Change-Id: I7d4a41b8ac0e9992694ae5508b19187e07d752e4
(cherry picked from commit ee93d534214f5dc3c09a9f6bc3414ae44ab2d73b)

diff --git a/spec/classes/ceilometer_keystone_auth_spec.rb b/spec/classes/ceilometer_keystone_auth_spec.rb
index 649b55a24befb39026f4f5fc726aa24f3a165ac2..8701219cc004396d886623178af6a68a73df5607 100644 (file)
--- a/spec/classes/ceilometer_keystone_auth_spec.rb
+++ b/spec/classes/ceilometer_keystone_auth_spec.rb
@@ -43,15 +43,14 @@ describe 'ceilometer::keystone::auth' do
       end
 
       it 'configures ceilometer service' do
-        is_expected.to contain_keystone_service( default_params[:auth_name] ).with(
+        is_expected.to contain_keystone_service("#{default_params[:auth_name]}::#{default_params[:service_type]}").with(
           :ensure      => 'present',
-          :type        => default_params[:service_type],
           :description => 'Openstack Metering Service'
         )
       end
 
       it 'configure ceilometer endpoints' do
-        is_expected.to contain_keystone_endpoint("#{default_params[:region]}/#{default_params[:auth_name]}").with(
+        is_expected.to contain_keystone_endpoint("#{default_params[:region]}/#{default_params[:auth_name]}::#{default_params[:service_type]}").with(
           :ensure       => 'present',
           :public_url   => default_params[:public_url],
           :admin_url    => default_params[:admin_url],
@@ -90,15 +89,14 @@ describe 'ceilometer::keystone::auth' do
       end
 
       it 'configures ceilometer service' do
-        is_expected.to contain_keystone_service( params[:auth_name] ).with(
+        is_expected.to contain_keystone_service("#{params[:auth_name]}::#{params[:service_type]}").with(
           :ensure      => 'present',
-          :type        => params[:service_type],
           :description => 'Openstack Metering Service'
         )
       end
 
       it 'configure ceilometer endpoints' do
-        is_expected.to contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}").with(
+        is_expected.to contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}::#{params[:service_type]}").with(
           :ensure       => 'present',
           :public_url   => params[:public_url],
           :admin_url    => params[:admin_url],
@@ -110,7 +108,7 @@ describe 'ceilometer::keystone::auth' do
         before do
           params.delete!(:configure_endpoint)
           it 'does not configure ceilometer endpoints' do
-            is_expected.to_not contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}")
+            is_expected.to_not contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}::#{params[:service_type]}")
           end
         end
       end
@@ -127,12 +125,13 @@ describe 'ceilometer::keystone::auth' do
           :port              => '65001',
           :public_protocol   => 'https',
           :admin_protocol    => 'ftp',
-          :internal_protocol => 'gopher'
+          :internal_protocol => 'gopher',
+          :service_type      => 'metering',
         })
       end
 
       it 'configure ceilometer endpoints' do
-        is_expected.to contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}").with(
+        is_expected.to contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}::#{params[:service_type]}").with(
           :ensure       => 'present',
           :public_url   => "#{params[:public_protocol]}://#{params[:public_address]}:#{params[:port]}",
           :admin_url    => "#{params[:admin_protocol]}://#{params[:admin_address]}:#{params[:port]}",
@@ -154,10 +153,10 @@ describe 'ceilometer::keystone::auth' do
         is_expected.to contain_keystone_user_role('ceilometer@services')
       end
       it 'configures correct service name' do
-        is_expected.to contain_keystone_service('ceilometer_service')
+        is_expected.to contain_keystone_service('ceilometer_service::metering')
       end
       it 'configures correct endpoint name' do
-        is_expected.to contain_keystone_endpoint('RegionOne/ceilometer_service')
+        is_expected.to contain_keystone_endpoint('RegionOne/ceilometer_service::metering')
       end
     end
 
@@ -169,9 +168,8 @@ describe 'ceilometer::keystone::auth' do
       it { is_expected.to_not contain_keystone_user('ceilometer') }
       it { is_expected.to contain_keystone_user_role('ceilometer@services') }
 
-      it { is_expected.to contain_keystone_service('ceilometer').with(
-        :ensure => 'present',
-        :type        => 'metering',
+      it { is_expected.to contain_keystone_service('ceilometer::metering').with(
+        :ensure      => 'present',
         :description => 'Openstack Metering Service'
       )}
     end
@@ -187,9 +185,8 @@ describe 'ceilometer::keystone::auth' do
       it { is_expected.to_not contain_keystone_user('ceilometer') }
       it { is_expected.to_not contain_keystone_user_role('ceilometer@services') }
 
-      it { is_expected.to contain_keystone_service('ceilometer').with(
-        :ensure => 'present',
-        :type        => 'metering',
+      it { is_expected.to contain_keystone_service('ceilometer::metering').with(
+        :ensure      => 'present',
         :description => 'Openstack Metering Service'
       )}
     end