deltacloud-devel October 2010

deltacloud-devel@lists.fedorahosted.org

18 participants
204 discussions

Commit message format for BZs
by Jason Guiditta 14 Oct '10

14 Oct '10

Hello all, was just chatting with Scott, and wanted to try to get everyone who is working on BZs to use the same style formatting to make things a bit easier for making sure the right patches get pulled in for QE to test. Nothing complex, just want some consistency: subject line gets 'BZ{#} -regular subject', standard body msg describing what you have done Also would like to get us all doing the same thing when updating a status for a bug that we have fixed. If you send a fix to list, but should be marked POST, and commit hash should be added as a comment. <Maintainer> will move it to MODIFY once that patch has been ACKed, built in rpm on our test repo, and pulled into the branch for QE testing. -j

4 4

deltacloud puppet recipe and installer (rev 2)
by Mo Morsi 14 Oct '10

14 Oct '10

This patchset extracts the deltacloud puppet recipe from the appliance so that it can be used on its own to configure and install/uninstall deltacloud via puppet. Also provided are scripts to install and uninstall deltacloud locally via puppet and to start/stop all deltacloud services. The effect is the same as the deltacloud-configure scripts, just cleaner and more modular/ reusable. As with before, the scripts can be run multiple times, they take care of all the initialization and destruction steps, making sure to avoid conflicts and redundant calls (for example it won't call psql initdb if already initialized, and will just drop the deltacloud db on uninstallation). Also as with before, this patchset depends on the "fix broken init scripts 'status' methods (updated)" patch I sent last week (10/07/2010 @12:47am) to work properly I verified a integration use case involving creating an ec2 provider / account and a template, building an image from that template, and deploying it to a running instance on amazon. This was successful on an existing / long-running F13 system (my local laptop) as well as a freshly installed F13 vm (without any prior config). This is the final draft of this patchset. Pending any further issues that are discovered / fixed, this is ready to be committed. To test, simply apply the patch and run $ rake rpms $ sudo rpm -ivh build/rpmbuild/RPMS/noarch/deltacloud_recipe-0.0.3-1.fc13.noarch.rpm $ sudo /usr/sbin/dc-install (apply 'fix broken init scripts status' patch to aggregator here) $ sudo /usr/sbin/dc-uninstall

1 6

[PATCH aggregator] BZ634071 Display correct message when a user first registers
by Martyn Taylor 14 Oct '10

14 Oct '10

From: martyntaylor <mtaylor(a)redhat.com> --- src/app/controllers/users_controller.rb | 9 +++++++-- src/spec/controllers/users_controller_spec.rb | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb index 8ab16e3..9bd037c 100644 --- a/src/app/controllers/users_controller.rb +++ b/src/app/controllers/users_controller.rb @@ -33,8 +33,13 @@ class UsersController < ApplicationController @registration = RegistrationService.new(@user) if @registration.save - flash[:notice] = "User registered!" - redirect_to users_path + if @current_user + flash[:notice] = "User registered!" + redirect_to users_path + else + flash[:notice] = "You have successfully registered!" + redirect_to :dashboard + end else flash[:warning] = "user registration failed: #{(a)registration.error}" render :action => :new diff --git a/src/spec/controllers/users_controller_spec.rb b/src/spec/controllers/users_controller_spec.rb index ad1f1cd..92435f4 100644 --- a/src/spec/controllers/users_controller_spec.rb +++ b/src/spec/controllers/users_controller_spec.rb @@ -47,7 +47,7 @@ describe UsersController do :password_confirmation => "testpass" } }.should change{ User.count } user = User.find(:first, :conditions => ['login = ?', "tuser2"]) - response.should redirect_to(users_url) + response.should redirect_to(dashboard_url) end it "fails to create pool" do -- 1.7.2.3

2 1

[PATCH aggregator] BZ634083 - Removed Browser Chaching
by Martyn Taylor 14 Oct '10

14 Oct '10

From: martyntaylor <mtaylor(a)redhat.com> --- src/app/controllers/application_controller.rb | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 0b8a015..c959d44 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -36,6 +36,8 @@ class ApplicationController < ActionController::Base rescue_from ActionError, :with => :handle_action_error rescue_from PartialSuccessError, :with => :handle_partial_success_error + before_filter :no_cache + def choose_layout return nil if params[:ajax] if(params[:component_layout]) @@ -230,4 +232,9 @@ class ApplicationController < ActionController::Base redirect_to(default || session[:return_to]) session[:return_to] = nil end + + def no_cache + response.headers["Cache-Control"] = "no-cache, no-store, max-age=0, must-revalidate" + response.headers["Pragma"] = "no-cache" + end end -- 1.7.2.3

2 1

[PATCH aggregator] Removed another obsolete rspec test
by Jan Provazník 14 Oct '10

14 Oct '10

From: Jan Provaznik <jprovazn(a)redhat.com> Is obsolete because of xmls will be downloaded with rake task. --- src/spec/utils/repository_manager_spec.rb | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/src/spec/utils/repository_manager_spec.rb b/src/spec/utils/repository_manager_spec.rb index 5f7d9d4..0d3f748 100644 --- a/src/spec/utils/repository_manager_spec.rb +++ b/src/spec/utils/repository_manager_spec.rb @@ -18,8 +18,6 @@ describe RepositoryManager do Typhoeus::Response.new(:code => 200, :body => @packagegroups_json)) hydra.stub(:get, "http://pulptest/repositories/jboss/packages/").and_return( Typhoeus::Response.new(:code => 200, :body => @packages_json)) - hydra.stub(:get, "http://nonexisting.repo/").and_return( - Typhoeus::Response.new(:code => 404)) @rmanager = RepositoryManager.new(:config => [{ 'baseurl' => 'http://pulptest', @@ -38,12 +36,4 @@ describe RepositoryManager do rep.groups.keys.sort.should == ["JBoss Core Packages", "JBoss Drools", "JBoss Social Networking Web Application"] end - - it "should raise exception when downloading of repomd fails" do - @rmanager = RepositoryManager.new(:config => [{ - 'baseurl' => 'http://nonexisting.repo/', - 'type' => 'xml', - }]) - lambda { @rmanager.all_groups}.should raise_error - end end -- 1.7.2.3

2 1

[PATCH aggregator] BZ634071 - Displayed correct message when a user first registers
by Martyn Taylor 14 Oct '10

14 Oct '10

From: martyntaylor <mtaylor(a)redhat.com> --- src/app/controllers/users_controller.rb | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb index 8ab16e3..9bd037c 100644 --- a/src/app/controllers/users_controller.rb +++ b/src/app/controllers/users_controller.rb @@ -33,8 +33,13 @@ class UsersController < ApplicationController @registration = RegistrationService.new(@user) if @registration.save - flash[:notice] = "User registered!" - redirect_to users_path + if @current_user + flash[:notice] = "User registered!" + redirect_to users_path + else + flash[:notice] = "You have successfully registered!" + redirect_to :dashboard + end else flash[:warning] = "user registration failed: #{(a)registration.error}" render :action => :new -- 1.7.2.3

2 1

[PATCH cloud engine] Fix the failing rspec test for provider
by Tomas Sedovic 14 Oct '10

14 Oct '10

From: Tomas Sedovic <tsedovic(a)redhat.com> --- src/spec/models/provider_spec.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb index fd555e9..fcec747 100644 --- a/src/spec/models/provider_spec.rb +++ b/src/spec/models/provider_spec.rb @@ -63,7 +63,7 @@ describe Provider do it "should set valid cloud type" do @client.driver_name = @provider.cloud_type @provider.cloud_type = nil - @provider.set_cloud_type + @provider.set_cloud_type! @provider.should be_valid end -- 1.7.2.3

2 1

[PATCH aggregator] Fixed Test links on Provider Pages
by Martyn Taylor 14 Oct '10

14 Oct '10

From: martyntaylor <mtaylor(a)redhat.com> --- src/app/controllers/cloud_accounts_controller.rb | 45 +++++++++++++------- src/app/controllers/provider_controller.rb | 34 +++++++++++---- src/app/views/provider/_form.haml | 5 +- src/app/views/provider/accounts.haml | 14 ++---- src/features/provider.feature | 49 +++++++++++++++++++++- src/features/support/custom.rb | 3 - 6 files changed, 111 insertions(+), 39 deletions(-) diff --git a/src/app/controllers/cloud_accounts_controller.rb b/src/app/controllers/cloud_accounts_controller.rb index f1c55b6..9d75347 100644 --- a/src/app/controllers/cloud_accounts_controller.rb +++ b/src/app/controllers/cloud_accounts_controller.rb @@ -31,30 +31,36 @@ class CloudAccountsController < ApplicationController def create @provider = Provider.find(params[:cloud_account][:provider_id]) require_privilege(Privilege::ACCOUNT_MODIFY,@provider) - if not params[:cloud_account][:x509_cert_priv_file].nil? + if params[:cloud_account] && !params[:cloud_account][:x509_cert_priv_file].blank? params[:cloud_account][:x509_cert_priv] = params[:cloud_account][:x509_cert_priv_file].read end params[:cloud_account].delete :x509_cert_priv_file - if not params[:cloud_account][:x509_cert_pub_file].nil? + if params[:cloud_account] && !params[:cloud_account][:x509_cert_pub_file].blank? params[:cloud_account][:x509_cert_pub] = params[:cloud_account][:x509_cert_pub_file].read end params[:cloud_account].delete :x509_cert_pub_file @cloud_account = CloudAccount.new(params[:cloud_account]) - unless @cloud_account.valid_credentials? - flash[:notice] = "The entered credential information is incorrect" - redirect_to :controller => "provider", :action => "accounts", :id => @provider + + if params[:test_account] + test_account(@cloud_account) + redirect_to :controller => "provider", :action => "accounts", :id => @provider, :cloud_account => params[:cloud_account] else - quota = Quota.new - quota.maximum_running_instances = quota_from_string(params[:quota][:maximum_running_instances]) - quota.save! - @cloud_account.quota_id = quota.id - @cloud_account.zones << Zone.default - @cloud_account.save! - if request.post? && @cloud_account.save && @cloud_account.populate_realms - flash[:notice] = "Provider account added." + unless @cloud_account.valid_credentials? + flash[:notice] = "The entered credential information is incorrect" + redirect_to :controller => "provider", :action => "accounts", :id => @provider + else + quota = Quota.new + quota.maximum_running_instances = quota_from_string(params[:quota][:maximum_running_instances]) + quota.save! + @cloud_account.quota_id = quota.id + @cloud_account.zones << Zone.default + @cloud_account.save! + if request.post? && @cloud_account.save && @cloud_account.populate_realms + flash[:notice] = "Provider account added." + end + redirect_to :controller => "provider", :action => "accounts", :id => @provider + kick_condor end - redirect_to :controller => "provider", :action => "accounts", :id => @provider - kick_condor end end @@ -126,6 +132,15 @@ class CloudAccountsController < ApplicationController redirect_to :controller => 'provider', :action => 'accounts', :id => provider.id end + def test_account(account) + if account.valid_credentials? + flash[:notice] = "Test Connection Success: Valid Account Details" + else + flash[:notice] = "Test Connection Failed: Invalid Account Details" + end + rescue + flash[:notice] = "Test Connection Failed: Could not connect to provider" + end private def quota_from_string(quota_raw) diff --git a/src/app/controllers/provider_controller.rb b/src/app/controllers/provider_controller.rb index 7e7f3e5..189c5cb 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -54,15 +54,21 @@ class ProviderController < ApplicationController require_privilege(Privilege::PROVIDER_MODIFY) @providers = Provider.list_for_user(@current_user, Privilege::PROVIDER_MODIFY) @provider = Provider.new(params[:provider]) - @provider.set_cloud_type! - if @provider.save && @provider.populate_hardware_profiles + + if params[:test_connection] + test_connection(@provider) + redirect_to :action => "new", :provider => {:name => @provider.name, :url => @provider.url} + else + @provider.set_cloud_type! + if @provider.save && @provider.populate_hardware_profiles flash[:notice] = "Provider added." redirect_to :action => "show", :id => @provider - else - flash[:notice] = "Cannot add the provider." - render :action => "new" + else + flash[:notice] = "Cannot add the provider." + render :action => "new" + end + kick_condor end - kick_condor end def update @@ -71,8 +77,8 @@ class ProviderController < ApplicationController @provider.name = params[:provider][:name] if @provider.save - flash[:notice] = "Provider updated." - redirect_to :action => "show", :id => @provider + flash[:notice] = "Provider updated." + redirect_to :action => "show", :id => @provider else render :action => "edit" end @@ -104,6 +110,10 @@ class ProviderController < ApplicationController def accounts @provider = Provider.find(:first, :conditions => {:id => params[:id]}) require_privilege(Privilege::ACCOUNT_VIEW, @provider) + if params[:cloud_account] + @cloud_account = CloudAccount.new(params[:cloud_account]) + @quota = Quota.new(params[:quota]) + end end def realms @@ -119,6 +129,14 @@ class ProviderController < ApplicationController def list end + def test_connection(provider) + if @provider.connect + flash[:notice] = "Successfuly Connected to Provider" + else + flash[:notice] = "Failed to Connect to Provider" + end + end + protected def load_providers @providers = Provider.list_for_user(@current_user, Privilege::PROVIDER_VIEW) diff --git a/src/app/views/provider/_form.haml b/src/app/views/provider/_form.haml index d0d1464..6f03d7d 100644 --- a/src/app/views/provider/_form.haml +++ b/src/app/views/provider/_form.haml @@ -28,9 +28,10 @@ - if controller.action_name == 'edit': = f.hidden_field :id, :value => @provider.id .clear.prefix_4.grid_5.suffix_4.alpha.omega - %span + - if !Provider.exists?(@provider) + %span ( - %a{ :href => ''}<> + %button.linkbutton.nospace{ :type => 'submit', :value => t('.test_connection'), :name => 'test_connection', :id => 'test_connection' }<> = t('.test_connection') ) - unless readonly diff --git a/src/app/views/provider/accounts.haml b/src/app/views/provider/accounts.haml index d2b979e..509e727 100644 --- a/src/app/views/provider/accounts.haml +++ b/src/app/views/provider/accounts.haml @@ -61,11 +61,6 @@ .grid_3.omega %a.button{ :href => remove_path, :name => "remove_acc_#{acct.id}", :class => "tiny #{'disabled' unless remove_path}" } = t(:remove) - %span -   ( - %a{ :href => '' }<> - = t('.test_account') - ) %fieldset.clearfix.gap = submit_tag t(:reset), :name => 'reset_form', :class => "dialogbutton" unless @provider.cloud_accounts.empty? = submit_tag t(:save), :name => 'update_cloud_accounts', :class => "dialogbutton" unless @provider.cloud_accounts.empty? @@ -117,11 +112,10 @@ = file_field :cloud_account, :x509_cert_pub_file, :title => t('.account_public_cert') - remove_path = url_for :controller => 'cloud_accounts', :action => 'destroy' .grid_3.omega - %span - ( - %a{ :href => '' }<> - = t('.test_account') - ) + ( + %button.linkbutton.nospace{ :type => 'submit', :value => t('.test_account'), :name => 'test_account', :id => 'test_account' }<> + = t('.test_account') + ) %fieldset.clearfix .grid_13.alpha.omega = submit_tag t(:add), :class => "ra nomargin dialogbutton" diff --git a/src/features/provider.feature b/src/features/provider.feature index a544361..c332667 100644 --- a/src/features/provider.feature +++ b/src/features/provider.feature @@ -26,7 +26,6 @@ Feature: Manage Providers When I follow "testprovider" Then I should see "Provider Name" And I should see "Provider URL" - And I should see "Test Connection" Scenario: Create a new Provider Given I am on the providers page @@ -39,3 +38,51 @@ Feature: Manage Providers Then I should be on the show provider page And I should see "Provider added" And I should have a provider named "testprovider" + + Scenario: Test Provider Connection Successful + Given I am on the providers page + When I press "Add" + Then I should be on the new provider page + When I fill in "provider[name]" with "testprovider" + And I fill in "provider[url]" with "http://localhost:3001/api" + And I press "test_connection" + Then I should see "Successfuly Connected to Provider" + + Scenario: Test Provider Connection Failure + Given I am on the providers page + When I press "Add" + Then I should be on the new provider page + When I fill in "provider[name]" with "incorrect_provider" + And I fill in "provider[url]" with "http://incorrecthost:3001/api" + And I press "test_connection" + Then I should see "Failed to Connect to Provider" + + Scenario: Test Account Connection Success + Given I am on the homepage + And there are these providers: + | name | + | provider1 | + When I go to the providers page + And I follow "provider1" + And I follow "Provider Accounts" + And I fill in "cloud_account[label]" with "MockAccount" + And I fill in "cloud_account[username]" with "mockuser" + And I fill in "cloud_account[password]" with "mockpassword" + And I fill in "cloud_account[account_number]" with "12345678" + And I press "test_account" + Then I should see "Test Connection Success: Valid Account Details" + + Scenario: Test Account Connection Failure + Given I am on the homepage + And there are these providers: + | name | + | provider1 | + When I go to the providers page + And I follow "provider1" + And I follow "Provider Accounts" + And I fill in "cloud_account[label]" with "IncorrectAccount" + And I fill in "cloud_account[username]" with "incorrect_user" + And I fill in "cloud_account[password]" with "incorrect_password" + And I fill in "cloud_account[account_number]" with "12345678" + And I press "test_account" + Then I should see "Test Connection Failed: Invalid Account Details" \ No newline at end of file diff --git a/src/features/support/custom.rb b/src/features/support/custom.rb index 46c618e..6e4e1ef 100644 --- a/src/features/support/custom.rb +++ b/src/features/support/custom.rb @@ -28,9 +28,6 @@ Provider.class_eval do end CloudAccount.class_eval do - def valid_credentials? - true - end alias :generate_cloud_account_key_original :generate_cloud_account_key -- 1.7.2.3

2 2

Turned off browser cache
by Martyn Taylor 14 Oct '10

14 Oct '10

Set HTTP response headings to invalidate and browser cache. This stops last DC page being able to be accessed after a user logs out via browser back button. BugZilla: 634083

3 3

[PATCH aggregator] Unlocked "Choose Provider Format" checkboxes
by Jan Provazník 14 Oct '10

14 Oct '10

From: Jan Provaznik <jprovazn(a)redhat.com> Build targets were disabled, so it wasn't possible to choose any target. --- src/app/views/templates/build_form.haml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/app/views/templates/build_form.haml b/src/app/views/templates/build_form.haml index 1918322..75f8a34 100644 --- a/src/app/views/templates/build_form.haml +++ b/src/app/views/templates/build_form.haml @@ -48,7 +48,7 @@ %ul.block - @all_targets.each do |target_id, target| %li - = check_box_tag 'targets[]', target_id, false, :disabled => true + = check_box_tag 'targets[]', target_id, false = label_tag 'targets[]', target['name'] = submit_tag "Submit to Build", :name => "build" -- 1.7.2.3

2 1

← Newer
1
...
9
10
11
12
13
14
15
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel October 2010