deltacloud-devel March 2010

deltacloud-devel@lists.fedorahosted.org

15 participants
103 discussions

[PATCH] view the list of provider accounts in a pool (revision 6)
by Mo Morsi 18 Mar '10

18 Mar '10

added missing link to accounts on show page --- src/app/controllers/portal_pool_controller.rb | 5 ++++ src/app/views/portal_pool/accounts.html.erb | 23 ++++++++++++++++++++ src/app/views/portal_pool/show.html.erb | 1 + .../controllers/portal_pool_controller_spec.rb | 8 +++++++ 4 files changed, 37 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 5e42d55..1897fc9 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -44,6 +44,11 @@ class PortalPoolController < ApplicationController require_privilege(Privilege::POOL_VIEW, @pool) end + def accounts + @pool = PortalPool.find(params[:id]) + require_privilege(Privilege::ACCOUNT_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..81a8a76 --- /dev/null +++ b/src/app/views/portal_pool/accounts.html.erb @@ -0,0 +1,23 @@ +<% 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 "View/Add Existing Cloud Accounts", {:controller => "cloud_accounts",: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/show.html.erb b/src/app/views/portal_pool/show.html.erb index 5a29875..77f8b3b 100644 --- a/src/app/views/portal_pool/show.html.erb +++ b/src/app/views/portal_pool/show.html.erb @@ -37,3 +37,4 @@ <% end %> <%= link_to "Add a new instance", {:controller => "instance", :action => "new", :id => @pool}, :class=>"actionlink"%> <%= link_to "Hardware Profiles", {:action => "hardware_profiles", :id => @pool.id}, :class=>"actionlink"%> +<%= link_to "Accounts", {:action => "accounts", :id => @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 512127d..802017f 100644 --- a/src/spec/controllers/portal_pool_controller_spec.rb +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -39,5 +39,13 @@ describe PortalPoolController do response.should render_template("hardware_profiles") 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 1

[PATCH] provider realms list UIs (revision 1)
by Mo Morsi 18 Mar '10

18 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 5e42d55..8ef046d 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -44,6 +44,12 @@ class PortalPoolController < ApplicationController require_privilege(Privilege::POOL_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..0436aee 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -32,6 +32,12 @@ class ProviderController < ApplicationController require_privilege(Privilege::PROVIDER_VIEW, @provider) end + def realms + @provider = Provider.find(params[:id]) + @realms = @provider.realms + require_privilege(Privilege::PROVIDER_VIEW, @provider) + end + def new require_privilege(Privilege::PROVIDER_MODIFY) @provider = Provider.new(params[: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 5a29875..cdd9e5d 100644 --- a/src/app/views/portal_pool/show.html.erb +++ b/src/app/views/portal_pool/show.html.erb @@ -37,3 +37,4 @@ <% end %> <%= link_to "Add a new instance", {:controller => "instance", :action => "new", :id => @pool}, :class=>"actionlink"%> <%= link_to "Hardware Profiles", {:action => "hardware_profiles", :id => @pool.id}, :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

1 0

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

18 Mar '10

--- src/app/controllers/portal_pool_controller.rb | 6 ++++ src/app/controllers/provider_controller.rb | 6 ++++ src/app/controllers/realms_controller.rb | 39 +++++++++++++++++++++++++ src/app/models/portal_pool.rb | 4 ++ src/app/views/portal_pool/realms.html.erb | 1 + src/app/views/provider/realms.html.erb | 1 + src/app/views/realms/_list.html.erb | 20 +++++++++++++ src/app/views/realms/index.html.erb | 1 + 8 files changed, 78 insertions(+), 0 deletions(-) create mode 100644 src/app/controllers/realms_controller.rb 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 create mode 100644 src/app/views/realms/index.html.erb diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 90df8a5..21ceaf2 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -38,6 +38,12 @@ class PortalPoolController < ApplicationController @instances = @pool.instances end + def realms + @pool = PortalPool.find(params[:id]) + @realms = @pool.providers.collect { |pr| pr.realms }.flatten + require_privilege(Privilege::INSTANCE_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 53056f5..ac703c0 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -32,6 +32,12 @@ class ProviderController < ApplicationController require_privilege(Privilege::PROVIDER_VIEW, @provider) end + def realms + @provider = Provider.find(params[:id]) + @realms = @provider.realms + require_privilege(Privilege::PROVIDER_VIEW, @provider) + end + def new require_privilege(Privilege::PROVIDER_MODIFY) @provider = Provider.new(params[:provider]) diff --git a/src/app/controllers/realms_controller.rb b/src/app/controllers/realms_controller.rb new file mode 100644 index 0000000..667279c --- /dev/null +++ b/src/app/controllers/realms_controller.rb @@ -0,0 +1,39 @@ +# 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. + +require 'util/taskomatic' + +class RealmsController < ApplicationController + before_filter :require_user + + def index + @realms = Realm.find(:all) + #require_privilege(Privilege::PROVIDER_VIEW, @realms) ? + end + + def new + end + + def create + end + + def delete + end +end diff --git a/src/app/models/portal_pool.rb b/src/app/models/portal_pool.rb index 28b700e..81de037 100644 --- a/src/app/models/portal_pool.rb +++ b/src/app/models/portal_pool.rb @@ -40,6 +40,10 @@ class PortalPool < ActiveRecord::Base :include => [:role], :order => "permissions.id ASC" + def providers + cloud_accounts.collect { |ca| ca.provider } + end + def realms realm_list = [] cloud_accounts.each do |cloud_account| 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/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/realms/_list.html.erb b/src/app/views/realms/_list.html.erb new file mode 100644 index 0000000..c95fac3 --- /dev/null +++ b/src/app/views/realms/_list.html.erb @@ -0,0 +1,20 @@ +<% if @realms.size == 0 %> +<h1>There are no realms to display</h1> +<% else %> + <table> + <thead> + <tr> + <th scope="col">Name</th> + <th scope="col">Provider</th> + </tr> + </thead> + <tbody> + <%(a)realms.each {|realm| %> + <tr> + <td><%= realm.name %></td> + <td><%= realm.provider.name %></td> + </tr> + <% } %> + </tbody> + </table> +<% end %> diff --git a/src/app/views/realms/index.html.erb b/src/app/views/realms/index.html.erb new file mode 100644 index 0000000..c19c3fa --- /dev/null +++ b/src/app/views/realms/index.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'list' %> -- 1.6.2.5

2 3

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

18 Mar '10

--- src/app/controllers/portal_pool_controller.rb | 8 ++++++-- 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(+), 2 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 5e42d55..3138158 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -19,8 +19,6 @@ # 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 @@ -44,6 +42,12 @@ class PortalPoolController < ApplicationController require_privilege(Privilege::POOL_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..0436aee 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -32,6 +32,12 @@ class ProviderController < ApplicationController require_privilege(Privilege::PROVIDER_VIEW, @provider) end + def realms + @provider = Provider.find(params[:id]) + @realms = @provider.realms + require_privilege(Privilege::PROVIDER_VIEW, @provider) + end + def new require_privilege(Privilege::PROVIDER_MODIFY) @provider = Provider.new(params[: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 5a29875..cdd9e5d 100644 --- a/src/app/views/portal_pool/show.html.erb +++ b/src/app/views/portal_pool/show.html.erb @@ -37,3 +37,4 @@ <% end %> <%= link_to "Add a new instance", {:controller => "instance", :action => "new", :id => @pool}, :class=>"actionlink"%> <%= link_to "Hardware Profiles", {:action => "hardware_profiles", :id => @pool.id}, :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

1 1

[PATCH] view the list of provider accounts in a pool (revision 6)
by Mo Morsi 18 Mar '10

18 Mar '10

--- src/app/controllers/portal_pool_controller.rb | 5 ++++ src/app/views/portal_pool/accounts.html.erb | 23 ++++++++++++++++++++ .../controllers/portal_pool_controller_spec.rb | 8 +++++++ 3 files changed, 36 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 5e42d55..1897fc9 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -44,6 +44,11 @@ class PortalPoolController < ApplicationController require_privilege(Privilege::POOL_VIEW, @pool) end + def accounts + @pool = PortalPool.find(params[:id]) + require_privilege(Privilege::ACCOUNT_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..81a8a76 --- /dev/null +++ b/src/app/views/portal_pool/accounts.html.erb @@ -0,0 +1,23 @@ +<% 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 "View/Add Existing Cloud Accounts", {:controller => "cloud_accounts",: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/spec/controllers/portal_pool_controller_spec.rb b/src/spec/controllers/portal_pool_controller_spec.rb index 512127d..802017f 100644 --- a/src/spec/controllers/portal_pool_controller_spec.rb +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -39,5 +39,13 @@ describe PortalPoolController do response.should render_template("hardware_profiles") 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

1 1

[PATCH] view the list of provider accounts in a pool (revision 5)
by Mo Morsi 18 Mar '10

18 Mar '10

requires "spec fixes and updates" patch to be applied first --- src/app/controllers/portal_pool_controller.rb | 5 ++++ src/app/views/portal_pool/accounts.html.erb | 21 ++++++++++++++++++++ .../controllers/portal_pool_controller_spec.rb | 8 +++++++ 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 90df8a5..1cdb96a 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -38,6 +38,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 bc01a31..a65fe83 100644 --- a/src/spec/controllers/portal_pool_controller_spec.rb +++ b/src/spec/controllers/portal_pool_controller_spec.rb @@ -29,5 +29,13 @@ describe PortalPoolController do response.should redirect_to("http://test.host/portal_pool/show/#{id}") 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] hardware profile list / show ui & controller actions
by Mo Morsi 18 Mar '10

18 Mar '10

--- .../controllers/hardware_profiles_controller.rb | 39 ++++++++++++++++++++ src/app/controllers/portal_pool_controller.rb | 6 +++ src/app/controllers/provider_controller.rb | 6 +++ src/app/views/hardware_profiles/_list.html.erb | 24 ++++++++++++ src/app/views/hardware_profiles/index.html.erb | 1 + .../views/portal_pool/hardware_profiles.html.erb | 1 + src/app/views/provider/hardware_profiles.html.erb | 1 + 7 files changed, 78 insertions(+), 0 deletions(-) create mode 100644 src/app/controllers/hardware_profiles_controller.rb create mode 100644 src/app/views/hardware_profiles/_list.html.erb create mode 100644 src/app/views/hardware_profiles/index.html.erb create mode 100644 src/app/views/portal_pool/hardware_profiles.html.erb create mode 100644 src/app/views/provider/hardware_profiles.html.erb diff --git a/src/app/controllers/hardware_profiles_controller.rb b/src/app/controllers/hardware_profiles_controller.rb new file mode 100644 index 0000000..523a72c --- /dev/null +++ b/src/app/controllers/hardware_profiles_controller.rb @@ -0,0 +1,39 @@ +# 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. + +require 'util/taskomatic' + +class HardwareProfilesController < ApplicationController + before_filter :require_user + + def index + @hardware_profiles = HardwareProfile.find(:all) + #require_privilege(Privilege::PROVIDER_VIEW, @hardware_profile) ? + end + + def new + end + + def create + end + + def delete + end +end diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 90df8a5..449f96c 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -38,6 +38,12 @@ class PortalPoolController < ApplicationController @instances = @pool.instances end + def hardware_profiles + @pool = PortalPool.find(params[:id]) + @hardware_profiles = @pool.hardware_profiles + require_privilege(Privilege::INSTANCE_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 53056f5..b676fa7 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -50,6 +50,12 @@ class ProviderController < ApplicationController redirect_to :action => "index" end + def hardware_profiles + @provider = Provider.find(params[:id]) + @hardware_profiles = @provider.hardware_profiles + require_privilege(Privilege::PROVIDER_VIEW, @provider) + end + def accounts @provider = Provider.find(params[:id]) require_privilege(Privilege::ACCOUNT_VIEW, @provider) diff --git a/src/app/views/hardware_profiles/_list.html.erb b/src/app/views/hardware_profiles/_list.html.erb new file mode 100644 index 0000000..6b53194 --- /dev/null +++ b/src/app/views/hardware_profiles/_list.html.erb @@ -0,0 +1,24 @@ +<% if @hardware_profiles.size == 0 %> +<h1>There are no hardware profiles to display</h1> +<% else %> + <table> + <thead> + <tr> + <th scope="col">Name</th> + <th scope="col">Memory</th> + <th scope="col">Storage</th> + <th scope="col">Architecture</th> + </tr> + </thead> + <tbody> + <%(a)hardware_profiles.each {|hp| %> + <tr> + <td><%= hp.name %></td> + <td><%= hp.memory %></td> + <td><%= hp.storage %></td> + <td><%= hp.architecture %></td> + </tr> + <% } %> + </tbody> + </table> +<% end %> diff --git a/src/app/views/hardware_profiles/index.html.erb b/src/app/views/hardware_profiles/index.html.erb new file mode 100644 index 0000000..c19c3fa --- /dev/null +++ b/src/app/views/hardware_profiles/index.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'list' %> diff --git a/src/app/views/portal_pool/hardware_profiles.html.erb b/src/app/views/portal_pool/hardware_profiles.html.erb new file mode 100644 index 0000000..579d796 --- /dev/null +++ b/src/app/views/portal_pool/hardware_profiles.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'hardware_profiles/list' %> diff --git a/src/app/views/provider/hardware_profiles.html.erb b/src/app/views/provider/hardware_profiles.html.erb new file mode 100644 index 0000000..579d796 --- /dev/null +++ b/src/app/views/provider/hardware_profiles.html.erb @@ -0,0 +1 @@ +<%= render :partial => 'hardware_profiles/list' %> -- 1.6.2.5

2 3

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

18 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. The permissions checking in this patch is woefully inadequate, but should be easy to add in before end of sprint! With the functionality added by this patch, I'm able to start Mock instances. Handy for demos! --- src/app/controllers/cloud_accounts_controller.rb | 86 ++++++++++++++++++++ src/app/controllers/portal_pool_controller.rb | 10 +++ src/app/views/cloud_accounts/_form.erb | 13 +++ .../cloud_accounts/accounts_for_pool.html.erb | 36 ++++++++ src/app/views/cloud_accounts/new.html.erb | 14 +++ .../views/cloud_accounts/new_from_pool.html.erb | 11 +++ src/app/views/portal_pool/show.html.erb | 6 +- 7 files changed, 175 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/accounts_for_pool.html.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 diff --git a/src/app/controllers/cloud_accounts_controller.rb b/src/app/controllers/cloud_accounts_controller.rb new file mode 100644 index 0000000..96a0e0f --- /dev/null +++ b/src/app/controllers/cloud_accounts_controller.rb @@ -0,0 +1,86 @@ +# +# 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| + begin + require_privilege(Privilege::PROVIDER_VIEW,provider) + @providers << provider + rescue + end + } + end + + def new_from_pool + @pool = PortalPool.find(params[:id]) + @cloud_account = CloudAccount.new + @providers = [] + all_providers = Provider.all + all_providers.each {|provider| + begin + require_privilege(Privilege::PROVIDER_VIEW,provider) + @providers << provider + rescue + end + } + end + + + def create + @cloud_account = CloudAccount.new(params[:cloud_account]) + @provider = Provider.find(params[:provider][:id]) + @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 + + def accounts_for_pool + @pool = PortalPool.find(params[:id]) + @cloud_accounts = [] + all_accounts = CloudAccount.all + all_accounts.each {|account| + begin + require_privilege(Privilege::ACCOUNT_VIEW,account) + require_privilege(Privilege::ACCOUNT_ADD,account) + @cloud_accounts << account unless @pool.cloud_accounts.map{|x| x.id}.include?(account.id) + rescue + end + } + + end + +end diff --git a/src/app/controllers/portal_pool_controller.rb b/src/app/controllers/portal_pool_controller.rb index 90df8a5..be9d774 100644 --- a/src/app/controllers/portal_pool_controller.rb +++ b/src/app/controllers/portal_pool_controller.rb @@ -66,4 +66,14 @@ class PortalPoolController < ApplicationController def delete 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..78b3510 --- /dev/null +++ b/src/app/views/cloud_accounts/_form.erb @@ -0,0 +1,13 @@ +<ul> + <li> + <%= form.label :username, "Choose a username" %> + <%= form.text_field :username %> + </li> + <li> + <%= form.label :password, form.object.new_record? ? "Choose a password" : "Change 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/accounts_for_pool.html.erb b/src/app/views/cloud_accounts/accounts_for_pool.html.erb new file mode 100644 index 0000000..e273551 --- /dev/null +++ b/src/app/views/cloud_accounts/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 %> 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/show.html.erb b/src/app/views/portal_pool/show.html.erb index d649199..9d4e36c 100644 --- a/src/app/views/portal_pool/show.html.erb +++ b/src/app/views/portal_pool/show.html.erb @@ -35,4 +35,8 @@ </tbody> </table> <% end %> -<%= link_to "Add a new instance", {:controller => "instance", :action => "new", :id => @pool}, :class=>"actionlink"%> +<%= link_to "Add a new instance", {:controller => "instance", :action => "new", :id => @pool}, :class=>"actionlink"%><br/> +<%= link_to "View/Add Existing Cloud Accounts", {:controller => "cloud_accounts",:action => "accounts_for_pool", :id => @pool}, :class=>"actionlink" %><br/> +<%= link_to "Add a New Cloud Account", {:controller => +"cloud_accounts",:action => "new_from_pool", :id => @pool}, +:class=>"actionlink" %> -- 1.6.2.5

3 4

[PATCH portal] allow optional permission obj param to the has_foo? helper methods
by Scott Seago 18 Mar '10

18 Mar '10

So to check 'provider_view' privilege for the "current object" then call as before: has_provider_view? To check against a specific object then pass it in as a parameter: has_quota_modify?(pool) has_pool_view?(BasePortalObject.general_permission_scope Signed-off-by: Scott Seago <sseago(a)redhat.com> --- src/app/controllers/application_controller.rb | 4 ++-- src/app/services/application_service.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 63d908f..e1456c6 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -53,8 +53,8 @@ class ApplicationController < ActionController::Base perm_helper_string = "" Privilege::FULL_PRIVILEGE_LIST.each do |privilege| - perm_helper_string += "def has_#{privilege}?; " + - "check_privilege(\"#{privilege}\") end; " + perm_helper_string += "def has_#{privilege}(obj=@perm_obj)?; " + + "check_privilege(\"#{privilege}\", obj) end; " end master_helper_module.module_eval perm_helper_string diff --git a/src/app/services/application_service.rb b/src/app/services/application_service.rb index e2c45cb..f72f83d 100644 --- a/src/app/services/application_service.rb +++ b/src/app/services/application_service.rb @@ -40,14 +40,14 @@ module ApplicationService # @current_user must be defined - def check_privilege(privilege) - ((@perm_obj and @perm_obj.has_privilege(@current_user, privilege)) or + def check_privilege(privilege, perm_obj) + ((perm_obj and perm_obj.has_privilege(@current_user, privilege)) or BasePortalObject.general_permission_scope.has_privilege(@current_user, privilege)) end def authorized?(privilege, perm_obj=nil) @perm_obj = perm_obj - check_privilege(privilege) + check_privilege(privilege,@perm_obj) end def require_privilege(privilege, perm_obj=nil) unless authorized?(privilege, perm_obj) -- 1.6.2.5

1 0

Generate website documentation from Markdown docs.
by Tomas Sedovic 18 Mar '10

18 Mar '10

This patch changes the way we generate documentation pages. Instead of using HTML/HAML sources, we're generating them from the docs/*.mdown sources. I've introduced new webby layout specifically for the documentation. The rest is left untouched.

2 3

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel March 2010