X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=3rdparty%2Fmodules%2Fkeystone%2Fspec%2Fclasses%2Fkeystone_roles_admin_spec.rb;fp=3rdparty%2Fmodules%2Fkeystone%2Fspec%2Fclasses%2Fkeystone_roles_admin_spec.rb;h=f134d43dc00c5d7714ce337ee26b72e6b18c1636;hb=2dc39f2a756f82040d82cba324b21f44fad8ef3f;hp=bbd6d953b8316995b7514cdf445521da5b808f1d;hpb=d4b6110c989169c702f039a4c7dc1b309685bba3;p=dsa-puppet.git

diff --git a/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb b/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
index bbd6d953..f134d43d 100644
--- a/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
+++ b/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
@@ -54,8 +54,8 @@ describe 'keystone::roles::admin' do
     end
 
     it { is_expected.to contain_keystone_tenant('foobar').with(
-      :ensure  => 'present',
-      :enabled => true,
+      :ensure      => 'present',
+      :enabled     => true,
       :description => 'foobar description'
     )}
     it { is_expected.to contain_keystone_tenant('admin').with(
@@ -95,8 +95,8 @@ describe 'keystone::roles::admin' do
     before do
       let :params do
         {
-          :configure_user       => false,
-          :configure_user_role  => false
+          :configure_user      => false,
+          :configure_user_role => false
         }
       end
 
@@ -105,4 +105,72 @@ describe 'keystone::roles::admin' do
     end
   end
 
+  describe 'when specifying admin_user_domain and admin_project_domain' do
+    let :params do
+      {
+        :email                => 'foo@bar',
+        :password             => 'ChangeMe',
+        :admin_tenant         => 'admin_tenant',
+        :admin_user_domain    => 'admin_user_domain',
+        :admin_project_domain => 'admin_project_domain',
+      }
+    end
+    it { is_expected.to contain_keystone_user('admin').with(
+      :domain => 'admin_user_domain',
+      :tenant => 'admin_tenant'
+    )}
+    it { is_expected.to contain_keystone_tenant('admin_tenant').with(:domain => 'admin_project_domain') }
+    it { is_expected.to contain_keystone_domain('admin_user_domain') }
+    it { is_expected.to contain_keystone_domain('admin_project_domain') }
+
+  end
+
+  describe 'when specifying admin_user_domain and admin_project_domain' do
+    let :params do
+      {
+        :email                => 'foo@bar',
+        :password             => 'ChangeMe',
+        :admin_tenant         => 'admin_tenant::admin_project_domain',
+        :admin_user_domain    => 'admin_user_domain',
+        :admin_project_domain => 'admin_project_domain',
+      }
+    end
+    it { is_expected.to contain_keystone_user('admin').with(
+      :domain => 'admin_user_domain',
+      :tenant => 'admin_tenant::admin_project_domain'
+    )}
+    it { is_expected.to contain_keystone_tenant('admin_tenant::admin_project_domain').with(:domain => 'admin_project_domain') }
+    it { is_expected.to contain_keystone_domain('admin_user_domain') }
+    it { is_expected.to contain_keystone_domain('admin_project_domain') }
+
+  end
+
+  describe 'when specifying a service domain' do
+    let :params do
+      {
+        :email                  => 'foo@bar',
+        :password               => 'ChangeMe',
+        :service_tenant         => 'service_project',
+        :service_project_domain => 'service_domain'
+      }
+    end
+    it { is_expected.to contain_keystone_tenant('service_project').with(:domain => 'service_domain') }
+    it { is_expected.to contain_keystone_domain('service_domain') }
+
+  end
+
+  describe 'when specifying a service domain and service tenant domain' do
+    let :params do
+      {
+        :email                  => 'foo@bar',
+        :password               => 'ChangeMe',
+        :service_tenant         => 'service_project::service_domain',
+        :service_project_domain => 'service_domain'
+      }
+    end
+    it { is_expected.to contain_keystone_tenant('service_project::service_domain').with(:domain => 'service_domain') }
+    it { is_expected.to contain_keystone_domain('service_domain') }
+
+  end
+
 end