X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fkeystone%2Fspec%2Fclasses%2Fkeystone_roles_admin_spec.rb;h=f134d43dc00c5d7714ce337ee26b72e6b18c1636;hb=b0c5fa1bf27e28d72c80d56c0c84f7d301aaaac6;hp=ba7d53296a2ac115a11ad0bd48031d4e3fe7abad;hpb=b8fa2c1a5ec9dbcd1d2f9e9b41afdde4c603aa35;p=mirror%2Fdsa-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 ba7d53296..f134d43dc 100644
--- a/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
+++ b/3rdparty/modules/keystone/spec/classes/keystone_roles_admin_spec.rb
@@ -11,17 +11,17 @@ describe 'keystone::roles::admin' do
       }
     end
 
-    it { should contain_keystone_tenant('services').with(
+    it { is_expected.to contain_keystone_tenant('services').with(
       :ensure      => 'present',
       :enabled     => true,
       :description => 'Tenant for the openstack services'
     )}
-    it { should contain_keystone_tenant('openstack').with(
+    it { is_expected.to contain_keystone_tenant('openstack').with(
       :ensure      => 'present',
       :enabled     => true,
       :description => 'admin tenant'
     )}
-    it { should contain_keystone_user('admin').with(
+    it { is_expected.to contain_keystone_user('admin').with(
       :ensure                 => 'present',
       :enabled                => true,
       :tenant                 => 'openstack',
@@ -29,8 +29,8 @@ describe 'keystone::roles::admin' do
       :password               => 'ChangeMe',
       :ignore_default_tenant  => 'false'
     )}
-    it { should contain_keystone_role('admin').with_ensure('present') }
-    it { should contain_keystone_user_role('admin@openstack').with(
+    it { is_expected.to contain_keystone_role('admin').with_ensure('present') }
+    it { is_expected.to contain_keystone_user_role('admin@openstack').with(
       :roles  => ['admin'],
       :ensure => 'present'
     )}
@@ -53,17 +53,17 @@ describe 'keystone::roles::admin' do
       }
     end
 
-    it { should contain_keystone_tenant('foobar').with(
-      :ensure  => 'present',
-      :enabled => true,
+    it { is_expected.to contain_keystone_tenant('foobar').with(
+      :ensure      => 'present',
+      :enabled     => true,
       :description => 'foobar description'
     )}
-    it { should contain_keystone_tenant('admin').with(
+    it { is_expected.to contain_keystone_tenant('admin').with(
       :ensure      => 'present',
       :enabled     => true,
       :description => 'admin something else'
     )}
-    it { should contain_keystone_user('admin').with(
+    it { is_expected.to contain_keystone_user('admin').with(
       :ensure                 => 'present',
       :enabled                => true,
       :tenant                 => 'admin',
@@ -71,7 +71,7 @@ describe 'keystone::roles::admin' do
       :password               => 'foo',
       :ignore_default_tenant  => 'true'
     )}
-    it { should contain_keystone_user_role('admin@admin').with(
+    it { is_expected.to contain_keystone_user_role('admin@admin').with(
       :roles  => ['admin', 'heat_stack_owner'],
       :ensure => 'present'
     )}
@@ -86,8 +86,8 @@ describe 'keystone::roles::admin' do
         }
       end
 
-      it { should_not contain_keystone_user('keystone') }
-      it { should contain_keystone_user_role('keystone@openstack') }
+      it { is_expected.to_not contain_keystone_user('keystone') }
+      it { is_expected.to contain_keystone_user_role('keystone@openstack') }
     end
   end
 
@@ -95,14 +95,82 @@ 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
 
-      it { should_not contain_keystone_user('keystone') }
-      it { should_not contain_keystone_user_role('keystone@openstack') }
+      it { is_expected.to_not contain_keystone_user('keystone') }
+      it { is_expected.to_not contain_keystone_user_role('keystone@openstack') }
+    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