From: Scott Seago <sseago(a)redhat.com>
This updates role names to use the 1.0 product terminology (Application Blueprint, etc.)
---
src/db/seeds.rb | 42 +++++++++++++++++++-------------------
src/features/permission.feature | 6 ++--
src/spec/factories/permission.rb | 8 +++---
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/db/seeds.rb b/src/db/seeds.rb
index 0d04802..e3533cd 100644
--- a/src/db/seeds.rb
+++ b/src/db/seeds.rb
@@ -36,20 +36,20 @@ roles =
{"Instance Controller" => [false, {Instance => [VIEW,USE]}],
"Instance Owner" => [true, {Instance => [VIEW,USE,MOD,
VPRM,GPRM]}]},
Deployment =>
- {"Deployment Controller" => [false, {Deployment => [VIEW,USE],
+ {"Application User" => [false, {Deployment => [VIEW,USE],
Instance => [VIEW]}],
- "Deployment Owner" => [true, {Deployment => [VIEW,USE,MOD,
VPRM,GPRM],
+ "Application Owner" => [true, {Deployment => [VIEW,USE,MOD,
VPRM,GPRM],
Instance => [VIEW,USE,MOD]}]},
PoolFamily =>
- {"Pool Family User" => [false, {Pool => [VIEW]}],
- "Pool Family Owner" => [true, {PoolFamily => [VIEW, MOD,
VPRM,GPRM],
+ {"Cloud User" => [false, {Pool => [VIEW]}],
+ "Cloud Owner" => [true, {PoolFamily => [VIEW, MOD,
VPRM,GPRM],
Pool => [VIEW,
MOD,CRE,VPRM,GPRM]}]},
Pool =>
- {"Pool User" => [false, {Pool => [VIEW],
+ {"Zone User" => [false, {Pool => [VIEW],
Instance => [ CRE],
Deployment => [ CRE],
Quota => [VIEW]}],
- "Pool Owner" => [true, {Pool => [VIEW, MOD,
VPRM,GPRM],
+ "Zone Owner" => [true, {Pool => [VIEW, MOD,
VPRM,GPRM],
Instance => [VIEW,USE,MOD,CRE],
Deployment => [VIEW,USE,MOD,CRE],
Quota => [VIEW]}]},
@@ -63,25 +63,25 @@ roles =
{"Catalog User" => [false, {Catalog => [VIEW, USE]}],
"Catalog Administrator" => [true, {Catalog =>
[VIEW,USE,MOD,VPRM,GPRM]}]},
Deployable =>
- {"Deployable User" => [false, {Deployable =>
[VIEW,USE]}],
- "Deployable Owner" => [true, {Deployable =>
[VIEW,USE,MOD,VPRM,GPRM]}]},
+ {"Application Blueprint User" => [false, {Deployable =>
[VIEW,USE]}],
+ "Application Blueprint Owner" => [true, {Deployable =>
[VIEW,USE,MOD,VPRM,GPRM]}]},
BasePermissionObject =>
{"Provider Creator" => [false, {Provider => [
CRE]}],
"Provider Administrator" => [false, {Provider => [VIEW,
MOD,CRE,VPRM,GPRM],
ProviderAccount =>
[VIEW,USE,MOD,CRE,VPRM,GPRM]}],
- "HWP Administrator" => [false, {HardwareProfile => [VIEW,
MOD,CRE,VPRM,GPRM]}],
- "Realm Administrator" => [false, {Realm => [
USE,MOD,CRE,VPRM,GPRM]}],
- "Pool Creator" => [false, {Pool => [
CRE]}],
- "Pool Administrator" => [false, {Pool => [VIEW,
MOD,CRE,VPRM,GPRM],
+ "Profile Administrator" => [false, {HardwareProfile => [VIEW,
MOD,CRE,VPRM,GPRM]}],
+ "Cluster Administrator" => [false, {Realm => [
USE,MOD,CRE,VPRM,GPRM]}],
+ "Zone Creator" => [false, {Pool => [
CRE]}],
+ "Zone Administrator" => [false, {Pool => [VIEW,
MOD,CRE,VPRM,GPRM],
Instance =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
Deployment =>
[VIEW,USE,MOD,CRE,VPRM,GPRM],
Quota => [VIEW, MOD],
PoolFamily => [VIEW,
MOD,CRE,VPRM,GPRM]}],
- "Deployable Administrator" => [false, {Deployable =>
[VIEW,USE,MOD,CRE,VPRM,GPRM]}],
- "Deployable Global User" => [false, {Deployable=> [VIEW,USE]}],
- "Catalog Global User" => [false, {Catalog => [VIEW,USE]}],
- "HWP Global User" => [false, {HardwareProfile => [VIEW,USE]}],
- "Pool Global User" => [false, {Pool =>
[VIEW],
+ "Application Blueprint Administrator" => [false, {Deployable =>
[VIEW,USE,MOD,CRE,VPRM,GPRM]}],
+ "Application Blueprint Global User" => [false, {Deployable=>
[VIEW,USE]}],
+ "Catalog Global User" => [false, {Catalog => [VIEW,USE]}],
+ "Profile Global User" => [false, {HardwareProfile =>
[VIEW,USE]}],
+ "Zone Global User" => [false, {Pool =>
[VIEW],
Instance => [
CRE],
Deployment => [
CRE],
Quota => [VIEW]}],
@@ -122,11 +122,11 @@ MetadataObject.set("default_pool_family",
PoolFamily.find_by_name('default'))
default_quota = Quota.create
default_pool = Pool.find_by_name("Default")
-default_role = Role.find_by_name("Pool User")
-default_deployable_role = Role.find_by_name("Deployable Global User")
-default_pool_global_user_role = Role.find_by_name("Pool Global User")
+default_role = Role.find_by_name("Zone User")
+default_deployable_role = Role.find_by_name("Application Blueprint Global
User")
+default_pool_global_user_role = Role.find_by_name("Zone Global User")
default_catalog_global_user_role = Role.find_by_name("Catalog Global User")
-default_hwp_global_user_role = Role.find_by_name("HWP Global User")
+default_hwp_global_user_role = Role.find_by_name("Profile Global User")
settings = {"allow_self_service_logins" => "true",
"self_service_default_quota" => default_quota,
diff --git a/src/features/permission.feature b/src/features/permission.feature
index 33006d2..028bd11 100644
--- a/src/features/permission.feature
+++ b/src/features/permission.feature
@@ -16,7 +16,7 @@ Feature: Manage Permissions
When I follow "Grant Access"
Then I should be on the new permission page
And I should see "Choose roles for users"
- When I select "Pool User" role for the user "testuser"
+ When I select "Zone User" role for the user "testuser"
And I press "Grant Access"
Then I should be on the page for the pool "PermissionPool"
And I should see "Added the following User Roles"
@@ -29,7 +29,7 @@ Feature: Manage Permissions
When I follow "Grant Access"
Then I should be on the new permission page
And I should see "Choose roles for users"
- When I select "Pool Owner" role for the user "testuser"
+ When I select "Zone Owner" role for the user "testuser"
And I press "Grant Access"
Then I should be on the page for the pool "PermissionPool"
And I should see "Added the following User Roles"
@@ -42,7 +42,7 @@ Feature: Manage Permissions
When I follow "Grant Access"
Then I should be on the new permission page
And I should see "Choose roles for users"
- When I select "Pool User" role for the user "testuser"
+ When I select "Zone User" role for the user "testuser"
And I press "Grant Access"
Then I should be on the page for the pool "PermissionPool"
And I should see "Could not add these User Roles"
diff --git a/src/spec/factories/permission.rb b/src/spec/factories/permission.rb
index 1a1f025..7f9654a 100644
--- a/src/spec/factories/permission.rb
+++ b/src/spec/factories/permission.rb
@@ -33,25 +33,25 @@ FactoryGirl.define do
end
factory :pool_creator_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?', 'Pool Creator'])
|| FactoryGirl.create(:role, :name => 'Pool Creator') }
+ role { |r| Role.first(:conditions => ['name = ?', 'Zone Creator'])
|| FactoryGirl.create(:role, :name => 'Zone Creator') }
permission_object { |r| BasePermissionObject.general_permission_scope }
user { |r| r.association(:pool_creator_user) }
end
factory :pool_user_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?', 'Pool User']) ||
FactoryGirl.create(:role, :name => 'Pool User') }
+ role { |r| Role.first(:conditions => ['name = ?', 'Zone User']) ||
FactoryGirl.create(:role, :name => 'Zone User') }
permission_object { |r| r.association(:pool) }
user { |r| r.association(:pool_user) }
end
factory :pool_user2_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?', 'Pool User']) ||
FactoryGirl.create(:role, :name => 'Pool User') }
+ role { |r| Role.first(:conditions => ['name = ?', 'Zone User']) ||
FactoryGirl.create(:role, :name => 'Zone User') }
permission_object { |r| r.association(:pool) }
user { |r| r.association(:pool_user2) }
end
factory :pool_family_user_permission, :parent => :permission do
- role { |r| Role.first(:conditions => ['name = ?', 'Pool Family
User']) || FactoryGirl.create(:role, :name => 'Pool Family User') }
+ role { |r| Role.first(:conditions => ['name = ?', 'Cloud User'])
|| FactoryGirl.create(:role, :name => 'Cloud User') }
permission_object { |r| r.association(:pool_family) }
user { |r| r.association(:pool_family_user) }
end
--
1.7.6.5