deltacloud-devel March 2010

deltacloud-devel@lists.fedorahosted.org

15 participants
103 discussions

various changes bringing the deltacloud aggregator up to rails/ruby standards
by Mo Morsi 24 Mar '10

24 Mar '10

Time permitting, these patches bring the aggregator in line w/ rails project standards. In the set, the src/ directory is moved into the projects root (overlapping files merged, conf/ moved into config/contrib, rpm spec updated), and the build system is updated to be based on Rake. Also with this patch set I think it would be a good idea to change our git repo to default to the development head (ideally that'd be master as with most other git projects, but next would work) so as to simplify the checkout process.

1 2

Added install and uninstall tasks for API
by Michal Fojtik 24 Mar '10

24 Mar '10

I added two new tasks for local installation of API server. You can now install API using: rake install[install_dir, install_bin_dir] and uninstall it by: rake uninstall These tasks will be used for RPM. -Michal

2 3

EC2 mocking and Cucumber tests
by Michal Fojtik 23 Mar '10

23 Mar '10

Hi everyone, I reworked Cucumber tests slightly and added EC2 mocking. So now you can test EC2 driver without EC2 account. For running a cucumber test you need to do following: API_DRIVER='ec2' rake features Output will be saved into tmp/cucumber.html This patch will also add another Cucumber task: rake rcov -> Generate RCov report into tmp/coverage Sample output from my machine: http://mifo.sk/ec2.html http://mifo.sk/ec2_coverage/ Please keep in mind, that this is just 'pre-alpha' version. I will be happy if you submit any comments, observations etc... I made fixtures by hand, using right-aws documentation and API docs from Amazon, so they looks 'very' authentic. Also, if you want to run API against EC2 mock driver, it's possible: ./bin/deltacloudd -i ec2 -e test - Michal

2 4

[PATCH portal] a couple random fixes to get self-service mode working.
by Scott Seago 22 Mar '10

22 Mar '10

Signed-off-by: Scott Seago <sseago(a)redhat.com> --- src/app/controllers/cloud_accounts_controller.rb | 2 +- src/app/models/portal_pool.rb | 1 + src/db/migrate/20091008153058_create_roles.rb | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/app/controllers/cloud_accounts_controller.rb b/src/app/controllers/cloud_accounts_controller.rb index fd9fa83..c20eb66 100644 --- a/src/app/controllers/cloud_accounts_controller.rb +++ b/src/app/controllers/cloud_accounts_controller.rb @@ -35,7 +35,7 @@ class CloudAccountsController < ApplicationController @pool = PortalPool.find(params[:pool_id]) require_privilege(Privilege::ACCOUNT_ADD,@pool) @cloud_account = CloudAccount.new - @providers = Provider.list_for_user(@current_user, Privilege::PROVIDER_VIEW) + @providers = Provider.all end diff --git a/src/app/models/portal_pool.rb b/src/app/models/portal_pool.rb index 73f1909..62cc903 100644 --- a/src/app/models/portal_pool.rb +++ b/src/app/models/portal_pool.rb @@ -94,6 +94,7 @@ class PortalPool < ActiveRecord::Base end front_end_image = Image.new(:external_key => cloud_account.account_prefix_for_realm + + Realm::AGGREGATOR_REALM_ACCOUNT_DELIMITER + ar_image.external_key, :name => ar_image.name, :architecture => ar_image.architecture, diff --git a/src/db/migrate/20091008153058_create_roles.rb b/src/db/migrate/20091008153058_create_roles.rb index d7776d3..a8031fb 100644 --- a/src/db/migrate/20091008153058_create_roles.rb +++ b/src/db/migrate/20091008153058_create_roles.rb @@ -63,6 +63,7 @@ class CreateRoles < ActiveRecord::Migration "quota_view", "set_perms", "view_perms", + "account_view", "account_add"]}, "Pool Creator" => {:role_scope => "Provider", -- 1.6.2.5

2 1

[PATCH portal 2/2] some minor fixes to 'add existing cloud account...' functionality
by Scott Seago 19 Mar '10

19 Mar '10

Signed-off-by: Scott Seago <sseago(a)redhat.com> --- src/app/controllers/cloud_accounts_controller.rb | 27 ++++++++++++--------- src/app/controllers/portal_pool_controller.rb | 18 ++++++++------ src/app/models/cloud_account.rb | 4 +++ src/app/models/portal_pool.rb | 12 ++++----- 4 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/app/controllers/cloud_accounts_controller.rb b/src/app/controllers/cloud_accounts_controller.rb index 8f43981..fd9fa83 100644 --- a/src/app/controllers/cloud_accounts_controller.rb +++ b/src/app/controllers/cloud_accounts_controller.rb @@ -35,11 +35,7 @@ class CloudAccountsController < ApplicationController @pool = PortalPool.find(params[:pool_id]) require_privilege(Privilege::ACCOUNT_ADD,@pool) @cloud_account = CloudAccount.new - @providers = [] - all_providers = Provider.all - all_providers.each {|provider| - @providers << provider if authorized?(Privilege::PROVIDER_VIEW,provider) - } + @providers = Provider.list_for_user(@current_user, Privilege::PROVIDER_VIEW) end @@ -53,13 +49,20 @@ class CloudAccountsController < ApplicationController def create_from_pool @pool = PortalPool.find(params[:pool][:id]) - @cloud_account = CloudAccount.new(params[:cloud_account]) - @provider = Provider.find(params[:provider][:id]) - @cloud_account.provider = @provider - @cloud_account.save! - @pool.cloud_accounts << @cloud_account unless @pool.cloud_accounts.map{|x| x.id}.include?((a)cloud_account.id) - @pool.save! - @pool.populate_realms_and_images([@cloud_account]) + require_privilege(Privilege::ACCOUNT_ADD,@pool) + PortalPool.transaction do + @cloud_account = CloudAccount.new(params[:cloud_account]) + @provider = Provider.find(params[:provider][:id]) + @cloud_account.provider = @provider + @cloud_account.save! + @pool.cloud_accounts << @cloud_account unless @pool.cloud_accounts.map{|x| x.id}.include?((a)cloud_account.id) + @pool.save! + @pool.populate_realms_and_images([@cloud_account]) + perm = Permission.new(:user => @current_user, + :role => Role.find_by_name("Account Administrator"), + :permission_object => @cloud_account) + perm.save! + end redirect_to :controller => "portal_pool", :action => 'show', :id => @pool.id end diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 354ee7e..69208fa 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -92,22 +92,24 @@ class PortalPoolController < ApplicationController def accounts_for_pool @pool = PortalPool.find(params[:pool_id]) - require_privilege(Privilege::ACCOUNT_ADD,@pool) + require_privilege(Privilege::ACCOUNT_VIEW,@pool) @cloud_accounts = [] - all_accounts = CloudAccount.all + all_accounts = CloudAccount.list_for_user(@current_user, Privilege::ACCOUNT_ADD) all_accounts.each {|account| - if authorized?(Privilege::ACCOUNT_VIEW,account) && authorized?(Privilege::ACCOUNT_ADD,account) - @cloud_accounts << account unless @pool.cloud_accounts.map{|x| x.id}.include?(account.id) - end + @cloud_accounts << account unless @pool.cloud_accounts.map{|x| x.id}.include?(account.id) } end def add_account @portal_pool = PortalPool.find(params[:portal_pool]) @cloud_account = CloudAccount.find(params[:cloud_account]) - @portal_pool.cloud_accounts << @cloud_account unless @portal_pool.cloud_accounts.map{|x| x.id}.include?((a)cloud_account.id) - @portal_pool.save! - @portal_pool.populate_realms_and_images([@cloud_account]) + require_privilege(Privilege::ACCOUNT_ADD,@portal_pool) + require_privilege(Privilege::ACCOUNT_ADD,@cloud_account) + PortalPool.transaction do + @portal_pool.cloud_accounts << @cloud_account unless @portal_pool.cloud_accounts.map{|x| x.id}.include?((a)cloud_account.id) + @portal_pool.save! + @portal_pool.populate_realms_and_images([@cloud_account]) + end redirect_to :action => 'show', :id => @portal_pool.id end diff --git a/src/app/models/cloud_account.rb b/src/app/models/cloud_account.rb index 62df9fa..6d44b64 100644 --- a/src/app/models/cloud_account.rb +++ b/src/app/models/cloud_account.rb @@ -52,4 +52,8 @@ class CloudAccount < ActiveRecord::Base a = CloudAccount.find_by_username_and_provider_id(account["username"], account["provider_id"]) return a.nil? ? CloudAccount.new(account) : a end + + def account_prefix_for_realm + provider.name + Realm::AGGREGATOR_REALM_PROVIDER_DELIMITER + username + end end diff --git a/src/app/models/portal_pool.rb b/src/app/models/portal_pool.rb index 28b700e..73f1909 100644 --- a/src/app/models/portal_pool.rb +++ b/src/app/models/portal_pool.rb @@ -43,9 +43,7 @@ class PortalPool < ActiveRecord::Base def realms realm_list = [] cloud_accounts.each do |cloud_account| - prefix = cloud_account.provider.name + - Realm::AGGREGATOR_REALM_PROVIDER_DELIMITER + - cloud_account.username + prefix = cloud_account.account_prefix_for_realm realm_list << prefix cloud_account.provider.realms.each do |realm| realm_list << prefix + Realm::AGGREGATOR_REALM_ACCOUNT_DELIMITER + @@ -94,10 +92,9 @@ class PortalPool < ActiveRecord::Base :provider_id => cloud_account.provider.id) ar_image.save! end - # FIXME: what do we ue for external_key values for front end images? - # FIXME: this will break if multiple imported accounts (from different - # providers) use the same external key - front_end_image = Image.new(:external_key => ar_image.external_key, + front_end_image = Image.new(:external_key => + cloud_account.account_prefix_for_realm + + ar_image.external_key, :name => ar_image.name, :architecture => ar_image.architecture, :portal_pool_id => id) @@ -105,6 +102,7 @@ class PortalPool < ActiveRecord::Base end cloud_account.provider.hardware_profiles.each do |hardware_profile| front_hardware_profile = HardwareProfile.new(:external_key => + cloud_account.account_prefix_for_realm + hardware_profile.external_key, :name => hardware_profile.name, :memory => hardware_profile.memory, -- 1.6.2.5

1 0

[PATCH portal] Implement 'add existing cloud account to portal pool' functionality. Revision 2.
by Steve Linabery 19 Mar '10

19 Mar '10

Also, add 'create and add new cloud account from portal pool view'. Added link on provider view to see existing accounts & add new accounts. With the functionality added by this patch, I'm able to start Mock instances. Handy for demos! --- src/app/controllers/cloud_accounts_controller.rb | 67 ++++++++++++++++++++ src/app/controllers/portal_pool_controller.rb | 22 +++++++ src/app/views/cloud_accounts/_form.erb | 13 ++++ src/app/views/cloud_accounts/new.html.erb | 14 ++++ .../views/cloud_accounts/new_from_pool.html.erb | 11 +++ src/app/views/portal_pool/accounts.html.erb | 2 +- .../views/portal_pool/accounts_for_pool.html.erb | 36 +++++++++++ 7 files changed, 164 insertions(+), 1 deletions(-) create mode 100644 src/app/controllers/cloud_accounts_controller.rb create mode 100644 src/app/views/cloud_accounts/_form.erb create mode 100644 src/app/views/cloud_accounts/new.html.erb create mode 100644 src/app/views/cloud_accounts/new_from_pool.html.erb create mode 100644 src/app/views/portal_pool/accounts_for_pool.html.erb diff --git a/src/app/controllers/cloud_accounts_controller.rb b/src/app/controllers/cloud_accounts_controller.rb new file mode 100644 index 0000000..8f43981 --- /dev/null +++ b/src/app/controllers/cloud_accounts_controller.rb @@ -0,0 +1,67 @@ +# +# Copyright (C) 2010 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. A copy of the GNU General Public License is +# also available at http://www.gnu.org/copyleft/gpl.html. + +# Filters added to this controller apply to all controllers in the application. +# Likewise, all the methods added will be available for all controllers. + +class CloudAccountsController < ApplicationController + before_filter :require_user + + def new + @cloud_account = CloudAccount.new + @providers = [] + all_providers = Provider.all + all_providers.each {|provider| + @providers << provider if authorized?(Privilege::PROVIDER_VIEW,provider) + } + end + + def new_from_pool + @pool = PortalPool.find(params[:pool_id]) + require_privilege(Privilege::ACCOUNT_ADD,@pool) + @cloud_account = CloudAccount.new + @providers = [] + all_providers = Provider.all + all_providers.each {|provider| + @providers << provider if authorized?(Privilege::PROVIDER_VIEW,provider) + } + end + + + def create + @cloud_account = CloudAccount.new(params[:cloud_account]) + @provider = Provider.find(params[:provider][:id]) + require_privilege(Privilege::ACCOUNT_MODIFY,@provider) + @cloud_account.provider = @provider + @cloud_account.save! + end + + def create_from_pool + @pool = PortalPool.find(params[:pool][:id]) + @cloud_account = CloudAccount.new(params[:cloud_account]) + @provider = Provider.find(params[:provider][:id]) + @cloud_account.provider = @provider + @cloud_account.save! + @pool.cloud_accounts << @cloud_account unless @pool.cloud_accounts.map{|x| x.id}.include?((a)cloud_account.id) + @pool.save! + @pool.populate_realms_and_images([@cloud_account]) + redirect_to :controller => "portal_pool", :action => 'show', :id => @pool.id + end + + +end diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 1897fc9..0f2c8d4 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -77,4 +77,26 @@ class PortalPoolController < ApplicationController def delete end + + def accounts_for_pool + @pool = PortalPool.find(params[:pool_id]) + require_privilege(Privilege::ACCOUNT_ADD,@pool) + @cloud_accounts = [] + all_accounts = CloudAccount.all + all_accounts.each {|account| + if authorized?(Privilege::ACCOUNT_VIEW,account) && authorized?(Privilege::ACCOUNT_ADD,account) + @cloud_accounts << account unless @pool.cloud_accounts.map{|x| x.id}.include?(account.id) + end + } + end + + def add_account + @portal_pool = PortalPool.find(params[:portal_pool]) + @cloud_account = CloudAccount.find(params[:cloud_account]) + @portal_pool.cloud_accounts << @cloud_account unless @portal_pool.cloud_accounts.map{|x| x.id}.include?((a)cloud_account.id) + @portal_pool.save! + @portal_pool.populate_realms_and_images([@cloud_account]) + redirect_to :action => 'show', :id => @portal_pool.id + end + end diff --git a/src/app/views/cloud_accounts/_form.erb b/src/app/views/cloud_accounts/_form.erb new file mode 100644 index 0000000..4fa1a79 --- /dev/null +++ b/src/app/views/cloud_accounts/_form.erb @@ -0,0 +1,13 @@ +<ul> + <li> + <%= form.label :username, "Cloud Account username" %> + <%= form.text_field :username %> + </li> + <li> + <%= form.label :password, "Cloud Account password" %> + <%= form.password_field :password %> + </li> + <li> + <%= select("provider", "id", @providers.map{|p| [p.name,p.id]} , { :include_blank => false }) %> + </li> +</ul> diff --git a/src/app/views/cloud_accounts/new.html.erb b/src/app/views/cloud_accounts/new.html.erb new file mode 100644 index 0000000..40f32cb --- /dev/null +++ b/src/app/views/cloud_accounts/new.html.erb @@ -0,0 +1,14 @@ +<% if @providers.size == 0 %> +<h1>No Providers available to associate with a new cloud account</h1> +<% else %> +<h2 class="greeting">New Cloud Account</h2> + +<div class="dcloud_form"> + <% form_for @cloud_account, :url => { :action => "create" } do |f| %> + <%= f.error_messages %> + <%= render :partial => "form", :object => f %> + <%= f.submit "Create Cloud Account", :class => "submit" %> + <% end %> + <%= link_to "Cancel", root_path, :class => 'actionlink' %> +</div> +<% end %> diff --git a/src/app/views/cloud_accounts/new_from_pool.html.erb b/src/app/views/cloud_accounts/new_from_pool.html.erb new file mode 100644 index 0000000..747df03 --- /dev/null +++ b/src/app/views/cloud_accounts/new_from_pool.html.erb @@ -0,0 +1,11 @@ +<h2 class="greeting">New Cloud Account</h2> + +<div class="dcloud_form"> + <% form_for @cloud_account, :url => { :action => "create_from_pool" } do |f| %> + <%= f.error_messages %> + <%= render :partial => "form", :object => f %> + <%= hidden_field :pool, :id %> + <%= f.submit "Create Cloud Account", :class => "submit" %> + <% end %> + <%= link_to "Cancel", root_path, :class => 'actionlink' %> +</div> diff --git a/src/app/views/portal_pool/accounts.html.erb b/src/app/views/portal_pool/accounts.html.erb index 81a8a76..e6b4f1c 100644 --- a/src/app/views/portal_pool/accounts.html.erb +++ b/src/app/views/portal_pool/accounts.html.erb @@ -18,6 +18,6 @@ </tbody> </table> <% end %> -<%= link_to "View/Add Existing Cloud Accounts", {:controller => "cloud_accounts",:action => "accounts_for_pool", :pool_id => @pool}, :class=>"actionlink" %> +<%= link_to "View/Add Existing Cloud Accounts", {:controller => "portal_pool",:action => "accounts_for_pool", :pool_id => @pool}, :class=>"actionlink" %> <%= link_to "Add a New Cloud Account", {:controller => "cloud_accounts",:action => "new_from_pool", :pool_id => @pool}, :class=>"actionlink" %><br/> diff --git a/src/app/views/portal_pool/accounts_for_pool.html.erb b/src/app/views/portal_pool/accounts_for_pool.html.erb new file mode 100644 index 0000000..e273551 --- /dev/null +++ b/src/app/views/portal_pool/accounts_for_pool.html.erb @@ -0,0 +1,36 @@ +<% if @pool.cloud_accounts.size > 0 %> +<h1>These Cloud Accounts are already attached to this pool</h1> +<table> +<thead> +<tr> +<th scope="col">Provider Name</th> +<th scope="col">Cloud Account User Name</th> +</tr> +<% @pool.cloud_accounts.each {|a| %> +<tr> +<td><%= a.provider.name %></td> +<td><%= a.username %></td> +</tr> +<% } %> +</table> +<% end %> + +<% if @cloud_accounts.size == 0 %> +<h1>There are no existing Cloud Accounts available to add</h1> +<% else %> +<h1>These Cloud Accounts are available to add</h1> +<table> +<thead> +<tr> +<th scope="col">Provider Name</th> +<th scope="col">Cloud Account User Name</th> +</tr> +<% @cloud_accounts.each {|a| %> +<tr> +<td><%= a.provider.name %></td> +<td><%= a.username %> <%= link_to "Add this account", {:controller=> "portal_pool", + :action => "add_account", :portal_pool => @pool, :cloud_account => a}, :class => "actionlink" %></td> +</tr> +<% } %> +</table> +<% end %> -- 1.6.2.5

4 4

[PATCH] provider realms list UIs
by Mo Morsi 19 Mar '10

19 Mar '10

--- src/app/controllers/portal_pool_controller.rb | 6 ++++++ src/app/controllers/provider_controller.rb | 6 ++++++ src/app/views/portal_pool/realms.html.erb | 1 + src/app/views/portal_pool/show.html.erb | 1 + src/app/views/provider/realms.html.erb | 1 + src/app/views/provider/show.html.erb | 1 + src/app/views/realms/_list.html.erb | 18 ++++++++++++++++++ 7 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 src/app/views/portal_pool/realms.html.erb create mode 100644 src/app/views/provider/realms.html.erb create mode 100644 src/app/views/realms/_list.html.erb diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 7a99d90..2a18e1b 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -49,6 +49,12 @@ class PortalPoolController < ApplicationController require_privilege(Privilege::ACCOUNT_VIEW,@pool) end + def realms + @pool = PortalPool.find(params[:id]) + @realms = @pool.realms + require_privilege(Privilege::POOL_VIEW,@pool) + end + def new require_privilege(Privilege::POOL_MODIFY) @portal_pool = PortalPool.new diff --git a/src/app/controllers/provider_controller.rb b/src/app/controllers/provider_controller.rb index b676fa7..09815d9 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -61,6 +61,12 @@ class ProviderController < ApplicationController require_privilege(Privilege::ACCOUNT_VIEW, @provider) end + def realms + @provider = Provider.find(params[:id]) + @realms = @provider.realms + require_privilege(Privilege::PROVIDER_VIEW, @provider) + end + def new_account @provider = Provider.find(params[:id]) require_privilege(Privilege::ACCOUNT_MODIFY, @provider) diff --git a/src/app/views/portal_pool/realms.html.erb b/src/app/views/portal_pool/realms.html.erb new file mode 100644 index 0000000..3aca533 --- /dev/null +++ b/src/app/views/portal_pool/realms.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'realms/list' %> diff --git a/src/app/views/portal_pool/show.html.erb b/src/app/views/portal_pool/show.html.erb index 9901897..128d74c 100644 --- a/src/app/views/portal_pool/show.html.erb +++ b/src/app/views/portal_pool/show.html.erb @@ -39,3 +39,4 @@ <%= link_to "Accounts", {:action => "accounts", :id => @pool.id}, :class=>"actionlink"%> <%= link_to "Hardware Profiles", {:action => "hardware_profiles", :id => @pool.id}, :class=>"actionlink"%> <%=link_to "View Images", {:controller => "portal_pool", :action => "images", :portal_pool => @pool}, :class => "actionlink" %> +<%= link_to "Realms", {:action => "realms", :id => @pool.id}, :class=>"actionlink"%> diff --git a/src/app/views/provider/realms.html.erb b/src/app/views/provider/realms.html.erb new file mode 100644 index 0000000..3aca533 --- /dev/null +++ b/src/app/views/provider/realms.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'realms/list' %> diff --git a/src/app/views/provider/show.html.erb b/src/app/views/provider/show.html.erb index 299346f..884ce81 100644 --- a/src/app/views/provider/show.html.erb +++ b/src/app/views/provider/show.html.erb @@ -19,6 +19,7 @@ </table> <% end %> <%= link_to "Add a pool", {:controller => "portal_pool", :action => "new", :provider => @provider}, :class => "actionlink" %> +<%= link_to "Realms", {:action => "realms", :id => @provider.id}, :class=>"actionlink"%> <% form_tag :action => 'destroy' do %> <%=hidden_field :provider, :id %> <%= submit_tag "Delete Provider", :class => "submit_link" %> diff --git a/src/app/views/realms/_list.html.erb b/src/app/views/realms/_list.html.erb new file mode 100644 index 0000000..49fcd36 --- /dev/null +++ b/src/app/views/realms/_list.html.erb @@ -0,0 +1,18 @@ +<% if @realms.size == 0 %> +<h1>There are no realms to display</h1> +<% else %> + <table> + <thead> + <tr> + <th scope="col">Name</th> + </tr> + </thead> + <tbody> + <%(a)realms.each {|realm| %> + <tr> + <td><%= realm.name %></td> + </tr> + <% } %> + </tbody> + </table> +<% end %> -- 1.6.2.5

2 2

Disclaimer for images
by jason.guiditta 19 Mar '10

19 Mar '10

[PATCH portal] List available images for a pool. This patch may need rebasing or fixing once steve has his out/pushed. Right now, it requires manually setting things up in db, but I thought I would send it anyway on the off chance it applies cleanly on top of his.

2 4

[PATCH docs 1/5] Generate the main menu dynamically.
by Tomas Sedovic 19 Mar '10

19 Mar '10

From: Tomas Sedovic <tsedovic(a)redhat.com> Only for Documentation at the moment. --- deltacloud.org/content/_navigation.erb | 23 +++++++++++++++++++++++ deltacloud.org/content/api.erb | 1 + deltacloud.org/content/client-ruby.erb | 1 + deltacloud.org/content/drivers.erb | 1 + deltacloud.org/content/framework.erb | 1 + deltacloud.org/layouts/documentation.haml | 24 ++---------------------- 6 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 deltacloud.org/content/_navigation.erb diff --git a/deltacloud.org/content/_navigation.erb b/deltacloud.org/content/_navigation.erb new file mode 100644 index 0000000..fa96408 --- /dev/null +++ b/deltacloud.org/content/_navigation.erb @@ -0,0 +1,23 @@ +--- +filter: + - erb + - haml +--- +<% menu = [ + { :href => "index.html", :title => "Deltacloud Home", :text => "Home" }, + { :href => "tools.html", :title => "Tools", :text => "Tools" }, + { :href => "download.html", :title => "Get the latest releases", :text => "Download" }, + { :href => "contribute.html", :title => "Information about design/development process", :text => "Contribute" }, + { :href => "documentation.html", :title => "Project documentation", :text => "Documentation" }, + { :href => "page", :title => "Project wiki", :text => "Wiki" } ] %> + +#navigation + #menu.container + %ul.l0 + <% menu.each do |link| %> + %li + <% current_page = "#{area}.html" unless area.nil? or area.empty? or (link[:href].index(area) != 0) %> + <% state = (link[:href] == current_page) ? 'active' : 'inactive' %> + %a.<%= state %>{ :href => "./<%= link[:href] %>", :title => "<%= link[:title] %>" } + <%= link[:text] %> + <% end %> diff --git a/deltacloud.org/content/api.erb b/deltacloud.org/content/api.erb index 5f18a0d..28f3c9d 100644 --- a/deltacloud.org/content/api.erb +++ b/deltacloud.org/content/api.erb @@ -1,5 +1,6 @@ --- title: Deltacloud - Documentation +area: documentation extension: html layout: documentation.haml filter: diff --git a/deltacloud.org/content/client-ruby.erb b/deltacloud.org/content/client-ruby.erb index 9b2cf26..798d656 100644 --- a/deltacloud.org/content/client-ruby.erb +++ b/deltacloud.org/content/client-ruby.erb @@ -1,5 +1,6 @@ --- title: Deltacloud - Documentation +area: documentation extension: html layout: documentation.haml filter: diff --git a/deltacloud.org/content/drivers.erb b/deltacloud.org/content/drivers.erb index bf5554c..10f720d 100644 --- a/deltacloud.org/content/drivers.erb +++ b/deltacloud.org/content/drivers.erb @@ -1,5 +1,6 @@ --- title: Deltacloud - Documentation +area: documentation extension: html layout: documentation.haml filter: diff --git a/deltacloud.org/content/framework.erb b/deltacloud.org/content/framework.erb index 6f9a1b3..bab39c2 100644 --- a/deltacloud.org/content/framework.erb +++ b/deltacloud.org/content/framework.erb @@ -1,5 +1,6 @@ --- title: Deltacloud - Documentation +area: documentation extension: html layout: documentation.haml filter: diff --git a/deltacloud.org/layouts/documentation.haml b/deltacloud.org/layouts/documentation.haml index 7b5200e..0157d6e 100644 --- a/deltacloud.org/layouts/documentation.haml +++ b/deltacloud.org/layouts/documentation.haml @@ -21,28 +21,8 @@ filter: #headerLogo{ :onclick => "location.href='index.html';", :style => "cursor: pointer;" } %h1 Deltacloud - Many clouds. One API. No problem. - #navigation - #menu.container - %ul.l0 - %li - %a.inactive{ :href => "./index.html", :title => "Deltacloud Home" } - Home - %li - %a.inactive{ :href => "./tools.html", :title => "Tools" } - Tools - %li - %a.inactive{ :href => "./download.html", :title => "Get the latest releases" } - Download - %li - %a.inactive{ :href => "./contribute.html", :title => "Information about design/development process" } - Contribute - %li - %a.active{ :href => "./documentation.html", :title => "Project documentation" } - Documentation - %li - %a.inactive{ :href => "./page", :title => "Project wiki" } - Wiki - <%= render(:partial => "submenu-documentation", :locals => {:current_page => "#{@page.filename}.#{@page.extension}"} ) %> + <%= render(:partial => "navigation", :locals => {:current_page => "#{@page.filename}.#{@page.extension}", :area => @page.area } ) %> + <%= render(:partial => "submenu-documentation", :locals => {:current_page => "#{@page.filename}.#{@page.extension}" } ) %> #main #content-deltacloud.container <%= @content %> -- 1.6.6.1

2 9

[PATCH portal] Implement 'add existing cloud account to portal pool' functionality. Revision.
by Steve Linabery 19 Mar '10

19 Mar '10

Also, add 'create and add new cloud account from portal pool view'. Added link on provider view to see existing accounts & add new accounts. With the functionality added by this patch, I'm able to start Mock instances. Handy for demos! --- src/app/controllers/cloud_accounts_controller.rb | 66 ++++++++++++++++++++ src/app/controllers/portal_pool_controller.rb | 22 +++++++ src/app/views/cloud_accounts/_form.erb | 13 ++++ src/app/views/cloud_accounts/new.html.erb | 14 ++++ .../views/cloud_accounts/new_from_pool.html.erb | 11 +++ src/app/views/portal_pool/accounts.html.erb | 2 +- .../views/portal_pool/accounts_for_pool.html.erb | 36 +++++++++++ 7 files changed, 163 insertions(+), 1 deletions(-) create mode 100644 src/app/controllers/cloud_accounts_controller.rb create mode 100644 src/app/views/cloud_accounts/_form.erb create mode 100644 src/app/views/cloud_accounts/new.html.erb create mode 100644 src/app/views/cloud_accounts/new_from_pool.html.erb create mode 100644 src/app/views/portal_pool/accounts_for_pool.html.erb diff --git a/src/app/controllers/cloud_accounts_controller.rb b/src/app/controllers/cloud_accounts_controller.rb new file mode 100644 index 0000000..fc70ad5 --- /dev/null +++ b/src/app/controllers/cloud_accounts_controller.rb @@ -0,0 +1,66 @@ +# +# Copyright (C) 2010 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. A copy of the GNU General Public License is +# also available at http://www.gnu.org/copyleft/gpl.html. + +# Filters added to this controller apply to all controllers in the application. +# Likewise, all the methods added will be available for all controllers. + +class CloudAccountsController < ApplicationController + before_filter :require_user + + def new + @cloud_account = CloudAccount.new + @providers = [] + all_providers = Provider.all + all_providers.each {|provider| + @providers << provider if authorized?(Privilege::PROVIDER_VIEW,provider) + } + end + + def new_from_pool + @pool = PortalPool.find(params[:pool_id]) + require_privilege(Privilege::ACCOUNT_ADD,@pool) + @cloud_account = CloudAccount.new + @providers = [] + all_providers = Provider.all + all_providers.each {|provider| + @providers << provider if authorized?(Privilege::PROVIDER_VIEW,provider) + } + end + + + def create + @cloud_account = CloudAccount.new(params[:cloud_account]) + @provider = Provider.find(params[:provider][:id]) + require_privilege(Privilege::ACCOUNT_MODIFY,@provider) + @cloud_account.provider = @provider + @cloud_account.save! + end + + def create_from_pool + @pool = PortalPool.find(params[:pool][:id]) + @cloud_account = CloudAccount.new(params[:cloud_account]) + @provider = Provider.find(params[:provider][:id]) + @cloud_account.provider = @provider + @cloud_account.save! + @pool.cloud_accounts << @cloud_account unless @pool.cloud_accounts.map{|x| x.id}.include?((a)cloud_account.id) + @pool.save! + redirect_to :controller => "portal_pool", :action => 'show', :id => @pool.id + end + + +end diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 1897fc9..0f2c8d4 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -77,4 +77,26 @@ class PortalPoolController < ApplicationController def delete end + + def accounts_for_pool + @pool = PortalPool.find(params[:pool_id]) + require_privilege(Privilege::ACCOUNT_ADD,@pool) + @cloud_accounts = [] + all_accounts = CloudAccount.all + all_accounts.each {|account| + if authorized?(Privilege::ACCOUNT_VIEW,account) && authorized?(Privilege::ACCOUNT_ADD,account) + @cloud_accounts << account unless @pool.cloud_accounts.map{|x| x.id}.include?(account.id) + end + } + end + + def add_account + @portal_pool = PortalPool.find(params[:portal_pool]) + @cloud_account = CloudAccount.find(params[:cloud_account]) + @portal_pool.cloud_accounts << @cloud_account unless @portal_pool.cloud_accounts.map{|x| x.id}.include?((a)cloud_account.id) + @portal_pool.save! + @portal_pool.populate_realms_and_images([@cloud_account]) + redirect_to :action => 'show', :id => @portal_pool.id + end + end diff --git a/src/app/views/cloud_accounts/_form.erb b/src/app/views/cloud_accounts/_form.erb new file mode 100644 index 0000000..4fa1a79 --- /dev/null +++ b/src/app/views/cloud_accounts/_form.erb @@ -0,0 +1,13 @@ +<ul> + <li> + <%= form.label :username, "Cloud Account username" %> + <%= form.text_field :username %> + </li> + <li> + <%= form.label :password, "Cloud Account password" %> + <%= form.password_field :password %> + </li> + <li> + <%= select("provider", "id", @providers.map{|p| [p.name,p.id]} , { :include_blank => false }) %> + </li> +</ul> diff --git a/src/app/views/cloud_accounts/new.html.erb b/src/app/views/cloud_accounts/new.html.erb new file mode 100644 index 0000000..40f32cb --- /dev/null +++ b/src/app/views/cloud_accounts/new.html.erb @@ -0,0 +1,14 @@ +<% if @providers.size == 0 %> +<h1>No Providers available to associate with a new cloud account</h1> +<% else %> +<h2 class="greeting">New Cloud Account</h2> + +<div class="dcloud_form"> + <% form_for @cloud_account, :url => { :action => "create" } do |f| %> + <%= f.error_messages %> + <%= render :partial => "form", :object => f %> + <%= f.submit "Create Cloud Account", :class => "submit" %> + <% end %> + <%= link_to "Cancel", root_path, :class => 'actionlink' %> +</div> +<% end %> diff --git a/src/app/views/cloud_accounts/new_from_pool.html.erb b/src/app/views/cloud_accounts/new_from_pool.html.erb new file mode 100644 index 0000000..747df03 --- /dev/null +++ b/src/app/views/cloud_accounts/new_from_pool.html.erb @@ -0,0 +1,11 @@ +<h2 class="greeting">New Cloud Account</h2> + +<div class="dcloud_form"> + <% form_for @cloud_account, :url => { :action => "create_from_pool" } do |f| %> + <%= f.error_messages %> + <%= render :partial => "form", :object => f %> + <%= hidden_field :pool, :id %> + <%= f.submit "Create Cloud Account", :class => "submit" %> + <% end %> + <%= link_to "Cancel", root_path, :class => 'actionlink' %> +</div> diff --git a/src/app/views/portal_pool/accounts.html.erb b/src/app/views/portal_pool/accounts.html.erb index 81a8a76..e6b4f1c 100644 --- a/src/app/views/portal_pool/accounts.html.erb +++ b/src/app/views/portal_pool/accounts.html.erb @@ -18,6 +18,6 @@ </tbody> </table> <% end %> -<%= link_to "View/Add Existing Cloud Accounts", {:controller => "cloud_accounts",:action => "accounts_for_pool", :pool_id => @pool}, :class=>"actionlink" %> +<%= link_to "View/Add Existing Cloud Accounts", {:controller => "portal_pool",:action => "accounts_for_pool", :pool_id => @pool}, :class=>"actionlink" %> <%= link_to "Add a New Cloud Account", {:controller => "cloud_accounts",:action => "new_from_pool", :pool_id => @pool}, :class=>"actionlink" %><br/> diff --git a/src/app/views/portal_pool/accounts_for_pool.html.erb b/src/app/views/portal_pool/accounts_for_pool.html.erb new file mode 100644 index 0000000..e273551 --- /dev/null +++ b/src/app/views/portal_pool/accounts_for_pool.html.erb @@ -0,0 +1,36 @@ +<% if @pool.cloud_accounts.size > 0 %> +<h1>These Cloud Accounts are already attached to this pool</h1> +<table> +<thead> +<tr> +<th scope="col">Provider Name</th> +<th scope="col">Cloud Account User Name</th> +</tr> +<% @pool.cloud_accounts.each {|a| %> +<tr> +<td><%= a.provider.name %></td> +<td><%= a.username %></td> +</tr> +<% } %> +</table> +<% end %> + +<% if @cloud_accounts.size == 0 %> +<h1>There are no existing Cloud Accounts available to add</h1> +<% else %> +<h1>These Cloud Accounts are available to add</h1> +<table> +<thead> +<tr> +<th scope="col">Provider Name</th> +<th scope="col">Cloud Account User Name</th> +</tr> +<% @cloud_accounts.each {|a| %> +<tr> +<td><%= a.provider.name %></td> +<td><%= a.username %> <%= link_to "Add this account", {:controller=> "portal_pool", + :action => "add_account", :portal_pool => @pool, :cloud_account => a}, :class => "actionlink" %></td> +</tr> +<% } %> +</table> +<% end %> -- 1.6.2.5

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel March 2010