deltacloud-devel March 2010

deltacloud-devel@lists.fedorahosted.org

15 participants
103 discussions

[PATCH portal] Make a temporary usable nav.
by jason.guiditta 17 Mar '10

17 Mar '10

Tried to do this in a way that some of the convenience methods I add here will be useful in the new design as well. --- src/app/controllers/application_controller.rb | 10 ++++++- src/app/models/permissioned_object.rb | 15 ++++++++++ src/app/services/application_service.rb | 7 ++++ src/app/views/layouts/_main_nav.html.erb | 38 ++++++++++++++---------- src/public/stylesheets/dcloud.css | 9 +++-- 5 files changed, 58 insertions(+), 21 deletions(-) diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 63d908f..d6db0f6 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -48,7 +48,15 @@ class ApplicationController < ActionController::Base end def get_nav_items - @providers = Provider.find(:all) + if !current_user.nil? + if is_admin?(@current_user) + @providers = Provider.all + @pools = PortalPool.all + else + @providers = Provider.list_for_user(@current_user, Privilege::PROVIDER_VIEW) + @pools = PortalPool.list_for_user(@current_user, Privilege::POOL_VIEW) + end + end end perm_helper_string = "" diff --git a/src/app/models/permissioned_object.rb b/src/app/models/permissioned_object.rb index e4efaad..8b9a1e4 100644 --- a/src/app/models/permissioned_object.rb +++ b/src/app/models/permissioned_object.rb @@ -80,4 +80,19 @@ module PermissionedObject { :user => user.id, :priv => privilege }]) end + + # Any methods here will be able to use the context of the + # ActiveRecord model the module is included in. + def self.included(base) + base.class_eval do + def self.list_for_user(user, privilege) + find(:all, :include => {:permissions => {:role => :privileges}}, + :conditions => ["permissions.user_id=:user and + privileges.name=:priv", + {:user => user.id, + :priv => privilege }]) + end + end + end + end diff --git a/src/app/services/application_service.rb b/src/app/services/application_service.rb index e2c45cb..ce774c6 100644 --- a/src/app/services/application_service.rb +++ b/src/app/services/application_service.rb @@ -55,4 +55,11 @@ module ApplicationService 'You have insufficient privileges to perform action.') end end + + def is_admin?(user) + p = Permission.first(:include => :role, + :conditions => ["roles.name =:role and permissions.user_id=:user", + {:role => "Administrator", :user => user.id}]) + p.nil? ? false : true + end end diff --git a/src/app/views/layouts/_main_nav.html.erb b/src/app/views/layouts/_main_nav.html.erb index 18ee43a..1894cb4 100644 --- a/src/app/views/layouts/_main_nav.html.erb +++ b/src/app/views/layouts/_main_nav.html.erb @@ -1,8 +1,13 @@ +<%=link_to "Add a provider", {:controller => "provider", :action => "new"}, :class => "actionlink" %> + +<%=link_to "Add a pool", {:controller => "portal_pool", :action => "new"}, :class => "actionlink" %> +<h3>Providers</h3> <ul id="providers"> - <% curId = params[:id].to_i %> + <% cur_id = params[:id].to_i %> + <% if !(a)providers.nil? %> <% @providers.each { |provider| %> <%#Note that this is a temporary way to selected proper list item for demo, and is not expected to stay this way%> - <% if controller.controller_name == "provider" && provider.id == curId + <% if controller.controller_name == "provider" && provider.id == cur_id selected_provider = "selected" else selected_provider = "" @@ -10,20 +15,21 @@ <li><%= link_to provider.name, {:controller => "provider", :action => "show", :id => provider}, :class => "providername #{selected_provider}"%> - <% provider.portal_pools.each { |pool| %> - <ul id="portal_pool-<%=provider.id%>"> - <% if controller.controller_name == "portal_pool" && pool.id == curId - selected_pool = "selected" - else selected_pool = "" - end %> - <li><%= link_to pool.name, - {:controller => "portal_pool", :action => "show", :id => pool}, - :class => "poolname #{selected_pool}" %></li> - </ul> - <% } %> </li> <% } %> + <% end %> </ul> -<%=link_to "Add a provider", {:controller => "provider", :action => "new"}, :class => "actionlink" %> - -<%=link_to "Add a pool", {:controller => "portal_pool", :action => "new"}, :class => "actionlink" %> +<h3>Pools</h3> +<ul id="portal_pools"> + <% if !(a)pools.nil? %> + <% @pools.each { |pool| %> + <% if controller.controller_name == "portal_pool" && pool.id == cur_id + selected_pool = "selected" + else selected_pool = "" + end %> + <li><%= link_to pool.name, + {:controller => "portal_pool", :action => "show", :id => pool}, + :class => "poolname #{selected_pool}" %></li> + <% } %> + <% end %> +</ul> \ No newline at end of file diff --git a/src/public/stylesheets/dcloud.css b/src/public/stylesheets/dcloud.css index 96cb95c..5b68ab6 100644 --- a/src/public/stylesheets/dcloud.css +++ b/src/public/stylesheets/dcloud.css @@ -210,24 +210,25 @@ ul#providers li a:hover { background: #efefef; } -ul#providers li ul { +ul#portal_pools { list-style-type: none; line-height: 36px; margin: 0; padding: 0 0 0 10px; } -ul#providers li ul li { +ul#portal_pools li { border-bottom: none; } -ul#providers li ul li a { +ul#portal_pools li a { + display: block; line-height: 36px; padding-left: 32px; border-bottom: none; } -ul#providers li ul li a:hover { +ul#portal_pools li a:hover { background: #efefef url(../images/icon_vmpool.png) no-repeat 2px 50%; } -- 1.6.6.1

1 0

[PATCH] spec fixes and updates
by Mo Morsi 17 Mar '10

17 Mar '10

Please Be Sure To Run Both 'rake spec' and 'rake cucumber' Before _every_ Patch Submitted and/or Committed --- src/app/models/provider.rb | 1 - .../controllers/portal_pool_controller_spec.rb | 5 +-- src/spec/controllers/provider_controller_spec.rb | 1 - .../controllers/user_sessions_controller_spec.rb | 4 +- src/spec/factories/base_portal_object.rb | 3 -- src/spec/factories/permission.rb | 19 ++++++++++----- src/spec/factories/privilege.rb | 14 ----------- src/spec/factories/provider.rb | 2 +- src/spec/factories/role.rb | 24 -------------------- src/spec/factories/user.rb | 10 +------ src/spec/fixtures/base_portal_objects.yml | 2 + src/spec/fixtures/roles.yml | 24 +++++++++++++------ 12 files changed, 38 insertions(+), 71 deletions(-) delete mode 100644 src/spec/factories/base_portal_object.rb delete mode 100644 src/spec/factories/privilege.rb delete mode 100644 src/spec/factories/role.rb create mode 100644 src/spec/fixtures/base_portal_objects.yml diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index 1170488..70051e5 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -79,7 +79,6 @@ class Provider < ActiveRecord::Base def validate if !nil_or_empty(url) errors.add("url", "must be a valid provider url") unless valid_framework? - puts errors.inspect end end diff --git a/src/spec/controllers/portal_pool_controller_spec.rb b/src/spec/controllers/portal_pool_controller_spec.rb index d409c3a..bc01a31 100644 --- a/src/spec/controllers/portal_pool_controller_spec.rb +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -21,13 +21,12 @@ describe PortalPoolController do end it "should provider means to create new pool" do - @instance_creator = Factory :instance_creator - UserSession.create(@admin) lambda do post :create, :portal_pool => { :name => 'foopool' } end.should change(PortalPool, :count).by(1) - response.should redirect_to('http://test.host/portal_pool/show/1') + id = PortalPool.find(:first, :conditions => ['name = ?', 'foopool']).id + response.should redirect_to("http://test.host/portal_pool/show/#{id}") end diff --git a/src/spec/controllers/provider_controller_spec.rb b/src/spec/controllers/provider_controller_spec.rb index ea67580..9015a00 100644 --- a/src/spec/controllers/provider_controller_spec.rb +++ b/src/spec/controllers/provider_controller_spec.rb @@ -3,7 +3,6 @@ require 'spec_helper' describe ProviderController do before(:each) do - Factory :base_portal_object @admin_permission = Factory :provider_admin_permission @provider = @admin_permission.permission_object @admin = @admin_permission.user diff --git a/src/spec/controllers/user_sessions_controller_spec.rb b/src/spec/controllers/user_sessions_controller_spec.rb index f2b80d5..1c0cfcc 100644 --- a/src/spec/controllers/user_sessions_controller_spec.rb +++ b/src/spec/controllers/user_sessions_controller_spec.rb @@ -16,14 +16,14 @@ describe UserSessionsController do end it "should create user session" do - post :create, :user_session => { :login => "tuser", :password => "secret" } + post :create, :user_session => { :login => @tuser.login, :password => "secret" } UserSession.find.should_not == nil @tuser.should == UserSession.find.user response.should redirect_to(account_path) end it "should destroy user session" do - post :create, :user_session => { :login => "tuser", :password => "secret" } + post :create, :user_session => { :login => @tuser.login, :password => "secret" } delete :destroy UserSession.find.should == nil response.should redirect_to(login_path) diff --git a/src/spec/factories/base_portal_object.rb b/src/spec/factories/base_portal_object.rb deleted file mode 100644 index af4c8bd..0000000 --- a/src/spec/factories/base_portal_object.rb +++ /dev/null @@ -1,3 +0,0 @@ -Factory.define :base_portal_object do |p| - p.name 'general_permission_scope' -end diff --git a/src/spec/factories/permission.rb b/src/spec/factories/permission.rb index 0e99f97..084ea4e 100644 --- a/src/spec/factories/permission.rb +++ b/src/spec/factories/permission.rb @@ -1,14 +1,21 @@ Factory.define :permission do |p| + p.after_build { |p| p.user.permissions << p } end Factory.define :admin_permission, :parent => :permission do |p| - p.role { |r| r.association(:admin_role) } - p.permission_object { |r| r.association(:base_portal_object) } - p.user { |r| r.association(:admin_user) } + p.role { |r| Role.find(:first, :conditions => ['name = ?', 'Administrator']) } + p.permission_object { |r| BasePortalObject.general_permission_scope } + p.user { |u| u.association(:admin_user) } end Factory.define :provider_admin_permission, :parent => :permission do |p| - p.role { |r| r.association(:provider_admin_role) } - p.permission_object { |r| r.association(:mock1) } - p.user { |r| r.association(:provider_admin_user) } + p.role { |r| Role.find(:first, :conditions => ['name = ?', 'Provider Administrator']) } + p.permission_object { |r| r.association(:mock_provider) } + p.user { |u| u.association(:provider_admin_user) } +end + +Factory.define :pool_creator_permission, :parent => :permission do |p| + p.role { |r| Role.find(:first, :conditions => ['name = ?', 'Pool Creator']) } + p.permission_object { |r| r.association(:mock_provider) } + p.user { |u| u.association(:pool_creator) } end diff --git a/src/spec/factories/privilege.rb b/src/spec/factories/privilege.rb deleted file mode 100644 index 46bdeb4..0000000 --- a/src/spec/factories/privilege.rb +++ /dev/null @@ -1,14 +0,0 @@ -Factory.define :privilege do |p| -end - -Factory.define :modify_pool_priv, :parent => :privilege do |p| - p.name 'pool_modify' -end - -Factory.define :modify_provider_priv, :parent => :privilege do |p| - p.name 'provider_modify' -end - -Factory.define :view_provider_priv, :parent => :privilege do |p| - p.name 'provider_view' -end diff --git a/src/spec/factories/provider.rb b/src/spec/factories/provider.rb index ae1abd2..921d54b 100644 --- a/src/spec/factories/provider.rb +++ b/src/spec/factories/provider.rb @@ -1,7 +1,7 @@ Factory.define :provider do |p| end -Factory.define :mock1, :parent => :provider do |p| +Factory.define :mock_provider, :parent => :provider do |p| p.name 'mock1' p.cloud_type 'mock' p.url 'http://localhost:3001/api' diff --git a/src/spec/factories/role.rb b/src/spec/factories/role.rb deleted file mode 100644 index b126721..0000000 --- a/src/spec/factories/role.rb +++ /dev/null @@ -1,24 +0,0 @@ -# FIXME need to flush out all roles w/ all privileges - -Factory.define :role do |r| -end - -Factory.define :admin_role, :parent => :role do |r| - r.name 'Administrator' - r.scope 'BasePortalObject' - r.privileges { |p| [ p.association(:modify_pool_priv), - p.association(:modify_provider_priv), - p.association(:view_provider_priv) ] } -end - -Factory.define :instance_creator, :parent => :role do |r| - r.name 'Instance Creator and User' - r.scope 'PortalPool' -end - -Factory.define :provider_admin_role, :parent => :role do |r| - r.name 'Provider Administrator' - r.scope 'BasePortalObject' - r.privileges { |p| [ p.association(:modify_provider_priv), - p.association(:view_provider_priv) ] } -end diff --git a/src/spec/factories/user.rb b/src/spec/factories/user.rb index 077083b..0cc33c7 100644 --- a/src/spec/factories/user.rb +++ b/src/spec/factories/user.rb @@ -1,6 +1,6 @@ Factory.define :user do |u| - u.login 'myuser' - u.email 'myuser(a)example.com' + u.sequence(:login) { |n| "user#{n}" } + u.email { |e| "#{e.login}(a)example.host" } u.password 'secret' u.password_confirmation 'secret' u.first_name 'John' @@ -8,16 +8,10 @@ Factory.define :user do |u| end Factory.define :tuser, :parent => :user do |u| - u.login 'tuser' - u.email 'tuser(a)example.com' end Factory.define :admin_user, :parent => :user do |u| - u.login 'padmin' - u.email 'padmin(a)foobar.com' end Factory.define :provider_admin_user, :parent => :user do |u| - u.login 'provider_admin' - u.email 'provider_admin(a)foobar.com' end diff --git a/src/spec/fixtures/base_portal_objects.yml b/src/spec/fixtures/base_portal_objects.yml new file mode 100644 index 0000000..a520969 --- /dev/null +++ b/src/spec/fixtures/base_portal_objects.yml @@ -0,0 +1,2 @@ +general_permission_scope: + name: 'general_permission_scope' diff --git a/src/spec/fixtures/roles.yml b/src/spec/fixtures/roles.yml index 2ac7e5f..559e42a 100644 --- a/src/spec/fixtures/roles.yml +++ b/src/spec/fixtures/roles.yml @@ -20,7 +20,7 @@ instance_creator_and_user: self_service_pool_user: name: Self-service Pool User scope: PortalPool - privileges: instance_control, instance_view, pool_view, stats_view, instance_modify, quota_view, set_perms, view_perms, account_modify + privileges: instance_control, instance_view, pool_view, stats_view, instance_modify, quota_view, set_perms, view_perms, account_add pool_creator: name: Pool Creator scope: Provider @@ -28,20 +28,28 @@ pool_creator: pool_administrator: name: Pool Administrator scope: Provider - privileges: provider_view, pool_modify, pool_view, quota_modify, quota_view, account_modify, account_view, stats_view, set_perms, view_perms + privileges: provider_view, pool_modify, pool_view, quota_modify, quota_view, account_modify, account_add, account_view, stats_view, set_perms, view_perms +provider_administrator: + name: Provider Administrator + scope: Provider + privileges: provider_modify, provider_view, account_modify, account_view account_administrator: name: Account Administrator scope: CloudAccount - privileges: account_modify, account_view, stats_view, set_perms, view_perms + privileges: account_modify, account_view, stats_view, set_perms, view_perms, account_add account_user: name: Account User scope: CloudAccount + privileges: account_view, account_add +account_viewer: + name: Account Viewer + scope: CloudAccount privileges: account_view -provider_administrator: - name: Provider Administrator +provider_creator: + name: Provider Creator scope: BasePortalObject privileges: provider_modify, provider_view, stats_view -site_administrator: - name: Site Administrator +administrator: + name: Administrator scope: BasePortalObject - privileges: provider_modify, provider_view, account_modify, account_view, user_modify, user_view, set_perms, view_perms, pool_modify, pool_view, quota_modify, quota_view, stats_view, instance_modify, instance_control, instance_view + privileges: provider_modify, provider_view, account_modify, account_add, account_view, user_modify, user_view, set_perms, view_perms, pool_modify, pool_view, quota_modify, quota_view, stats_view, instance_modify, instance_control, instance_view -- 1.6.2.5

1 0

[PATCH] spec fixes and updates
by Mo Morsi 17 Mar '10

17 Mar '10

Please Be Sure To Run Both 'rake spec' and 'rake cucumber' Before _every_ Patch Submitted and/or Committed --- src/app/models/hardware_profile.rb | 12 +++++----- .../controllers/portal_pool_controller_spec.rb | 5 +-- src/spec/controllers/provider_controller_spec.rb | 1 - .../controllers/user_sessions_controller_spec.rb | 4 +- src/spec/factories/base_portal_object.rb | 3 -- src/spec/factories/permission.rb | 19 ++++++++++----- src/spec/factories/privilege.rb | 14 ----------- src/spec/factories/provider.rb | 2 +- src/spec/factories/role.rb | 24 -------------------- src/spec/factories/user.rb | 10 +------ src/spec/fixtures/base_portal_objects.yml | 2 + src/spec/fixtures/roles.yml | 24 +++++++++++++------ 12 files changed, 44 insertions(+), 76 deletions(-) delete mode 100644 src/spec/factories/base_portal_object.rb delete mode 100644 src/spec/factories/privilege.rb delete mode 100644 src/spec/factories/role.rb create mode 100644 src/spec/fixtures/base_portal_objects.yml diff --git a/src/app/models/hardware_profile.rb b/src/app/models/hardware_profile.rb index fdcdd3f..7714acb 100644 --- a/src/app/models/hardware_profile.rb +++ b/src/app/models/hardware_profile.rb @@ -64,14 +64,14 @@ class HardwareProfile < ActiveRecord::Base errors.add(:provider, "provider or pool must be blank") errors.add(:portal_pool, "provider or pool must be blank") elsif provider.nil? - if !aggregator_hardware_profiles.empty? - errors.add(:aggregator_hardware_profiles, - "Aggregator profiles only allowed for provider profiles") - end - elsif portal_pool.nil? if !provider_hardware_profiles.empty? errors.add(:provider_hardware_profiles, - "Provider profiles only allowed for aggregator profiles") + "Provider profiles only allowed for provider profiles") + end + elsif portal_pool.nil? + if !aggregator_hardware_profiles.empty? + errors.add(:aggregator_hardware_profiles, + "Aggregator profiles only allowed for pool profiles") end end end diff --git a/src/spec/controllers/portal_pool_controller_spec.rb b/src/spec/controllers/portal_pool_controller_spec.rb index d409c3a..bc01a31 100644 --- a/src/spec/controllers/portal_pool_controller_spec.rb +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -21,13 +21,12 @@ describe PortalPoolController do end it "should provider means to create new pool" do - @instance_creator = Factory :instance_creator - UserSession.create(@admin) lambda do post :create, :portal_pool => { :name => 'foopool' } end.should change(PortalPool, :count).by(1) - response.should redirect_to('http://test.host/portal_pool/show/1') + id = PortalPool.find(:first, :conditions => ['name = ?', 'foopool']).id + response.should redirect_to("http://test.host/portal_pool/show/#{id}") end diff --git a/src/spec/controllers/provider_controller_spec.rb b/src/spec/controllers/provider_controller_spec.rb index ea67580..9015a00 100644 --- a/src/spec/controllers/provider_controller_spec.rb +++ b/src/spec/controllers/provider_controller_spec.rb @@ -3,7 +3,6 @@ require 'spec_helper' describe ProviderController do before(:each) do - Factory :base_portal_object @admin_permission = Factory :provider_admin_permission @provider = @admin_permission.permission_object @admin = @admin_permission.user diff --git a/src/spec/controllers/user_sessions_controller_spec.rb b/src/spec/controllers/user_sessions_controller_spec.rb index f2b80d5..1c0cfcc 100644 --- a/src/spec/controllers/user_sessions_controller_spec.rb +++ b/src/spec/controllers/user_sessions_controller_spec.rb @@ -16,14 +16,14 @@ describe UserSessionsController do end it "should create user session" do - post :create, :user_session => { :login => "tuser", :password => "secret" } + post :create, :user_session => { :login => @tuser.login, :password => "secret" } UserSession.find.should_not == nil @tuser.should == UserSession.find.user response.should redirect_to(account_path) end it "should destroy user session" do - post :create, :user_session => { :login => "tuser", :password => "secret" } + post :create, :user_session => { :login => @tuser.login, :password => "secret" } delete :destroy UserSession.find.should == nil response.should redirect_to(login_path) diff --git a/src/spec/factories/base_portal_object.rb b/src/spec/factories/base_portal_object.rb deleted file mode 100644 index af4c8bd..0000000 --- a/src/spec/factories/base_portal_object.rb +++ /dev/null @@ -1,3 +0,0 @@ -Factory.define :base_portal_object do |p| - p.name 'general_permission_scope' -end diff --git a/src/spec/factories/permission.rb b/src/spec/factories/permission.rb index 0e99f97..084ea4e 100644 --- a/src/spec/factories/permission.rb +++ b/src/spec/factories/permission.rb @@ -1,14 +1,21 @@ Factory.define :permission do |p| + p.after_build { |p| p.user.permissions << p } end Factory.define :admin_permission, :parent => :permission do |p| - p.role { |r| r.association(:admin_role) } - p.permission_object { |r| r.association(:base_portal_object) } - p.user { |r| r.association(:admin_user) } + p.role { |r| Role.find(:first, :conditions => ['name = ?', 'Administrator']) } + p.permission_object { |r| BasePortalObject.general_permission_scope } + p.user { |u| u.association(:admin_user) } end Factory.define :provider_admin_permission, :parent => :permission do |p| - p.role { |r| r.association(:provider_admin_role) } - p.permission_object { |r| r.association(:mock1) } - p.user { |r| r.association(:provider_admin_user) } + p.role { |r| Role.find(:first, :conditions => ['name = ?', 'Provider Administrator']) } + p.permission_object { |r| r.association(:mock_provider) } + p.user { |u| u.association(:provider_admin_user) } +end + +Factory.define :pool_creator_permission, :parent => :permission do |p| + p.role { |r| Role.find(:first, :conditions => ['name = ?', 'Pool Creator']) } + p.permission_object { |r| r.association(:mock_provider) } + p.user { |u| u.association(:pool_creator) } end diff --git a/src/spec/factories/privilege.rb b/src/spec/factories/privilege.rb deleted file mode 100644 index 46bdeb4..0000000 --- a/src/spec/factories/privilege.rb +++ /dev/null @@ -1,14 +0,0 @@ -Factory.define :privilege do |p| -end - -Factory.define :modify_pool_priv, :parent => :privilege do |p| - p.name 'pool_modify' -end - -Factory.define :modify_provider_priv, :parent => :privilege do |p| - p.name 'provider_modify' -end - -Factory.define :view_provider_priv, :parent => :privilege do |p| - p.name 'provider_view' -end diff --git a/src/spec/factories/provider.rb b/src/spec/factories/provider.rb index ae1abd2..921d54b 100644 --- a/src/spec/factories/provider.rb +++ b/src/spec/factories/provider.rb @@ -1,7 +1,7 @@ Factory.define :provider do |p| end -Factory.define :mock1, :parent => :provider do |p| +Factory.define :mock_provider, :parent => :provider do |p| p.name 'mock1' p.cloud_type 'mock' p.url 'http://localhost:3001/api' diff --git a/src/spec/factories/role.rb b/src/spec/factories/role.rb deleted file mode 100644 index b126721..0000000 --- a/src/spec/factories/role.rb +++ /dev/null @@ -1,24 +0,0 @@ -# FIXME need to flush out all roles w/ all privileges - -Factory.define :role do |r| -end - -Factory.define :admin_role, :parent => :role do |r| - r.name 'Administrator' - r.scope 'BasePortalObject' - r.privileges { |p| [ p.association(:modify_pool_priv), - p.association(:modify_provider_priv), - p.association(:view_provider_priv) ] } -end - -Factory.define :instance_creator, :parent => :role do |r| - r.name 'Instance Creator and User' - r.scope 'PortalPool' -end - -Factory.define :provider_admin_role, :parent => :role do |r| - r.name 'Provider Administrator' - r.scope 'BasePortalObject' - r.privileges { |p| [ p.association(:modify_provider_priv), - p.association(:view_provider_priv) ] } -end diff --git a/src/spec/factories/user.rb b/src/spec/factories/user.rb index 077083b..0cc33c7 100644 --- a/src/spec/factories/user.rb +++ b/src/spec/factories/user.rb @@ -1,6 +1,6 @@ Factory.define :user do |u| - u.login 'myuser' - u.email 'myuser(a)example.com' + u.sequence(:login) { |n| "user#{n}" } + u.email { |e| "#{e.login}(a)example.host" } u.password 'secret' u.password_confirmation 'secret' u.first_name 'John' @@ -8,16 +8,10 @@ Factory.define :user do |u| end Factory.define :tuser, :parent => :user do |u| - u.login 'tuser' - u.email 'tuser(a)example.com' end Factory.define :admin_user, :parent => :user do |u| - u.login 'padmin' - u.email 'padmin(a)foobar.com' end Factory.define :provider_admin_user, :parent => :user do |u| - u.login 'provider_admin' - u.email 'provider_admin(a)foobar.com' end diff --git a/src/spec/fixtures/base_portal_objects.yml b/src/spec/fixtures/base_portal_objects.yml new file mode 100644 index 0000000..a520969 --- /dev/null +++ b/src/spec/fixtures/base_portal_objects.yml @@ -0,0 +1,2 @@ +general_permission_scope: + name: 'general_permission_scope' diff --git a/src/spec/fixtures/roles.yml b/src/spec/fixtures/roles.yml index 2ac7e5f..559e42a 100644 --- a/src/spec/fixtures/roles.yml +++ b/src/spec/fixtures/roles.yml @@ -20,7 +20,7 @@ instance_creator_and_user: self_service_pool_user: name: Self-service Pool User scope: PortalPool - privileges: instance_control, instance_view, pool_view, stats_view, instance_modify, quota_view, set_perms, view_perms, account_modify + privileges: instance_control, instance_view, pool_view, stats_view, instance_modify, quota_view, set_perms, view_perms, account_add pool_creator: name: Pool Creator scope: Provider @@ -28,20 +28,28 @@ pool_creator: pool_administrator: name: Pool Administrator scope: Provider - privileges: provider_view, pool_modify, pool_view, quota_modify, quota_view, account_modify, account_view, stats_view, set_perms, view_perms + privileges: provider_view, pool_modify, pool_view, quota_modify, quota_view, account_modify, account_add, account_view, stats_view, set_perms, view_perms +provider_administrator: + name: Provider Administrator + scope: Provider + privileges: provider_modify, provider_view, account_modify, account_view account_administrator: name: Account Administrator scope: CloudAccount - privileges: account_modify, account_view, stats_view, set_perms, view_perms + privileges: account_modify, account_view, stats_view, set_perms, view_perms, account_add account_user: name: Account User scope: CloudAccount + privileges: account_view, account_add +account_viewer: + name: Account Viewer + scope: CloudAccount privileges: account_view -provider_administrator: - name: Provider Administrator +provider_creator: + name: Provider Creator scope: BasePortalObject privileges: provider_modify, provider_view, stats_view -site_administrator: - name: Site Administrator +administrator: + name: Administrator scope: BasePortalObject - privileges: provider_modify, provider_view, account_modify, account_view, user_modify, user_view, set_perms, view_perms, pool_modify, pool_view, quota_modify, quota_view, stats_view, instance_modify, instance_control, instance_view + privileges: provider_modify, provider_view, account_modify, account_add, account_view, user_modify, user_view, set_perms, view_perms, pool_modify, pool_view, quota_modify, quota_view, stats_view, instance_modify, instance_control, instance_view -- 1.6.2.5

1 0

[PATCH] view the list of provider accounts in a pool (revision 4)
by Mo Morsi 17 Mar '10

17 Mar '10

new ui / backend / tests --- src/app/controllers/portal_pool_controller.rb | 5 ++++ src/app/models/provider.rb | 1 - src/app/views/portal_pool/accounts.html.erb | 21 +++++++++++++++++ .../controllers/portal_pool_controller_spec.rb | 21 ++++++++++++----- src/spec/controllers/provider_controller_spec.rb | 4 +- .../controllers/user_sessions_controller_spec.rb | 4 +- src/spec/factories/base_portal_object.rb | 3 -- src/spec/factories/permission.rb | 19 ++++++++++----- src/spec/factories/privilege.rb | 14 ----------- src/spec/factories/provider.rb | 2 +- src/spec/factories/role.rb | 24 -------------------- src/spec/factories/user.rb | 13 ++++------ src/spec/fixtures/base_portal_objects.yml | 2 + 13 files changed, 66 insertions(+), 67 deletions(-) create mode 100644 src/app/views/portal_pool/accounts.html.erb delete mode 100644 src/spec/factories/base_portal_object.rb delete mode 100644 src/spec/factories/privilege.rb delete mode 100644 src/spec/factories/role.rb create mode 100644 src/spec/fixtures/base_portal_objects.yml diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 90df8a5..1cdb96a 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -38,6 +38,11 @@ class PortalPoolController < ApplicationController @instances = @pool.instances end + def accounts + @pool = PortalPool.find(params[:id]) + require_privilege(Privilege::INSTANCE_VIEW,@pool) + end + def new require_privilege(Privilege::POOL_MODIFY) @portal_pool = PortalPool.new diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index 1170488..70051e5 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -79,7 +79,6 @@ class Provider < ActiveRecord::Base def validate if !nil_or_empty(url) errors.add("url", "must be a valid provider url") unless valid_framework? - puts errors.inspect end end diff --git a/src/app/views/portal_pool/accounts.html.erb b/src/app/views/portal_pool/accounts.html.erb new file mode 100644 index 0000000..b6042d6 --- /dev/null +++ b/src/app/views/portal_pool/accounts.html.erb @@ -0,0 +1,21 @@ +<% if @pool.cloud_accounts.size == 0 %> +<h1>There are no accounts to display</h1> +<% else %> + <table> + <thead> + <tr> + <th scope="col">Provider</th> + <th scope="col">Username</th> + </tr> + </thead> + <tbody> + <%(a)pool.cloud_accounts.each {|account| %> + <tr> + <td><%= account.provider.name %></td> + <td><%= account.username %></td> + </tr> + <% } %> + </tbody> + </table> +<% end %> +<%= link_to "Add an account", {:controller => "portal_pool", :action => "new_account", :pool => @pool.id}, :class => "actionlink" %> diff --git a/src/spec/controllers/portal_pool_controller_spec.rb b/src/spec/controllers/portal_pool_controller_spec.rb index d409c3a..bd490c5 100644 --- a/src/spec/controllers/portal_pool_controller_spec.rb +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -1,10 +1,12 @@ require 'spec_helper' describe PortalPoolController do - + fixtures :all + before(:each) do - @admin_permission = Factory :admin_permission - @admin = @admin_permission.user + @permission = Factory.build :admin_permission + #permission = Factory.build :pool_creator_permission # FIXME this should work but isn't + @admin = @permission.user activate_authlogic end @@ -21,14 +23,21 @@ describe PortalPoolController do end it "should provider means to create new pool" do - @instance_creator = Factory :instance_creator - UserSession.create(@admin) lambda do post :create, :portal_pool => { :name => 'foopool' } end.should change(PortalPool, :count).by(1) - response.should redirect_to('http://test.host/portal_pool/show/1') + id = PortalPool.find(:first, :conditions => ['name = ?', 'foopool']).id + response.should redirect_to("http://test.host/portal_pool/show/#{id}") end + it "should get cloud accounts" do + @pool = Factory :tpool + UserSession.create(@admin) + get :accounts, :id => @pool.id + response.should be_success + response.should render_template("accounts") + @pool.should_not == nil + end end diff --git a/src/spec/controllers/provider_controller_spec.rb b/src/spec/controllers/provider_controller_spec.rb index ea67580..2893151 100644 --- a/src/spec/controllers/provider_controller_spec.rb +++ b/src/spec/controllers/provider_controller_spec.rb @@ -1,10 +1,10 @@ require 'spec_helper' describe ProviderController do + fixtures :all before(:each) do - Factory :base_portal_object - @admin_permission = Factory :provider_admin_permission + @admin_permission = Factory.build :provider_admin_permission @provider = @admin_permission.permission_object @admin = @admin_permission.user activate_authlogic diff --git a/src/spec/controllers/user_sessions_controller_spec.rb b/src/spec/controllers/user_sessions_controller_spec.rb index f2b80d5..1c0cfcc 100644 --- a/src/spec/controllers/user_sessions_controller_spec.rb +++ b/src/spec/controllers/user_sessions_controller_spec.rb @@ -16,14 +16,14 @@ describe UserSessionsController do end it "should create user session" do - post :create, :user_session => { :login => "tuser", :password => "secret" } + post :create, :user_session => { :login => @tuser.login, :password => "secret" } UserSession.find.should_not == nil @tuser.should == UserSession.find.user response.should redirect_to(account_path) end it "should destroy user session" do - post :create, :user_session => { :login => "tuser", :password => "secret" } + post :create, :user_session => { :login => @tuser.login, :password => "secret" } delete :destroy UserSession.find.should == nil response.should redirect_to(login_path) diff --git a/src/spec/factories/base_portal_object.rb b/src/spec/factories/base_portal_object.rb deleted file mode 100644 index af4c8bd..0000000 --- a/src/spec/factories/base_portal_object.rb +++ /dev/null @@ -1,3 +0,0 @@ -Factory.define :base_portal_object do |p| - p.name 'general_permission_scope' -end diff --git a/src/spec/factories/permission.rb b/src/spec/factories/permission.rb index 0e99f97..eadcc4c 100644 --- a/src/spec/factories/permission.rb +++ b/src/spec/factories/permission.rb @@ -1,14 +1,21 @@ Factory.define :permission do |p| + p.after_build { |p| p.user.permissions << p } end Factory.define :admin_permission, :parent => :permission do |p| - p.role { |r| r.association(:admin_role) } - p.permission_object { |r| r.association(:base_portal_object) } - p.user { |r| r.association(:admin_user) } + p.role { |r| Role.find(:first, :conditions => ['name = ?', 'Site Administrator']) } + p.permission_object { |r| BasePortalObject.general_permission_scope } + p.user { |u| u.association(:admin_user) } end Factory.define :provider_admin_permission, :parent => :permission do |p| - p.role { |r| r.association(:provider_admin_role) } - p.permission_object { |r| r.association(:mock1) } - p.user { |r| r.association(:provider_admin_user) } + p.role { |r| Role.find(:first, :conditions => ['name = ?', 'Provider Administrator']) } + p.permission_object { |r| r.association(:mock_provider) } + p.user { |u| u.association(:provider_admin_user) } +end + +Factory.define :pool_creator_permission, :parent => :permission do |p| + p.role { |r| Role.find(:first, :conditions => ['name = ?', 'Pool Creator']) } + p.permission_object { |r| r.association(:mock_provider) } + p.user { |u| u.association(:pool_creator) } end diff --git a/src/spec/factories/privilege.rb b/src/spec/factories/privilege.rb deleted file mode 100644 index 46bdeb4..0000000 --- a/src/spec/factories/privilege.rb +++ /dev/null @@ -1,14 +0,0 @@ -Factory.define :privilege do |p| -end - -Factory.define :modify_pool_priv, :parent => :privilege do |p| - p.name 'pool_modify' -end - -Factory.define :modify_provider_priv, :parent => :privilege do |p| - p.name 'provider_modify' -end - -Factory.define :view_provider_priv, :parent => :privilege do |p| - p.name 'provider_view' -end diff --git a/src/spec/factories/provider.rb b/src/spec/factories/provider.rb index ae1abd2..921d54b 100644 --- a/src/spec/factories/provider.rb +++ b/src/spec/factories/provider.rb @@ -1,7 +1,7 @@ Factory.define :provider do |p| end -Factory.define :mock1, :parent => :provider do |p| +Factory.define :mock_provider, :parent => :provider do |p| p.name 'mock1' p.cloud_type 'mock' p.url 'http://localhost:3001/api' diff --git a/src/spec/factories/role.rb b/src/spec/factories/role.rb deleted file mode 100644 index b126721..0000000 --- a/src/spec/factories/role.rb +++ /dev/null @@ -1,24 +0,0 @@ -# FIXME need to flush out all roles w/ all privileges - -Factory.define :role do |r| -end - -Factory.define :admin_role, :parent => :role do |r| - r.name 'Administrator' - r.scope 'BasePortalObject' - r.privileges { |p| [ p.association(:modify_pool_priv), - p.association(:modify_provider_priv), - p.association(:view_provider_priv) ] } -end - -Factory.define :instance_creator, :parent => :role do |r| - r.name 'Instance Creator and User' - r.scope 'PortalPool' -end - -Factory.define :provider_admin_role, :parent => :role do |r| - r.name 'Provider Administrator' - r.scope 'BasePortalObject' - r.privileges { |p| [ p.association(:modify_provider_priv), - p.association(:view_provider_priv) ] } -end diff --git a/src/spec/factories/user.rb b/src/spec/factories/user.rb index 077083b..9a5564d 100644 --- a/src/spec/factories/user.rb +++ b/src/spec/factories/user.rb @@ -1,6 +1,6 @@ Factory.define :user do |u| - u.login 'myuser' - u.email 'myuser(a)example.com' + u.sequence(:login) { |n| "user#{n}" } + u.email { |e| "#{e.login}(a)example.host" } u.password 'secret' u.password_confirmation 'secret' u.first_name 'John' @@ -8,16 +8,13 @@ Factory.define :user do |u| end Factory.define :tuser, :parent => :user do |u| - u.login 'tuser' - u.email 'tuser(a)example.com' end Factory.define :admin_user, :parent => :user do |u| - u.login 'padmin' - u.email 'padmin(a)foobar.com' end Factory.define :provider_admin_user, :parent => :user do |u| - u.login 'provider_admin' - u.email 'provider_admin(a)foobar.com' +end + +Factory.define :pool_creator, :parent => :user do |u| end diff --git a/src/spec/fixtures/base_portal_objects.yml b/src/spec/fixtures/base_portal_objects.yml new file mode 100644 index 0000000..a520969 --- /dev/null +++ b/src/spec/fixtures/base_portal_objects.yml @@ -0,0 +1,2 @@ +general_permission_scope: + name: 'general_permission_scope' -- 1.6.2.5

2 1

Small changes in API (requires, cucumber)
by Michal Fojtik 16 Mar '10

16 Mar '10

Hi, Only small changes here: First one allowing "require 'deltacloud'" in 'server' directory, which could be usefull for testing in some cases. Second one removes 'rcov' from 'features' cucumber task and create new one called 'rcov'. So for code coverage reports you can call 'rake rcov' Michal

2 4

Added Cucumber and RCov for API
by Michal Fojtik 16 Mar '10

16 Mar '10

Hi everyone, I finnish revamp of Test::Unit to Cucumber to match testing suite used in portal. Basic usage: rake features OR: cucumber features/<feature_name>.feature -q You don't need to start server or configure something extra. Right now, there are two failures: 1. Image with no name in Mock driver (could be easely fixed in fixtures) 2. Device name in one storage volume is empty (not sure about this) --- One bonus thing is, that if you have 'rcov' gem installed, you will get 'code coverage' generated by this gem in './coverage' directory. This could be extra usefull for testing. Second bonus thing is, that these test are configurable. Right now there is only configuration for 'mock' driver, but with small changes, (hopefully) we will be able to test EC2 and other providers using Cucumber as well. Any comments/question/suggestions/acks are welcome. - Michal

2 4

[PATCH] Changes allowing a privileged user creates a user account for somebody else
by Mo Morsi 16 Mar '10

16 Mar '10

--- src/app/controllers/users_controller.rb | 10 +++++++--- src/spec/controllers/users_controller_spec.rb | 25 ++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb index 6c6c021..3536c0e 100644 --- a/src/app/controllers/users_controller.rb +++ b/src/app/controllers/users_controller.rb @@ -20,7 +20,6 @@ # Likewise, all the methods added will be available for all controllers. class UsersController < ApplicationController - before_filter :require_no_user, :only => [:new, :create] before_filter :require_user, :only => [:show, :edit, :update] def new @@ -28,18 +27,23 @@ class UsersController < ApplicationController end def create + require_privilege(Privilege::USER_MODIFY) unless current_user.nil? @user = User.new(params[:user]) @registration = RegistrationService.new(@user) if @registration.save flash[:notice] = "User registered!" - redirect_back_or_default account_url + redirect_back_or_default url_for(:action => :show, :id => @user.id) else render :action => :new end end def show - @user = @current_user + if params.has_key?(:id) && params[:id] != "show" + @user = User.find(params[:id]) + else + @user = current_user + end end def edit diff --git a/src/spec/controllers/users_controller_spec.rb b/src/spec/controllers/users_controller_spec.rb index 5f010cc..1c3a8fd 100644 --- a/src/spec/controllers/users_controller_spec.rb +++ b/src/spec/controllers/users_controller_spec.rb @@ -4,6 +4,8 @@ describe UsersController do fixtures :all before(:each) do @tuser = Factory :tuser + @admin_permission = Factory :admin_permission + @admin = @admin_permission.user activate_authlogic end @@ -35,7 +37,8 @@ describe UsersController do p.permissions.any? { |perm| perm.role.name.eql?('Self-service Pool User') }.should be_true - response.should redirect_to(account_path) + id = User.find(:first, :conditions => ['login = ?', "tuser2"]).id + response.should redirect_to("http://test.host/users/show/#{id}") end it "fails to create pool" do @@ -59,6 +62,26 @@ describe UsersController do end end + it "should allow an admin to create user" do + UserSession.create(@admin) + lambda { + post :create, :user => { :login => "tuser3", :email => "tuser3(a)example.com", + :password => "testpass", + :password_confirmation => "testpass" } + }.should change{ User.count } + id = User.find(:first, :conditions => ['login = ?', "tuser3"]).id + response.should redirect_to("http://test.host/users/show/#{id}") + end + + it "should not allow a regular user to create user" do + UserSession.create(@tuser) + lambda { + post :create, :user => { :login => "tuser4", :email => "tuser4(a)example.com", + :password => "testpass", + :password_confirmation => "testpass" } + }.should_not change{ User.count } + end + it "should show user" do UserSession.create(@tuser) get :show -- 1.6.2.5

1 0

[PATCH portal] added 'account_add' privilege, a couple privilege/role fixes.
by Scott Seago 16 Mar '10

16 Mar '10

Signed-off-by: Scott Seago <sseago(a)redhat.com> --- src/app/controllers/provider_controller.rb | 6 +++--- src/app/models/privilege.rb | 13 +++++++++---- src/db/migrate/20091008153046_create_privileges.rb | 2 +- src/db/migrate/20091008153058_create_roles.rb | 17 +++++++++++++++-- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/app/controllers/provider_controller.rb b/src/app/controllers/provider_controller.rb index b7e10a5..53056f5 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -52,16 +52,16 @@ class ProviderController < ApplicationController def accounts @provider = Provider.find(params[:id]) - require_privilege(Privilege::PROVIDER_VIEW, @provider) + require_privilege(Privilege::ACCOUNT_VIEW, @provider) end def new_account @provider = Provider.find(params[:id]) - require_privilege(Privilege::PROVIDER_VIEW, @provider) + require_privilege(Privilege::ACCOUNT_MODIFY, @provider) end def create_account - require_privilege(Privilege::PROVIDER_MODIFY) + require_privilege(Privilege::ACCOUNT_MODIFY) @acct = CloudAccount.find_or_create(params[:account]) @provider = Provider.find(params[:account][:provider_id]) @provider.cloud_accounts << @acct diff --git a/src/app/models/privilege.rb b/src/app/models/privilege.rb index e314930..69f22b9 100644 --- a/src/app/models/privilege.rb +++ b/src/app/models/privilege.rb @@ -43,10 +43,15 @@ class Privilege < ActiveRecord::Base STATS_VIEW = "stats_view" # can view monitoring data for # instances - # account privileges normally checked at the provider level, although - # account-specific overrides could be a future enhancement. + # to create(i.e. import) an account on a provider (but not added to + # a pool) needs ACCOUNT_MODIFY on the provider. + # to add a new provider account (i.e. import) to a pool needs + # ACCOUNT_ADD on the pool + # to add an existing provider account to a pool needs ACCOUNT_ADD + # on the pool _and_ ACCOUNT_ADD on the account. ACCOUNT_MODIFY = "account_modify" # can create or modify cloud accounts - ACCOUNT_VIEW = "account_view" # can create or modify cloud accounts + ACCOUNT_VIEW = "account_view" # can view cloud accounts + ACCOUNT_ADD = "account_add" # can add an account to a pool # pool privileges normally checked at the provider level # (and at the account level for choosing which accounts are visible on the @@ -76,7 +81,7 @@ class Privilege < ActiveRecord::Base FULL_PRIVILEGE_LIST = [PERM_SET, PERM_VIEW, INSTANCE_MODIFY, INSTANCE_CONTROL, INSTANCE_VIEW, STATS_VIEW, - ACCOUNT_MODIFY, ACCOUNT_VIEW, + ACCOUNT_MODIFY, ACCOUNT_ADD, ACCOUNT_VIEW, POOL_MODIFY, POOL_VIEW, QUOTA_MODIFY, QUOTA_VIEW, PROVIDER_MODIFY, PROVIDER_VIEW, diff --git a/src/db/migrate/20091008153046_create_privileges.rb b/src/db/migrate/20091008153046_create_privileges.rb index 74932b0..12d94c6 100644 --- a/src/db/migrate/20091008153046_create_privileges.rb +++ b/src/db/migrate/20091008153046_create_privileges.rb @@ -30,7 +30,7 @@ class CreatePrivileges < ActiveRecord::Migration privileges = ["set_perms", "view_perms", "instance_modify", "instance_control", "instance_view", "stats_view", - "account_modify", "account_view", + "account_modify", "account_add", "account_view", "pool_modify", "pool_view", "quota_modify", "quota_view", "provider_modify", "provider_view", diff --git a/src/db/migrate/20091008153058_create_roles.rb b/src/db/migrate/20091008153058_create_roles.rb index 44c360d..d7776d3 100644 --- a/src/db/migrate/20091008153058_create_roles.rb +++ b/src/db/migrate/20091008153058_create_roles.rb @@ -63,7 +63,7 @@ class CreateRoles < ActiveRecord::Migration "quota_view", "set_perms", "view_perms", - "account_modify"]}, + "account_add"]}, "Pool Creator" => {:role_scope => "Provider", :privileges => ["provider_view", @@ -78,19 +78,31 @@ class CreateRoles < ActiveRecord::Migration "quota_view", "quota_modify", "account_view", + "account_add", "account_modify", "set_perms", "view_perms"]}, + "Provider Administrator" => + {:role_scope => "Provider", + :privileges => ["provider_modify", + "provider_view", + "account_modify", + "account_view"]}, "Account Administrator" => {:role_scope => "CloudAccount", :privileges => ["set_perms", "view_perms", "account_view", + "account_add", "account_modify"]}, "Account User" => {:role_scope => "CloudAccount", + :privileges => ["account_view", + "account_add"]}, + "Account Viewer" => + {:role_scope => "CloudAccount", :privileges => ["account_view"]}, - "Provider Administrator" => + "Provider Creator" => {:role_scope => "BasePortalObject", :privileges => ["provider_modify", "provider_view"]}, @@ -99,6 +111,7 @@ class CreateRoles < ActiveRecord::Migration :privileges => ["provider_modify", "provider_view", "account_modify", + "account_add", "account_view", "user_modify", "user_view", -- 1.6.2.5

2 1

[PATCH portal] switch default db from postgres to sqlite.
by jason.guiditta 16 Mar '10

16 Mar '10

This patch also removes database.yml, so pointing the app at your db will now be a manual step. Directions will be added to the docs repo in getting_started.txt --- .gitignore | 1 + src/config/database.mysql | 2 +- src/config/database.pg | 56 +++++++++++++++++++++++++++++++++++++++++++++ src/config/database.yml | 56 --------------------------------------------- 4 files changed, 58 insertions(+), 57 deletions(-) create mode 100644 src/config/database.pg delete mode 100644 src/config/database.yml diff --git a/.gitignore b/.gitignore index 9cfdd9f..89945f2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ ovirt-server*.gz ovirt-server.spec schema.rb log/ +database.yml diff --git a/src/config/database.mysql b/src/config/database.mysql index 3e39c57..10742bb 100644 --- a/src/config/database.mysql +++ b/src/config/database.mysql @@ -27,7 +27,7 @@ development: # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. -test: +test: &TEST adapter: mysql encoding: utf8 database: dc_test diff --git a/src/config/database.pg b/src/config/database.pg new file mode 100644 index 0000000..1932c3c --- /dev/null +++ b/src/config/database.pg @@ -0,0 +1,56 @@ +# PostgresSQL. Versions 8.2 recommended. +# +# Fedora Install Instructions: +# sudo yum install ruby-postgres postgresql-server +# sudo /sbin/service postgresql initdb +# sudo /sbin/service postgresql start +# sudo su - postgres +# $ psql +# $-# CREATE USER dcloud WITH PASSWORD 'v23zj59an' CREATEDB; +# $-# \q +# $ exit +# +# To start off a new environment, use the following commands: +# +# rake db:drop:all +# rake db:create:all +# rake db:migrate (if you want production rather than the default of 'development', simply export RAILS_ENV=production before running this command) +# rake db:test:prepare +# +# And when there are changes to the database, simply run: +# +# rake db:migrate +# rake db:test:prepare +# for the environment you wish to update. +# +# On a local system you may need to edit this file to have only the following +# /var/lib/pgsql/data/pg_hba.conf +# local all all trust +# host all all 127.0.0.1 255.255.255.255 trust + + +development: + adapter: postgresql + database: dcloud_development + username: dcloud + password: v23zj59an + host: localhost + +# Warning: The database defined as 'test' will be erased and +# re-generated from your development database when you run 'rake test'. +# Do not set this db to the same as development or production. +test: &TEST + adapter: postgresql + database: dcloud_test + username: postgres + host: localhost + +production: + adapter: postgresql + database: dcloud + username: dcloud + password: v23zj59an + host: localhost + +cucumber: + <<: *TEST diff --git a/src/config/database.yml b/src/config/database.yml deleted file mode 100644 index 1932c3c..0000000 --- a/src/config/database.yml +++ /dev/null @@ -1,56 +0,0 @@ -# PostgresSQL. Versions 8.2 recommended. -# -# Fedora Install Instructions: -# sudo yum install ruby-postgres postgresql-server -# sudo /sbin/service postgresql initdb -# sudo /sbin/service postgresql start -# sudo su - postgres -# $ psql -# $-# CREATE USER dcloud WITH PASSWORD 'v23zj59an' CREATEDB; -# $-# \q -# $ exit -# -# To start off a new environment, use the following commands: -# -# rake db:drop:all -# rake db:create:all -# rake db:migrate (if you want production rather than the default of 'development', simply export RAILS_ENV=production before running this command) -# rake db:test:prepare -# -# And when there are changes to the database, simply run: -# -# rake db:migrate -# rake db:test:prepare -# for the environment you wish to update. -# -# On a local system you may need to edit this file to have only the following -# /var/lib/pgsql/data/pg_hba.conf -# local all all trust -# host all all 127.0.0.1 255.255.255.255 trust - - -development: - adapter: postgresql - database: dcloud_development - username: dcloud - password: v23zj59an - host: localhost - -# Warning: The database defined as 'test' will be erased and -# re-generated from your development database when you run 'rake test'. -# Do not set this db to the same as development or production. -test: &TEST - adapter: postgresql - database: dcloud_test - username: postgres - host: localhost - -production: - adapter: postgresql - database: dcloud - username: dcloud - password: v23zj59an - host: localhost - -cucumber: - <<: *TEST -- 1.6.6.1

2 1

[PATCH docs] Add more directions around db stuff.
by jason.guiditta 16 Mar '10

16 Mar '10

--- getting_started.txt | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/getting_started.txt b/getting_started.txt index e0e32b6..a879144 100644 --- a/getting_started.txt +++ b/getting_started.txt @@ -158,20 +158,30 @@ This will run the deltacloud core server on port 3001. Setting up the aggregator ------------------------- Now we need to setup the aggregator (which includes the UI). -As your normal user: +As your user who will run the aggregator: For SQLite: $ cd path/to/deltacloud/portal/src/config - $ mv database.sqlite database.yml + $ cp database.sqlite database.yml + + NOTE: + The .sqlite3 file can be put in any location you desire, + just update the relative paths in database.yml to point to the correct location. + Also, you will need to take the following 2 steps: + 1. Run rake db:migrate (as root) to create the db file and set it to be owned by + the user who will run the aggregator. + 2. Make sure the dir that the above file lives in is also writable by this user. + $ rake db:create:all $ rake db:migrate - $ cd ../db + $ cd <wherever you put it>/db You should see the "development.sqlite" file there. For PostgreSQL: $ cd path/to/deltacloud/portal/src + $ cp database.pg database.yml $ rake db:create:all $ rake db:migrate $ rake db:test:prepare -- 1.6.6.1

2 1

← Newer
1
2
3
4
5
6
7
8
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel March 2010