deltacloud-devel March 2010

deltacloud-devel@lists.fedorahosted.org

15 participants
103 discussions

[PATCH portal] Add private pool for user on register.
by jason.guiditta 16 Mar '10

16 Mar '10

This registration service may be able to be abstracted/ reused in future patches. --- src/app/controllers/users_controller.rb | 3 +- src/app/services/registration_service.rb | 29 +++++++++++++ src/features/authentication.feature | 1 + src/features/step_definitions/authentication.rb | 5 ++ src/features/support/env.rb | 8 +++- src/spec/controllers/users_controller_spec.rb | 51 +++++++++++++++++++---- src/spec/fixtures/privileges.yml | 39 +++++++++++++++++ src/spec/fixtures/roles.yml | 47 +++++++++++++++++++++ src/spec/models/registration_service_spec.rb | 51 +++++++++++++++++++++++ 9 files changed, 224 insertions(+), 10 deletions(-) create mode 100644 src/app/services/registration_service.rb create mode 100644 src/spec/fixtures/privileges.yml create mode 100644 src/spec/fixtures/roles.yml create mode 100644 src/spec/models/registration_service_spec.rb diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb index 310edf6..6c6c021 100644 --- a/src/app/controllers/users_controller.rb +++ b/src/app/controllers/users_controller.rb @@ -29,7 +29,8 @@ class UsersController < ApplicationController def create @user = User.new(params[:user]) - if @user.save + @registration = RegistrationService.new(@user) + if @registration.save flash[:notice] = "User registered!" redirect_back_or_default account_url else diff --git a/src/app/services/registration_service.rb b/src/app/services/registration_service.rb new file mode 100644 index 0000000..e8d2e65 --- /dev/null +++ b/src/app/services/registration_service.rb @@ -0,0 +1,29 @@ +class RegistrationService + + def initialize(user) + @user = user + end + + def save + return false unless valid? + begin + User.transaction do + @user.save! + PortalPool.transaction do + @portal_pool = PortalPool.create!({ :name => @user.login, :owner => @user}) + Permission.transaction do + Permission.create!({:user => @user, + :role => Role.find_by_name("Self-service Pool User"), + :permission_object => @portal_pool}) + end + end + end + rescue + false + end + end + + def valid? + @user.valid? + end +end \ No newline at end of file diff --git a/src/features/authentication.feature b/src/features/authentication.feature index 0dea3ac..78754b9 100644 --- a/src/features/authentication.feature +++ b/src/features/authentication.feature @@ -19,6 +19,7 @@ Feature: User authentication And I press "Create Account" Then I should be on the account page And I should see "User registered!" + And I should have one private pool named "testuser" Scenario: Log in as registered user Given I am a registered user diff --git a/src/features/step_definitions/authentication.rb b/src/features/step_definitions/authentication.rb index 92e7874..7abcb83 100644 --- a/src/features/step_definitions/authentication.rb +++ b/src/features/step_definitions/authentication.rb @@ -35,3 +35,8 @@ end Then /^I should be logged out$/ do UserSession.find.should == nil end + +Then /^I should have one private pool named "([^\"]*)"$/ do |login| + PortalPool.find_by_name(login).should_not be_nil + PortalPool.find_by_name(login).permissions.size.should == 1 +end diff --git a/src/features/support/env.rb b/src/features/support/env.rb index 917fb2d..341854f 100644 --- a/src/features/support/env.rb +++ b/src/features/support/env.rb @@ -4,7 +4,7 @@ # instead of editing this one. Cucumber will automatically load all features/**/*.rb # files. -ENV["RAILS_ENV"] ||= "cucumber" +ENV["RAILS_ENV"] ||= "test" require File.expand_path(File.dirname(__FILE__) + '/../../config/environment') require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support @@ -47,6 +47,12 @@ ActionController::Base.allow_rescue = false # block that will explicitly put your database in a known state. Cucumber::Rails::World.use_transactional_fixtures = true +#Seed the DB with fixture data +Fixtures.reset_cache +fixtures_folder = File.join(RAILS_ROOT, 'spec', 'fixtures') +fixtures = Dir[File.join(fixtures_folder, '*.yml')].map {|f| File.basename(f, '.yml') } +Fixtures.create_fixtures(fixtures_folder, fixtures) + # How to clean your database when transactions are turned off. See # http://github.com/bmabey/database_cleaner for more info. require 'database_cleaner' diff --git a/src/spec/controllers/users_controller_spec.rb b/src/spec/controllers/users_controller_spec.rb index 1c18ba7..5f010cc 100644 --- a/src/spec/controllers/users_controller_spec.rb +++ b/src/spec/controllers/users_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe UsersController do - + fixtures :all before(:each) do @tuser = Factory :tuser activate_authlogic @@ -15,13 +15,48 @@ describe UsersController do response.should be_success end - it "should create user" do - lambda { - post :create, :user => { :login => "tuser2", :email => "tuser2(a)example.com", - :password => "testpass", - :password_confirmation => "testpass" } - }.should change{ User.count } - response.should redirect_to(account_path) + describe "#create" do + before(:each) do + + end + + context "user enters valid input" do + it "should create user" do + lambda { + post :create, :user => { :login => "tuser2", :email => "tuser2(a)example.com", + :password => "testpass", + :password_confirmation => "testpass" } + }.should change{ User.count } + p = PortalPool.find_by_name("tuser2") + p.should_not be_nil + assigns[:user].login.should == p.owner.login + p.name.should == "tuser2" + p.permissions.size.should == 1 + p.permissions.any? { + |perm| perm.role.name.eql?('Self-service Pool User') + }.should be_true + response.should redirect_to(account_path) + end + + it "fails to create pool" do + lambda { + post :create, :user => {} + }.should_not change{ User.count } + p = PortalPool.find_by_name("tuser2") + p.should be_nil + returned_user = assigns[:user] + returned_user.errors.empty?.should be_false + returned_user.should have(2).errors_on(:login) + returned_user.should have(2).errors_on(:email) + returned_user.should have(1).error_on(:password) + returned_user.should have(1).error_on(:password_confirmation) + #assigns[:user].errors.find_all {|attr,msg| + # ["login", "email", "password", "password_confirmation"]. + # include?(attr).should be_true + #} + response.should render_template('new') + end + end end it "should show user" do 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/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/models/registration_service_spec.rb b/src/spec/models/registration_service_spec.rb new file mode 100644 index 0000000..aa25a1e --- /dev/null +++ b/src/spec/models/registration_service_spec.rb @@ -0,0 +1,51 @@ +require 'spec_helper' + +describe RegistrationService do + fixtures :all + before(:each) do + @tuser = Factory :tuser + end + + it "should initialize a new instance given valid attributes" do + RegistrationService.new(@tuser) + end + + describe "#save" do + + context "adding valid user with no errors" do + it "should create user, portal_pool and self-service permission" do + user = User.new({:login => 'gooduser', + :email => 'guser(a)example.com', + :password => 'password', + :password_confirmation => 'password'}) + r = RegistrationService.new(user) + roles = Role.find(:all) + Rails::logger.info("Current Roles: ") + Rails::logger.info(roles.each {|role| role.name}) + Rails::logger.info("ERRORS - Printing errors on user object:") + Rails::logger.info( + user.errors.each_full { |msg| "ERROR: #{msg}" } + ) + r.save.should be_true + end + end + + context "save fails" do + it "should return errors on user when user is missing required field" do + user = User.new(:login => 'baduser') + r = RegistrationService.new(user) + r.save.should be_false + user.errors.empty?.should be_false + #Rails::logger.info(msg) + user.errors.find_all {|attr,msg| + ["email", "password", "password_confirmation"].include?(attr).should be_true + } + end + + it "should return portal_pool errors if pool create fails" do + #TODO: implement this test. We should check this, but not sure of best + # way right now. + end + end + end +end -- 1.6.6.1

2 2

[PATCH portal] automatically update instance state before displaying the list. (revised)
by Scott Seago 16 Mar '10

16 Mar '10

This is necessary for ec2 instances now or they'll never leave the 'pending' state. I've tested this with ec2 and both starting and stopping. Eventually this needs a more robust auto-updating infrastructure once we have the scheduler in place. Signed-off-by: Scott Seago <sseago(a)redhat.com> --- src/app/controllers/portal_pool_controller.rb | 5 +++++ src/app/util/taskomatic.rb | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index d17eaac..90df8a5 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -19,6 +19,8 @@ # Filters added to this controller apply to all controllers in the application. # Likewise, all the methods added will be available for all controllers. +require 'util/taskomatic' + class PortalPoolController < ApplicationController before_filter :require_user @@ -30,6 +32,9 @@ class PortalPoolController < ApplicationController #FIXME: clean this up, many error cases here @pool = PortalPool.find(params[:id]) require_privilege(Privilege::INSTANCE_VIEW,@pool) + # pass nil into Taskomatic as we're not working off a task here + Taskomatic.new(nil,logger).pool_refresh(@pool) + @pool.reload @instances = @pool.instances end diff --git a/src/app/util/taskomatic.rb b/src/app/util/taskomatic.rb index 127c8e0..c0dcbef 100644 --- a/src/app/util/taskomatic.rb +++ b/src/app/util/taskomatic.rb @@ -26,6 +26,8 @@ def dcloud_to_instance_state(state_str) return Instance::STATE_RUNNING when 'STOPPED' return Instance::STATE_STOPPED + when 'TERMINATED' + return Instance::STATE_STOPPED when 'SHUTTING_DOWN' return Instance::STATE_SHUTTING_DOWN else @@ -123,5 +125,25 @@ class Taskomatic @task.time_ended = Time.now @task.save! end + + # FIXME: this should probably eventually enforce a max refresh rate to prevent + # too many refreshes causing scalability problems. In addition this will need + # to be handled by the scheduler + def pool_refresh(pool) + account_clients = {} + pool.instances.each do |instance| + if instance.cloud_account and instance.state != Instance::STATE_NEW + account_clients[instance.cloud_account_id] ||= instance.cloud_account.connect + api_instance = account_clients[instance.cloud_account_id].instance(instance.external_key) + if api_instance + @logger.debug("updating instance state for #{instance.name}: #{instance.external_key}. #{api_instance}") + instance.state = dcloud_to_instance_state(api_instance.state) + instance.save! + else + instance.destroy + end + end + end + end end -- 1.6.2.5

2 1

15 Mar '10

[PATCH portal 1/3] Update auth features to reflect changes in design. [PATCH portal 2/3] Extend user model. [PATCH portal 3/3] Extend new user form, initial layout fixes. This is a subset of the patches from last week - there were some issues with changes I made to test-harness stuff which seems to have conflicted with other recently pushed patches, so I just stripped it out. Rake cucumber and spec shoudl now pass after applying these three patches (with drop/create db of course, as already discussed). -j

2 7

[PATCH] UI to view the list of provider accounts in a pool (revision 2)
by Mo Morsi 15 Mar '10

15 Mar '10

new ui / backend, cleaned up, and included tests --- src/app/controllers/portal_pool_controller.rb | 4 +++ src/app/views/portal_pool/accounts.html.erb | 21 ++++++++++++++++++++ .../controllers/portal_pool_controller_spec.rb | 9 ++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 src/app/views/portal_pool/accounts.html.erb diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index d17eaac..584028c 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -33,6 +33,10 @@ class PortalPoolController < ApplicationController @instances = @pool.instances end + def accounts + @pool = PortalPool.find(params[:id]) + end + def new require_privilege(Privilege::POOL_MODIFY) @portal_pool = PortalPool.new 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..34b8eb3 100644 --- a/src/spec/controllers/portal_pool_controller_spec.rb +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -30,5 +30,14 @@ describe PortalPoolController do response.should redirect_to('http://test.host/portal_pool/show/1') 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 -- 1.6.2.5

2 2

[PATCH] UI to view the list of provider accounts in a pool (revision 3)
by Mo Morsi 15 Mar '10

15 Mar '10

new ui / backend / tests --- src/app/controllers/portal_pool_controller.rb | 5 ++++ src/app/views/portal_pool/accounts.html.erb | 21 ++++++++++++++++++++ .../controllers/portal_pool_controller_spec.rb | 8 +++++++ src/spec/factories/privilege.rb | 4 +++ src/spec/factories/role.rb | 3 +- 5 files changed, 40 insertions(+), 1 deletions(-) create mode 100644 src/app/views/portal_pool/accounts.html.erb diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index d17eaac..2f83e1e 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -33,6 +33,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/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..35727d9 100644 --- a/src/spec/controllers/portal_pool_controller_spec.rb +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -30,5 +30,13 @@ describe PortalPoolController do response.should redirect_to('http://test.host/portal_pool/show/1') 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/factories/privilege.rb b/src/spec/factories/privilege.rb index 46bdeb4..cdc3fc7 100644 --- a/src/spec/factories/privilege.rb +++ b/src/spec/factories/privilege.rb @@ -12,3 +12,7 @@ end Factory.define :view_provider_priv, :parent => :privilege do |p| p.name 'provider_view' end + +Factory.define :view_pool_instance_priv, :parent => :privilege do |p| + p.name 'instance_view' +end diff --git a/src/spec/factories/role.rb b/src/spec/factories/role.rb index b126721..aef1f3e 100644 --- a/src/spec/factories/role.rb +++ b/src/spec/factories/role.rb @@ -8,7 +8,8 @@ Factory.define :admin_role, :parent => :role do |r| r.scope 'BasePortalObject' r.privileges { |p| [ p.association(:modify_pool_priv), p.association(:modify_provider_priv), - p.association(:view_provider_priv) ] } + p.association(:view_provider_priv), + p.association(:view_pool_instance_priv)] } end Factory.define :instance_creator, :parent => :role do |r| -- 1.6.2.5

1 0

[PATCH] UI to view the list of provider accounts in a pool (revision 1)
by Mo Morsi 15 Mar '10

15 Mar '10

new ui / backend, cleaned up, and included tests --- src/app/controllers/portal_pool_controller.rb | 4 +++ src/app/views/portal_pool/accounts.html.erb | 21 ++++++++++++++++++++ .../controllers/portal_pool_controller_spec.rb | 19 ++++++++++++++++++ src/spec/factories/portal_pool.rb | 8 +++++++ 4 files changed, 52 insertions(+), 0 deletions(-) create mode 100644 src/app/views/portal_pool/accounts.html.erb create mode 100644 src/spec/controllers/portal_pool_controller_spec.rb create mode 100644 src/spec/factories/portal_pool.rb diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 24e530d..0b6ea6e 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -33,6 +33,10 @@ class PortalPoolController < ApplicationController @instances = @pool.instances end + def accounts + @pool = PortalPool.find(params[:id]) + end + def new @portal_pool = PortalPool.new @account = CloudAccount.new 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 new file mode 100644 index 0000000..6b3a09c --- /dev/null +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -0,0 +1,19 @@ +require 'spec_helper' + +describe PortalPoolController do + + before(:each) do + @pool = Factory :tpool + @tuser = Factory :tuser + activate_authlogic + end + + it "should get cloud accounts" do + UserSession.create(@tuser) + 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/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 -- 1.6.2.5

2 2

[PATCH docs 1/8] Add steps for switching to the `next` branch.
by Tomas Sedovic 13 Mar '10

13 Mar '10

From: Tomas Sedovic <tsedovic(a)redhat.com> The `next` branch has the latest & greatest. However, git checks out `master` by default. This mentions the fact in getting started guide. --- getting_started.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/getting_started.txt b/getting_started.txt index 9cd66c7..db4041e 100644 --- a/getting_started.txt +++ b/getting_started.txt @@ -55,6 +55,15 @@ $ git clone git://git.fedorahosted.org/git/deltacloud/docs.git/ $ git clone git://git.fedorahosted.org/git/deltacloud/portal.git/ - The deltacloud aggregator code +Switch the `docs` and `portal` repositories to the "next" branch: + +$ cd docs +$ git checkout -t origin/next +$ cd ../portal +$ git checkout -t origin/next + +This will get you to the latest and greatest stuff. + Installing packages ------------------- In order to make the deltacloud components work, you'll need to -- 1.6.6.1

2 12

[PATCH portal] Add basic rspec tests for the task model.
by Tomas Sedovic 12 Mar '10

12 Mar '10

From: Tomas Sedovic <tsedovic(a)redhat.com> --- src/spec/models/task_spec.rb | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 src/spec/models/task_spec.rb diff --git a/src/spec/models/task_spec.rb b/src/spec/models/task_spec.rb new file mode 100644 index 0000000..ffdb604 --- /dev/null +++ b/src/spec/models/task_spec.rb @@ -0,0 +1,34 @@ +require 'spec_helper' + +describe Task do + + before(:each) do + @task = InstanceTask.new( {} ) + end + + it "should begin in a queued state" do + @task.state.should eql('queued') + end + + it "should be invalid with unknown type" do + @task.should be_valid + @task.type = 'TotallyInvalidTask' + @task.should_not be_valid + end + + it "should be invalid with unknown state" do + @task.should be_valid + @task.state = 'BetYouDidNotExpectThisState' + @task.should_not be_valid + end + + it "should be able to get canceled" do + @task.cancel + @task.state.should eql('canceled') + end + + it "should provide a type label" do + @task.type_label.should eql('Instance') + end + +end -- 1.6.6.1

2 1

UI: Added Jquery validation in registration form
by Michal Fojtik 12 Mar '10

12 Mar '10

Hi, A small addition to registration form. Jquery plugin called 'validate' for handling form validation in registration form. Looks pretty nice and save some time to user. PS: I hope that SMTP server will not screw up plugin file, because it contains more than 998 characters on one line (https://kerneltrap.org/mailarchive/git/2008/1/18/579779)

2 3

[PATCH portal] automatically update instance state before displaying the list.
by Scott Seago 12 Mar '10

12 Mar '10

This is necessary for ec2 instances now or they'll never leave the 'pending' state. I've tested this with ec2 and both starting and stopping. Eventually this needs a more robust auto-updating infrastructure once we have the scheduler in place. Signed-off-by: Scott Seago <sseago(a)redhat.com> --- src/app/controllers/portal_pool_controller.rb | 4 ++++ src/app/util/taskomatic.rb | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index d17eaac..366663c 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -19,6 +19,8 @@ # Filters added to this controller apply to all controllers in the application. # Likewise, all the methods added will be available for all controllers. +require 'util/taskomatic' + class PortalPoolController < ApplicationController before_filter :require_user @@ -30,6 +32,8 @@ class PortalPoolController < ApplicationController #FIXME: clean this up, many error cases here @pool = PortalPool.find(params[:id]) require_privilege(Privilege::INSTANCE_VIEW,@pool) + # pass nil into Taskomatic as we're not working off a task here + Taskomatic.new(nil,logger).pool_refresh(@pool) @instances = @pool.instances end diff --git a/src/app/util/taskomatic.rb b/src/app/util/taskomatic.rb index 127c8e0..c0dcbef 100644 --- a/src/app/util/taskomatic.rb +++ b/src/app/util/taskomatic.rb @@ -26,6 +26,8 @@ def dcloud_to_instance_state(state_str) return Instance::STATE_RUNNING when 'STOPPED' return Instance::STATE_STOPPED + when 'TERMINATED' + return Instance::STATE_STOPPED when 'SHUTTING_DOWN' return Instance::STATE_SHUTTING_DOWN else @@ -123,5 +125,25 @@ class Taskomatic @task.time_ended = Time.now @task.save! end + + # FIXME: this should probably eventually enforce a max refresh rate to prevent + # too many refreshes causing scalability problems. In addition this will need + # to be handled by the scheduler + def pool_refresh(pool) + account_clients = {} + pool.instances.each do |instance| + if instance.cloud_account and instance.state != Instance::STATE_NEW + account_clients[instance.cloud_account_id] ||= instance.cloud_account.connect + api_instance = account_clients[instance.cloud_account_id].instance(instance.external_key) + if api_instance + @logger.debug("updating instance state for #{instance.name}: #{instance.external_key}. #{api_instance}") + instance.state = dcloud_to_instance_state(api_instance.state) + instance.save! + else + instance.destroy + end + end + end + end end -- 1.6.2.5

1 0

← Newer
1
2
3
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