deltacloud-devel March 2010

deltacloud-devel@lists.fedorahosted.org

15 participants
103 discussions

Final fix for rest-client issues
by Michal Fojtik 02 Mar '10

02 Mar '10

Hi again, After messing up with .body/.to_s methods which have recently been changed in rest-client version 1.4.0, I end's up with solution that will work for both versions without using meta programming or something similar. Included patch should cleanly apply to master. PS: Sorry for confusion and patches which I sent before.

2 2

[PATCH portal 1/4] fixed association bug in Permission.
by Scott Seago 02 Mar '10

02 Mar '10

Pool isn't an attribute of Permission for deltacloud -- this is a no-longer relevant holdover from oVirt. Signed-off-by: Scott Seago <sseago(a)redhat.com> --- src/app/models/permission.rb | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/app/models/permission.rb b/src/app/models/permission.rb index 733cb0a..2df3f2f 100644 --- a/src/app/models/permission.rb +++ b/src/app/models/permission.rb @@ -18,11 +18,9 @@ # also available at http://www.gnu.org/copyleft/gpl.html. class Permission < ActiveRecord::Base - belongs_to :pool belongs_to :role belongs_to :user - validates_presence_of :pool_id validates_presence_of :role_id validates_presence_of :user_id -- 1.6.2.5

1 3

[PATCH] removed obsolete calls to get_login_user
by Scott Seago 02 Mar '10

02 Mar '10

Signed-off-by: Scott Seago <sseago(a)redhat.com> --- src/app/controllers/application_controller.rb | 4 ---- src/app/controllers/instance_controller.rb | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index bc560b9..142a6bf 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -46,10 +46,6 @@ class ApplicationController < ActionController::Base return 'dcloud' end - def get_login_user - "deltacloudadmin" - end - def get_nav_items @providers = Provider.find(:all) end diff --git a/src/app/controllers/instance_controller.rb b/src/app/controllers/instance_controller.rb index 8893286..fc05113 100644 --- a/src/app/controllers/instance_controller.rb +++ b/src/app/controllers/instance_controller.rb @@ -69,7 +69,7 @@ class InstanceController < ApplicationController raise ActionError.new("#{action} is an invalid action.") end #permissons check here - @task = @instance.queue_action(get_login_user, action, action_args) + @task = @instance.queue_action(@current_user, action, action_args) unless @task raise ActionError.new("#{action} cannot be performed on this instance.") end -- 1.6.2.5

2 1

Initial sample test series
by jason.guiditta 02 Mar '10

02 Mar '10

This series puts in place sample tests for others in the team to use as a base for their own tests ast they get familiar with the new testing libraries. Feel free to ask me for any details that are not clear from reading the examples. Note that rspec has a --format option with many built-in formatters. For instance, try: rspec --format nested rspec -h will give you the full list.

2 6

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

02 Mar '10

--- src/config/database.pg | 56 +++++++++++++++++++++++++++++++++++++ src/config/database.yml | 70 +++++++++++++++------------------------------- 2 files changed, 79 insertions(+), 47 deletions(-) create mode 100644 src/config/database.pg diff --git a/src/config/database.pg b/src/config/database.pg new file mode 100644 index 0000000..9be626c --- /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: + 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 index 9be626c..5efe557 100644 --- a/src/config/database.yml +++ b/src/config/database.yml @@ -1,56 +1,32 @@ -# 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 - +# SQLite version 3.x +# gem install sqlite3-ruby (not necessary on OS X Leopard) +# If you are running the aggregator from an rpm, and wish to use +# sqlite, you will need to mv this file to database.yml. The .sqlite3 file can be put +# in any location you desire, just update the relative paths below 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 dcloud user +# 2. Make sure the dir that the above file lives in is also writable by this user. development: - adapter: postgresql - database: dcloud_development - username: dcloud - password: v23zj59an - host: localhost + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 -# Warning: The database defined as 'test' will be erased and -# re-generated from your development database when you run 'rake test'. +# 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: - adapter: postgresql - database: dcloud_test - username: postgres - host: localhost +test: &TEST + adapter: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 production: - adapter: postgresql - database: dcloud - username: dcloud - password: v23zj59an - host: localhost + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000 cucumber: <<: *TEST -- 1.6.6.1

1 0

Added XML output and fixture creating utility
by Michal Fojtik 02 Mar '10

02 Mar '10

Hi again ;) First patch just add possibility of XML output fom each command sent to API (which allows --xml option for command line client) Second patch used this feature and added option for creating fixtures for future unit tests. (This will automate loading/saving XMLs from browser)

2 4

Fixed rest-client bug
by Michal Fojtik 02 Mar '10

02 Mar '10

- Fix for a bug reported by mmorsi (rest-client 1.4.0) - Removed last_response_xml (i'll rework this tomorrow)

1 2

Fix for rest-client and last_response_xml
by Michal Fojtik 02 Mar '10

02 Mar '10

Hello, I fixed rest-client 1.4.0 bug again, now with better patch (I'm checking if body method exists and if not, i'll create it) Also I added last_request_xml into request, which allows to return XML for command line client.

1 1

[PATCH aggregator] UI to view the list of provider accounts in a pool
by Mo Morsi 01 Mar '10

01 Mar '10

--- src/app/controllers/portal_pool_controller.rb | 4 ++++ src/app/views/portal_pool/accounts.html.erb | 21 +++++++++++++++++++++ 2 files changed, 25 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 ae45d02..ff1df67 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -32,6 +32,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..b02b124 --- /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 => "cloud_account", :action => "new", :pools => [@pool.id]}, :class => "actionlink" %> -- 1.6.2.5

1 0

deltacloud/core/client incompatible w/ latest rest-client-1.4.0 gem
by Mo Morsi 01 Mar '10

01 Mar '10

Just a word of warning, it appears that the deltacloud client api gem is incompatable w/ the latest rest-client gem (version 1.4) and thus you may want to hold off on updating it. If you already have, you can gem uninstall it and then reinstall version 1.3.1 (which deltacloud-client is compatible with) via: gem install rest-client -v 1.3.1 A temporary workaround solution for the codebase would be to change the dependency in the client gemspec to something like s.add_dependency('rest-client', '~> 1.3') The real issue arises since we're overriding 'RestClient::Response.body' to merely call 'to_s' which the new rest-client gem handles by calling 'body' resulting in an infinite loop. -Mo

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel March 2010