deltacloud-devel March 2010

deltacloud-devel@lists.fedorahosted.org

15 participants
103 discussions

[PATCH portal 1/5] Try to clean up some test setup issues.
by jason.guiditta 12 Mar '10

12 Mar '10

Turns out that now that we have perms, we also seem to need to make sure we have certain data preloaded before tests run. Fixtures do this, factories do not (or at least we don't know how yet). As a possibly interim step, I have loaded up the data I know we need to run current tests. This may need more fleshing out in future, but seems to be workable for now. --- src/spec/factories/user.rb | 10 ++-- src/spec/fixtures/base_portal_objects.yml | 9 ++++ src/spec/fixtures/hardware_profiles.yml | 72 +++++++++++++++++++++++++++++ src/spec/fixtures/images.yml | 12 +++++ src/spec/fixtures/permissions.yml | 10 ++++ src/spec/fixtures/privileges.yml | 39 +++++++++++++++ src/spec/fixtures/providers.yml | 6 ++ src/spec/fixtures/realms.yml | 10 ++++ src/spec/fixtures/roles.yml | 47 +++++++++++++++++++ src/spec/spec_helper.rb | 2 +- 10 files changed, 211 insertions(+), 6 deletions(-) create mode 100644 src/spec/fixtures/base_portal_objects.yml create mode 100644 src/spec/fixtures/hardware_profiles.yml create mode 100644 src/spec/fixtures/images.yml create mode 100644 src/spec/fixtures/permissions.yml create mode 100644 src/spec/fixtures/privileges.yml create mode 100644 src/spec/fixtures/providers.yml create mode 100644 src/spec/fixtures/realms.yml create mode 100644 src/spec/fixtures/roles.yml diff --git a/src/spec/factories/user.rb b/src/spec/factories/user.rb index 637600c..a88b6fe 100644 --- a/src/spec/factories/user.rb +++ b/src/spec/factories/user.rb @@ -1,13 +1,13 @@ Factory.define :user do |u| u.login 'myuser' - u.email 'myuser(a)example.com' + u.sequence(:email) { |n| "myuser#{n}(a)example.com" } u.password 'secret' - u.password_confirmation 'secret' - #u.first_name 'John' - #u.last_name 'Smith' + u.password_confirmation {|p| p.password} + u.first_name 'John' + u.last_name 'Smith' end Factory.define :tuser, :parent => :user do |u| u.login 'tuser' - u.email 'tuser(a)example.com' + u.sequence(:email) { |n| "tuser#{n}(a)example.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..7e9b357 --- /dev/null +++ b/src/spec/fixtures/base_portal_objects.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html + +# one: +# column: value +# +# two: +# column: value +base_portal_object: + name: general_permission_scope \ No newline at end of file diff --git a/src/spec/fixtures/hardware_profiles.yml b/src/spec/fixtures/hardware_profiles.yml new file mode 100644 index 0000000..7bdd345 --- /dev/null +++ b/src/spec/fixtures/hardware_profiles.yml @@ -0,0 +1,72 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html + +m1_small_backend: + external_key: m1-small + name: m1-small + memory: 1.7 + storage: 160 + architecture: i386 + provider: mock_provider +m1_large_backend: + external_key: m1-large + name: m1-large + memory: 7.5 + storage: 850 + architecture: x86_64 + provider: mock_provider +m1_xlarge_backend: + external_key: m1-xlarge + name: m1-xlarge + memory: 15 + storage: 1690 + architecture: x86_64 + provider: mock_provider +c1_medium_backend: + external_key: c1-medium + name: c1-medium + memory: 1.7 + storage: 350 + architecture: x86_64 + provider: mock_provider +c1_xlarge_backend: + external_key: c1-xlarge + name: c1-xlarge + memory: 7 + storage: 1690 + architecture: x86_64 + provider: mock_provider +m1_small_frontend: + external_key: m1-small + name: m1-small + memory: 1.7 + storage: 160 + architecture: i386 + provider_hardware_profiles: m1_small_backend +m1_large_frontend: + external_key: m1-large + name: m1-large + memory: 7.5 + storage: 850 + architecture: x86_64 + provider_hardware_profiles: m1_large_backend +m1_xlarge_frontend: + external_key: m1-xlarge + name: m1-xlarge + memory: 15 + storage: 1690 + architecture: x86_64 + provider_hardware_profiles: m1_xlarge_backend +c1_medium_frontend: + external_key: c1-medium + name: c1-medium + memory: 1.7 + storage: 350 + architecture: x86_64 + provider_hardware_profiles: c1_medium_backend +c1_xlarge_frontend: + external_key: c1-xlarge + name: c1-xlarge + memory: 7 + storage: 1690 + architecture: x86_64 + provider_hardware_profiles: c1_xlarge_backend diff --git a/src/spec/fixtures/images.yml b/src/spec/fixtures/images.yml new file mode 100644 index 0000000..bfa6bba --- /dev/null +++ b/src/spec/fixtures/images.yml @@ -0,0 +1,12 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html + +fedora_13_image_backend: + external_key: fedora_13 + name: fedora_13 + architecture: x86_64 + provider: mock_provider +fedora_13_image_frontend: + external_key: fedora_13 + name: fedora_13 + architecture: x86_64 + provider_images: fedora_13_image_backend diff --git a/src/spec/fixtures/permissions.yml b/src/spec/fixtures/permissions.yml new file mode 100644 index 0000000..b2d7bdd --- /dev/null +++ b/src/spec/fixtures/permissions.yml @@ -0,0 +1,10 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html + +admin_permission: + role: site_administrator + user: test_admin + permission_object: base_portal_object (BasePortalObject) +user_permission: + role: instance_creator_and_user + user: test_user + permission_object: test_pool (PortalPool) diff --git a/src/spec/fixtures/privileges.yml b/src/spec/fixtures/privileges.yml new file mode 100644 index 0000000..d1f44ab --- /dev/null +++ b/src/spec/fixtures/privileges.yml @@ -0,0 +1,39 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html + +# one: +# column: value +# +# two: +# column: value +set_perms: + name: set_perms +view_perms: + name: view_perms +instance_modify: + name: instance_modify +instance_control: + name: instance_control +instance_view: + name: instance_view +stats_view: + name: stats_view +account_modify: + name: account_modify +account_view: + name: account_view +pool_modify: + name: pool_modify +pool_view: + name: pool_view +quota_modify: + name: quota_modify +quota_view: + name: quota_view +provider_modify: + name: provider_modify +provider_view: + name: provider_view +user_modify: + name: user_modify +user_view: + name: user_view diff --git a/src/spec/fixtures/providers.yml b/src/spec/fixtures/providers.yml new file mode 100644 index 0000000..1669919 --- /dev/null +++ b/src/spec/fixtures/providers.yml @@ -0,0 +1,6 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html + +mock_provider: + name: mock + cloud_type: Mock + url: http://localhost:3001/api diff --git a/src/spec/fixtures/realms.yml b/src/spec/fixtures/realms.yml new file mode 100644 index 0000000..6259f6c --- /dev/null +++ b/src/spec/fixtures/realms.yml @@ -0,0 +1,10 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html + +us_realm: + external_key: us + name: United States + provider: mock_provider +eu_realm: + external_key: eu + name: Europe + provider: mock_provider diff --git a/src/spec/fixtures/roles.yml b/src/spec/fixtures/roles.yml new file mode 100644 index 0000000..2ac7e5f --- /dev/null +++ b/src/spec/fixtures/roles.yml @@ -0,0 +1,47 @@ +# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html + +# one: +# column: value +# +# two: +# column: value +instance_controller: + name: Instance Controller + scope: PortalPool + privileges: instance_control, instance_view, pool_view +instance_controller_with_monitoring: + name: Instance Controller With Monitoring + scope: PortalPool + privileges: instance_control, instance_view, pool_view, stats_view +instance_creator_and_user: + name: Instance Creator and User + scope: PortalPool + privileges: instance_control, instance_view, pool_view, stats_view, instance_modify, quota_view, set_perms, view_perms +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 +pool_creator: + name: Pool Creator + scope: Provider + privileges: provider_view, pool_modify, pool_view, quota_view +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 +account_administrator: + name: Account Administrator + scope: CloudAccount + privileges: account_modify, account_view, stats_view, set_perms, view_perms +account_user: + name: Account User + scope: CloudAccount + privileges: account_view +provider_administrator: + name: Provider Administrator + scope: BasePortalObject + privileges: provider_modify, provider_view, stats_view +site_administrator: + name: Site 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 diff --git a/src/spec/spec_helper.rb b/src/spec/spec_helper.rb index 5181389..87a4609 100644 --- a/src/spec/spec_helper.rb +++ b/src/spec/spec_helper.rb @@ -31,7 +31,7 @@ Spec::Runner.configure do |config| # do so right here. Just uncomment the next line and replace the fixture # names with your fixtures. # - # config.global_fixtures = :table_a, :table_b + config.global_fixtures = :all # # If you declare global fixtures, be aware that they will be declared # for all of your examples, even those that don't use them. -- 1.6.6.1

2 10

[PATCH] Split new provider account and new pool into seperate forms
by Mo Morsi 12 Mar '10

12 Mar '10

ui, backend, and tests --- src/app/controllers/portal_pool_controller.rb | 36 +++++-------------- src/app/controllers/provider_controller.rb | 18 ++++++++++ src/app/views/layouts/_main_nav.html.erb | 4 ++- src/app/views/portal_pool/new.html.erb | 13 +------ src/app/views/provider/accounts.html.erb | 19 ++++++++++ src/app/views/provider/new_account.html.erb | 18 ++++++++++ src/app/views/provider/show.html.erb | 4 +- .../controllers/portal_pool_controller_spec.rb | 34 ++++++++++++++++++ src/spec/controllers/provider_controller_spec.rb | 36 ++++++++++++++++++++ src/spec/factories/base_portal_object.rb | 3 ++ src/spec/factories/permission.rb | 14 ++++++++ src/spec/factories/portal_pool.rb | 8 ++++ src/spec/factories/privilege.rb | 14 ++++++++ src/spec/factories/provider.rb | 8 ++++ src/spec/factories/role.rb | 24 +++++++++++++ src/spec/factories/user.rb | 10 +++++ 16 files changed, 223 insertions(+), 40 deletions(-) create mode 100644 src/app/views/provider/accounts.html.erb create mode 100644 src/app/views/provider/new_account.html.erb create mode 100644 src/spec/controllers/portal_pool_controller_spec.rb create mode 100644 src/spec/controllers/provider_controller_spec.rb create mode 100644 src/spec/factories/base_portal_object.rb create mode 100644 src/spec/factories/permission.rb create mode 100644 src/spec/factories/portal_pool.rb create mode 100644 src/spec/factories/privilege.rb create mode 100644 src/spec/factories/provider.rb create mode 100644 src/spec/factories/role.rb diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 24e530d..d17eaac 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -34,45 +34,29 @@ class PortalPoolController < ApplicationController end def new + require_privilege(Privilege::POOL_MODIFY) @portal_pool = PortalPool.new @account = CloudAccount.new - @account.provider_id = params[:provider] - # FIXME: 'new pool' form will only require the POOL_MODIFY priv once the - # account bits are pulled out - require_privilege(Privilege::POOL_MODIFY) - require_privilege(Privilege::ACCOUNT_MODIFY, Provider.find(params[:provider])) end def create - # FIXME: 'new pool' form will only require the POOL_MODIFY priv once the - # account bits are pulled out require_privilege(Privilege::POOL_MODIFY) - require_privilege(Privilege::ACCOUNT_MODIFY, Provider.find(params[:account][:provider_id])) - @account = CloudAccount.find_or_create(params[:account]) + #FIXME: owner is set to current user for self-service account creation, # but in the more general case we need a way for the admin to pick # a user - # FIXME: automatically grant owner access rights to the pool params[:portal_pool][:owner_id] = @current_user.id + #FIXME: This should probably be in a transaction - if @account.save - @portal_pool = PortalPool.new(params[:portal_pool]) - @portal_pool.cloud_accounts << @account - if @portal_pool.save && @portal_pool.populate_realms_and_images([@account]) - perm = Permission.new(:user => @portal_pool.owner, + @portal_pool = PortalPool.new(params[:portal_pool]) + perm = Permission.new(:user => @portal_pool.owner, :role => Role.find_by_name("Instance Creator and User"), :permission_object => @portal_pool) - perm.save! - # FIXME: do we need any more handling around save failures? What if perm - # creation fails? - flash[:notice] = "Pool added." - redirect_to :action => 'show', :id => @portal_pool.id - else - render :action => 'new' - end - else - render :action => 'new' - end + perm.save! + # FIXME: do we need any more handling around save failures? What if perm + # creation fails? + flash[:notice] = "Pool added." + redirect_to :action => 'show', :id => @portal_pool.id end def delete diff --git a/src/app/controllers/provider_controller.rb b/src/app/controllers/provider_controller.rb index f85b3b4..b7e10a5 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -50,4 +50,22 @@ class ProviderController < ApplicationController redirect_to :action => "index" end + def accounts + @provider = Provider.find(params[:id]) + require_privilege(Privilege::PROVIDER_VIEW, @provider) + end + + def new_account + @provider = Provider.find(params[:id]) + require_privilege(Privilege::PROVIDER_VIEW, @provider) + end + + def create_account + require_privilege(Privilege::PROVIDER_MODIFY) + @acct = CloudAccount.find_or_create(params[:account]) + @provider = Provider.find(params[:account][:provider_id]) + @provider.cloud_accounts << @acct + redirect_to :action => 'accounts', :id => @provider.id + end + end diff --git a/src/app/views/layouts/_main_nav.html.erb b/src/app/views/layouts/_main_nav.html.erb index 894318e..18ee43a 100644 --- a/src/app/views/layouts/_main_nav.html.erb +++ b/src/app/views/layouts/_main_nav.html.erb @@ -24,4 +24,6 @@ </li> <% } %> </ul> -<%=link_to "Add a provider", {:controller => "provider", :action => "new"}, :class => "actionlink" %> \ No newline at end of file +<%=link_to "Add a provider", {:controller => "provider", :action => "new"}, :class => "actionlink" %> + +<%=link_to "Add a pool", {:controller => "portal_pool", :action => "new"}, :class => "actionlink" %> diff --git a/src/app/views/portal_pool/new.html.erb b/src/app/views/portal_pool/new.html.erb index adba03c..e98fc4b 100644 --- a/src/app/views/portal_pool/new.html.erb +++ b/src/app/views/portal_pool/new.html.erb @@ -2,18 +2,9 @@ <%= error_messages_for 'portal_pool' %> <%= error_messages_for 'account' %> - <h2>Add a Pool and Account for this Provider</h2><br /> + <h2>Create a new Pool</h2><br /> <% form_tag :action => 'create' do -%> - <fieldset> - <legend>Account</legend> - <ul> - <li><label>UserName<span>UserName for the account you wish to connect to this pool.</span></label><%= text_field :account, :username %></li> - <li><label>Password<span>Password for the account you wish to connect to this pool.</span></label><%=password_field :account, :password %></li> - </ul> - <%=hidden_field :account, :provider_id %> - </fieldset> - <fieldset> <legend>Pool</legend> <ul> <li><label>Name<span>Provide a descriptive name for this pool.</span></label><%= text_field :portal_pool, :name %></li> @@ -21,4 +12,4 @@ </fieldset> <%= submit_tag "Save", :class => "submit" %> <% end %> -</div> \ No newline at end of file +</div> diff --git a/src/app/views/provider/accounts.html.erb b/src/app/views/provider/accounts.html.erb new file mode 100644 index 0000000..d4c30cf --- /dev/null +++ b/src/app/views/provider/accounts.html.erb @@ -0,0 +1,19 @@ +<% if @provider.cloud_accounts.size == 0 %> +<h1>There are no pools to display</h1> +<% else %> + <table> + <thead> + <tr> + <th scope="col">Username</th> + </tr> + </thead> + <tbody> + <%(a)provider.cloud_accounts.each {|acct| %> + <tr> + <td><%= acct.username %></td> + </tr> + <% } %> + </tbody> + </table> +<% end %> +<%= link_to "Add an account", {:action => "new_account", :id => @provider}, :class => "actionlink" %> diff --git a/src/app/views/provider/new_account.html.erb b/src/app/views/provider/new_account.html.erb new file mode 100644 index 0000000..177906b --- /dev/null +++ b/src/app/views/provider/new_account.html.erb @@ -0,0 +1,18 @@ +<div class="dcloud_form"> + <%= error_messages_for 'portal_pool' %> + <%= error_messages_for 'account' %> + + <h2>Create an Account for this Provider</h2><br /> + + <% form_tag :action => 'create_account' do -%> + <fieldset> + <legend>Account</legend> + <ul> + <li><label>UserName<span>UserName for the account you wish to connect to this pool.</span></label><%= text_field :account, :username %></li> + <li><label>Password<span>Password for the account you wish to connect to this pool.</span></label><%=password_field :account, :password %></li> + </ul> + <%=hidden_field :account, :provider_id, :value => @provider.id %> + </fieldset> + <%= submit_tag "Save", :class => "submit" %> + <% end %> +</div> diff --git a/src/app/views/provider/show.html.erb b/src/app/views/provider/show.html.erb index ae5c092..299346f 100644 --- a/src/app/views/provider/show.html.erb +++ b/src/app/views/provider/show.html.erb @@ -18,8 +18,8 @@ </tbody> </table> <% end %> -<%= link_to "Add a pool", {:controller => "portal_pool", :action => "new", :provider => @provider}, :class => "actionlink" %> +<%= link_to "Add a pool", {:controller => "portal_pool", :action => "new", :provider => @provider}, :class => "actionlink" %> <% form_tag :action => 'destroy' do %> <%=hidden_field :provider, :id %> <%= submit_tag "Delete Provider", :class => "submit_link" %> -<% end %> \ No newline at end of file +<% end %> diff --git a/src/spec/controllers/portal_pool_controller_spec.rb b/src/spec/controllers/portal_pool_controller_spec.rb new file mode 100644 index 0000000..d409c3a --- /dev/null +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -0,0 +1,34 @@ +require 'spec_helper' + +describe PortalPoolController do + + before(:each) do + @admin_permission = Factory :admin_permission + @admin = @admin_permission.user + activate_authlogic + end + + it "should provide ui to create new pool" do + UserSession.create(@admin) + get :new + response.should be_success + response.should render_template("new") + end + + it "should fail to grant access to new pool ui for unauthenticated user" do + get :new + response.should_not be_success + 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') + end + + +end diff --git a/src/spec/controllers/provider_controller_spec.rb b/src/spec/controllers/provider_controller_spec.rb new file mode 100644 index 0000000..ea67580 --- /dev/null +++ b/src/spec/controllers/provider_controller_spec.rb @@ -0,0 +1,36 @@ +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 + activate_authlogic + end + + + it "should provide ui to view accounts" do + UserSession.create(@admin) + get :accounts, :id => @provider.id + response.should be_success + response.should render_template("accounts") + end + + it "should provide ui to create new account" do + UserSession.create(@admin) + get :new_account, :id => @provider.id + response.should be_success + response.should render_template("new_account") + end + + it "should fail to grant access to account UIs for unauthenticated user" do + get :accounts + response.should_not be_success + + get :new_account + response.should_not be_success + end + +end diff --git a/src/spec/factories/base_portal_object.rb b/src/spec/factories/base_portal_object.rb new file mode 100644 index 0000000..af4c8bd --- /dev/null +++ b/src/spec/factories/base_portal_object.rb @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..0e99f97 --- /dev/null +++ b/src/spec/factories/permission.rb @@ -0,0 +1,14 @@ +Factory.define :permission do |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) } +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) } +end diff --git a/src/spec/factories/portal_pool.rb b/src/spec/factories/portal_pool.rb new file mode 100644 index 0000000..0b20647 --- /dev/null +++ b/src/spec/factories/portal_pool.rb @@ -0,0 +1,8 @@ +Factory.define :portal_pool do |p| + p.name 'mypool' + p.owner { |owner| owner.association(:user, :login => 'pool_owner', :email => 'pool_owner(a)example.com') } +end + +Factory.define :tpool, :parent => :portal_pool do |p| + p.name 'tpool' +end diff --git a/src/spec/factories/privilege.rb b/src/spec/factories/privilege.rb new file mode 100644 index 0000000..46bdeb4 --- /dev/null +++ b/src/spec/factories/privilege.rb @@ -0,0 +1,14 @@ +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 new file mode 100644 index 0000000..ae1abd2 --- /dev/null +++ b/src/spec/factories/provider.rb @@ -0,0 +1,8 @@ +Factory.define :provider do |p| +end + +Factory.define :mock1, :parent => :provider do |p| + p.name 'mock1' + p.cloud_type 'mock' + p.url 'http://localhost:3001/api' +end diff --git a/src/spec/factories/role.rb b/src/spec/factories/role.rb new file mode 100644 index 0000000..b126721 --- /dev/null +++ b/src/spec/factories/role.rb @@ -0,0 +1,24 @@ +# 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 637600c..1a82c72 100644 --- a/src/spec/factories/user.rb +++ b/src/spec/factories/user.rb @@ -11,3 +11,13 @@ 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 -- 1.6.2.5

2 1

[PATCH core] Error handling and Rackspace fixes
by David Lutterkort 12 Mar '10

12 Mar '10

These patches started with me tryingto fix whatever was going wrong in the Rackspace driver. In the process I improved the infrastructure for reporting errors from talking to a backend cloud into the XML and HTML responses. David

2 12

Feature and test infra fixes
by jason.guiditta 11 Mar '10

11 Mar '10

[PATCH portal 1/2] Try to clean up some test setup issues. [PATCH portal 2/2] Add private pool for user on register. Patch 1/2 fixes some db setup for tests that was causing Mo and I some problems, hopefully this takes care of his (it did for mine). Patch 2/2 is another features, automating creation of a private pool when a user registers. NOTE: These two patches depend on my previous set, as the need for 1/2 was discovered while 2/2 was in progress.

1 2

Gem problem running deltacloud-core/client
by Wade Minter 11 Mar '10

11 Mar '10

I'm attempting to set up a Deltacloud instance here at Rackspace, and have a question: I have the deltacloud-core/server instance running, but when I attempt to run the client (bin/deltacloudc), it's attempting to load a "deltacloud" gem. I can't seem to find that gem in any of the gemspecs that I have. Am I missing a project? --Wade _________________________________________ H. Wade Minter Corporate Development Rackspace Hosting Twitter: @minter / Mobile: 210-618-4708 Our Partners: http://tools.rackspacecloud.com/ Confidentiality Notice: This e-mail message (including any attached or embedded documents) is intended for the exclusive and confidential use of the individual or entity to which this message is addressed, and unless otherwise expressly indicated, is confidential and privileged information of Rackspace. Any dissemination, distribution or copying of the enclosed material is prohibited. If you receive this transmission in error, please notify us immediately by e-mail at abuse(a)rackspace.com, and delete the original message. Your cooperation is appreciated.

3 3

Reworked grant_admin_privileges to Rake task
by Michal Fojtik 10 Mar '10

10 Mar '10

Hi, This is just a rework of ./script/grant_admin_privileges to be an rake task. Usage: rake grant:admin_privileges[<user>] RAILS_ENV='production' rake grant:admin_privileges[<user>] Michal

2 2

Announce: C API for deltacloud
by Chris Lalancette 09 Mar '10

09 Mar '10

All, I've just released the preliminary version of a C API for accessing deltacloud, called dcloudapi. You can get it here: git clone git://git.fedorahosted.org/git/deltacloud/dcloudapi.git/ Note that it is still early on in the development, so the API is subject to change, but right now it implements all of the methods that the ruby client does. I'm already using it to build the condor GAHP, so it is somewhat useful, but if you have questions or comments about it, please let me know. Any discussion about it should be sent to deltacloud-devel for now. -- Chris Lalancette

1 0

[PATCH] Remove taskomatic from RPM packaging.
by Ian Main 08 Mar '10

08 Mar '10

I think this is everything needed to remove taskomatic from RPM package. I won't be around to push this so please review and push if it's ok. Signed-off-by: Ian Main <imain(a)redhat.com> --- conf/deltacloud-portal.logrotate | 6 --- conf/deltacloud-taskomatic | 66 -------------------------------------- deltacloud-aggregator.spec.in | 10 ++---- 3 files changed, 3 insertions(+), 79 deletions(-) delete mode 100755 conf/deltacloud-taskomatic diff --git a/conf/deltacloud-portal.logrotate b/conf/deltacloud-portal.logrotate index 2269869..3d10fd9 100644 --- a/conf/deltacloud-portal.logrotate +++ b/conf/deltacloud-portal.logrotate @@ -4,12 +4,6 @@ compress missingok notifempty -/var/log/deltacloud-aggregator/taskomatic.log { - postrotate - /etc/init.d/deltacloud-taskomatic restart - endscript -} - /var/log/deltacloud-aggregator/rails.log /var/log/deltacloud-aggregator/thin.log { sharedscripts postrotate diff --git a/conf/deltacloud-taskomatic b/conf/deltacloud-taskomatic deleted file mode 100755 index c9e2a72..0000000 --- a/conf/deltacloud-taskomatic +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# -# -# deltacloud-taskomatic startup script for deltacloud-taskomatic -# -# chkconfig: - 97 03 -# description: deltacloud-taskomatic is an essential component of the \ -# deltacloud aggregator. -# - -[ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails - -export RAILS_ENV="${RAILS_ENV:-production}" -export COBBLER_YML="${COBBLER_YML:-/usr/share/deltacloud-aggregator/config/cobbler.yml}" - -DAEMON=/usr/share/deltacloud-aggregator/task-omatic/taskomatic.rb -TASKOMATIC_LOCKFILE="${TASKOMATIC_LOCKFILE:-/var/lock/subsys/deltacloud-taskomatic }" - -. /etc/init.d/functions - -start() { - echo -n "Starting deltacloud-taskomatic: " - daemon $DAEMON - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - touch $TASKOMATIC_LOCKFILE - fi -} - -stop() { - echo -n "Shutting down deltacloud-taskomatic: " - killproc taskomatic.rb - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm $TASKOMATIC_LOCKFILE - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - reload) - ;; - force-reload) - restart - ;; - status) - status $DAEMON - RETVAL=$? - ;; - *) - echo "Usage: deltacloud-taskomatic {start|stop|restart|status}" - exit 1 - ;; -esac -exit $RETVAL diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in index ef0a505..7709b7b 100644 --- a/deltacloud-aggregator.spec.in +++ b/deltacloud-aggregator.spec.in @@ -79,7 +79,6 @@ Documentation and tests for the Deltacloud Aggregator mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc_root} # copy over init scripts and various config -%{__cp} conf/deltacloud-aggregator conf/deltacloud-taskomatic %{buildroot}%{_initrddir} %{__cp} conf/deltacloud-portal.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/deltacloud-aggregator.conf %{__cp} conf/deltacloud-portal.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/deltacloud-aggregator %{__cp} conf/deltacloud-aggregator.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator @@ -101,10 +100,8 @@ mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc # these files will no longer be added explicitly here. touch %{buildroot}%{_localstatedir}/log/%{name}/mongrel.log touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log -touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log # remove the files not needed for the installation -%{__rm} -f %{buildroot}%{app_root}/task-omatic/.gitignore %{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore %{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest @@ -127,13 +124,10 @@ getent passwd dcloud >/dev/null || \ %post daemons # Register the httpd service -/sbin/chkconfig --add deltacloud-taskomatic /sbin/chkconfig --add deltacloud-aggregator %preun daemons if [ $1 = 0 ]; then -/sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 -/sbin/chkconfig --del deltacloud-taskomatic /sbin/service deltacloud-aggregator stop > /dev/null 2>&1 /sbin/chkconfig --del deltacloud-aggregator fi @@ -151,7 +145,6 @@ fi %files daemons %defattr(-,root,root,-) %{_initrddir}/deltacloud-aggregator -%{_initrddir}/deltacloud-taskomatic %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-aggregator %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails @@ -167,6 +160,9 @@ fi %doc README AUTHORS COPYING %changelog +* Sat Mar 6 2010 Ian Main <imain(a)redhat.com> - 0.0.2-2 +- removed taskomatic from packaging. + * Wed Feb 18 2010 Mohammed Morsi <mmorsi(a)redhat.com> - 0.0.2-1 - renamed portal to aggregator - updated / cleaned up package -- 1.6.2.5

2 1

Added gemspec for core (renamed+fixed path)
by Michal Fojtik 08 Mar '10

08 Mar '10

Hi, I changed name to deltacloud-core and fixed starter. I squashed these patches to one, for easy review. - Michal

2 4

[PATCH] Remove taskomatic from rpm spec.
by Ian Main 07 Mar '10

07 Mar '10

No more taskomatic.. *sniff*. Signed-off-by: Ian Main <imain(a)redhat.com> --- deltacloud-portal.spec.in | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/deltacloud-portal.spec.in b/deltacloud-portal.spec.in index 642da34..7ab17a0 100644 --- a/deltacloud-portal.spec.in +++ b/deltacloud-portal.spec.in @@ -71,14 +71,12 @@ mkdir %{buildroot} # these files will no longer be added explicitly here. touch %{buildroot}%{_localstatedir}/log/%{name}/mongrel.log touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log -touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log %{__install} -p -m0644 %{pbuild}/conf/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d %{__install} -p -m0644 %{pbuild}/conf/%{name}.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-mongrel-rails %{buildroot}%{_initrddir} %{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-mongrel-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-mongrel-rails %{__install} -Dp -m0644 %{pbuild}/conf/deltacloud-rails.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-rails -%{__install} -Dp -m0755 %{pbuild}/conf/deltacloud-taskomatic %{buildroot}%{_initrddir} # copy over all of the src directory... %{__cp} -a %{pbuild}/src/* %{buildroot}%{app_root} @@ -95,7 +93,6 @@ touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log %{__ln_s} %{_sysconfdir}/%{name}/test.rb %{buildroot}%{app_root}/config/environments # remove the files not needed for the installation -%{__rm} -f %{buildroot}%{app_root}/task-omatic/.gitignore %{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore %{__rm} -f %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest @@ -127,20 +124,16 @@ fi \ # on; otherwise, we respect the choices the administrator already has made. # check this by seeing if each daemon is already installed %daemon_chkconfig_post -d deltacloud-mongrel-rails -%daemon_chkconfig_post -d deltacloud-taskomatic %preun if [ "$1" = 0 ] ; then /sbin/service deltacloud-mongrel-rails stop > /dev/null 2>&1 - /sbin/service deltacloud-taskomatic stop > /dev/null 2>&1 /sbin/chkconfig --del deltacloud-mongrel-rails - /sbin/chkconfig --del deltacloud-taskomatic fi %files %defattr(-,root,root,0755) %{_initrddir}/deltacloud-mongrel-rails -%{_initrddir}/deltacloud-taskomatic %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-mongrel-rails %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails -- 1.6.2.5

1 1

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel March 2010