gmane.comp.lib.deltacloud.devel
http://blog.gmane.org/gmane.comp.lib.deltacloud.devel
hourly11901-01-01T00:00+00:00Gmanehttp://gmane.org/img/gmane-25t.png
http://gmane.org
Model X
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3757
<pre>In case you didn't hear, Tesla revealed their upcoming model X
yesterday, looks pretty nice:
http://www.teslamotors.com/modelx
-j
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Jason Guiditta2012-02-10T20:00:01JIRA DTACLOUD-127 - Valid Credentials Errors
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3756
<pre>Gents
Unfortunately you've been away today.
I've some issues with the aforementioned JIRA. The commit sent to me by
fvollero:
https://git-wip-us.apache.org/repos/asf?p=deltacloud.git;a=commit;h=2fbc147f9e3041b19f2c89e4d222ba2185486405
does not solve the JIRA. It only addresses the issue in EC2 Driver.
This would suffice for the conductor BZ but this really should be fixed
across the board.
Another fundamental issue is that the Deltacloud Client (ruby) does not
properly support HTTP Errors.
We at least need the valid_credentials method to properly handle any
HTTP Errors returned by the server. But I think its worth noting though
that properly handling errors really needs to implemented across the
client as a whole.
I've created a patch for conductor addressing the original BZ:
https://bugzilla.redhat.com/show_bug.cgi?id=753880 this will fix the BZ
once the changes are in the client.
I've added some comments to the JIRA explaining the issue with the
commit and a suggestion on how to handle http errors.
Could you guys let me know how this goes.
Thanks gents
Martyn
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Martyn Taylor2012-02-06T17:54:19Deltacloud Android App
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3755
<pre>Gentlemen.
After speaking to Michal and Justin. It sounds like Deltacloud might be
interested in importing the Android App I build for DC into the DC project.
You guys are free to take it.
It's here: https://github.com/mtaylor/MobileCloudController
Just give me a few days to author the code before you pull it.
Regards
Martyn
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Martyn Taylor2012-02-02T14:46:18Android Deltacloud App
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3754
<pre>Hi people,
I wrote a native Deltacloud Android App a while back but didn't get
round to sending it out, I thought now is as good of a time as any to
get it out there.
You can download the app from here:
http://martyntaylor.fedorapeople.org/dcdroid.apk
Please check it out, there are one or two minor issues atm. But all in
all it does the job. Please drop me aline if people have
suggestions/bugs etc... I will get round to setting up a Redmine/BZ
project soon.
One Note: The app uses the older style "one DC Instance per provider"
format (Since I wrote the Android client way before the newer format was
introduced).
Also, I've only tested this on a handful of displays though I written it
to be compatible with most (though it might not look so great).
Have fun
Martyn
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Martyn Taylor2011-11-30T13:01:53Can I run deltacloudd server in a differentphysical machine?
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3753
<pre>Hello all!
I have confusion about deltacloudd deployment. I have three cloud
deployments. Can I access all of them via single installation of
deltacloudd?
For example: I have OpenNebula cloud controller in server A, OpenStack
cloud controller in server B and Eucalyptus in server C. Can I install
deltacloud server in server D and install & run deltacloudc client
from server E. If yes, should I install deltacloudd server in each
cloud controller server (A, B, C) or is it possible to install single
deltacloudd server and run it for all three clouds (with different
drivers)?
Kind regards,
Nodir.
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>Nodir Kodirov2011-11-07T02:42:04aeolus-configure -p rhevm is not working inlatest rpms from testing
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3751
<pre>https://bugzilla.redhat.com/show_bug.cgi?id=751113
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel< at >lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel</pre>wes hayutin2011-11-03T15:00:01Condor Cloud Driver
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3745
<pre>
Howdy Folks,
So Michal and I have been working on a Condor based cloud using
deltacloud as the front end API. The code base can be found here:
http://git.fedorahosted.org/git/?p=condor-cloud.git
There are still some cleanups and testing to be done but I would like to
get this into Fedora 16 as a feature. I am hoping you guys can take a
look and let me know if this is acceptable and what needs to be fixed to
make it so.
There are actually two parts to this project, one is the deltacloud
driver, which can be found under the deltacloud-condor-driver directory.
The rest deals with condor configuration and scripts.
I'm thinking I may name this project 'falcondor' as it seems unused and
more interesting :).
Thanks!
Ian
</pre>Ian Main2011-07-08T20:06:44Post Installation: New HWP Model
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3738
<pre>Gentlemen,
I've noticed a lot of chat around not being able to start instances.
For any of you who are not aware, you now *MUST create a HWP post installation (that matches some back end provider HWP) in order to start an instance.
Documentation for this is found here: http://www.aeolusproject.org/conductor-use.html
</pre>Martyn Taylor2011-03-14T16:16:17Timeout support in deltacloud-client
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3736
<pre>Hi all,
I want to propose adding timeout capabilities to deltacloud-client. I'm
seeing problems in Aeolus Conductor where a non-responding provider will
hang indefinitely until Apache closes the connection. I think the fix is
to allow deltacloud-client to raise an exception on timeouts instead of
trying to do so each place Conductor calls out to a provider. (A good
demonstration of this problem is to attempt to add a provider like
'http://1.1.1.1:1234/api'.)
rest-client has support for two types of timeout: an 'open_timeout' when
opening a connection, and a normal 'timeout' for an active connection:
http://rdoc.info/github/adamwiggins/rest-client/master/RestClient/Resource
I will send a quick patch that adds these two timeouts to the 'request'
method. I don't know the deltacloud-client code that well, so I'd
appreciate it if someone could let me know if there is a better way of
accomplishing this.
Best,
Matt
</pre>Matt Wagner2011-02-17T19:32:49Task #197 - Remove any logic forcing oneprovider only
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3728
<pre>
This patchset contains not only code for task #197, but also it contains renaming model of CloudAccount to ProviderAccount, and all fixings, that they were needed for green tests and changes in next branch, while this patchset was written. You need to apply all patches to work it well, when you will make a review.
</pre>jzigmund-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org2011-01-27T15:37:48rename deltacloud-configure to aeolus-configure
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3717
<pre>Renamed deltacloud to aeolus in the recipe and docs.
Also update subcomponents which have been renamed
(aggregator to conductor, core to deltacloud)
</pre>Mohammed Morsi2011-01-20T02:45:53initial aeolus-configure ssl integration
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3713
<pre>This patchset integrates ssl support for https and postgres
into the aeolus puppet recipe and configuration scripts
</pre>Mohammed Morsi2011-01-19T21:54:14[PATCH] refactored role/privilege model
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3711
<pre>Privileges are now a combination of a base action and a target object type (i.e. "modify" on Pool instead of the flat string "pool_modify"). In addition, the modeling has changed -- instead of a privileges model that was only low-level privileges with an explicit mapping to roles, the privileges model now tracks the privileges assigned to each role, with no separate mapping table.
This will require a database reload as the seeds.rb required substantial changes in role/privilege loading
Signed-off-by: Scott Seago <sseago-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
---
.../admin/provider_accounts_controller.rb | 11 +-
src/app/controllers/admin/providers_controller.rb | 15 +-
src/app/controllers/admin/settings_controller.rb | 15 +--
src/app/controllers/admin/users_controller.rb | 32 +---
src/app/controllers/application_controller.rb | 11 +-
src/app/controllers/builds_controller.rb | 10 +-
src/app/controllers/cloud_accounts_controller.rb | 20 ++--
src/app/controllers/dashboard_controller.rb | 10 --
.../controllers/hardware_profiles_controller.rb | 1 -
.../controllers/image_factory/builds_controller.rb | 8 +-
.../image_factory/templates_controller.rb | 66 ++++++---
src/app/controllers/instances_controller.rb | 12 +-
src/app/controllers/permissions_controller.rb | 14 +-
src/app/controllers/pools_controller.rb | 38 ++----
src/app/controllers/providers_controller.rb | 27 ++--
src/app/controllers/quotas_controller.rb | 8 +-
.../controllers/resources/instances_controller.rb | 10 +-
src/app/controllers/resources/pools_controller.rb | 15 +-
src/app/controllers/settings_controller.rb | 17 +--
src/app/controllers/templates_controller.rb | 50 ++++--
src/app/controllers/users_controller.rb | 79 ++++------
src/app/models/cloud_account.rb | 21 +++
src/app/models/instance.rb | 27 +++-
src/app/models/permission.rb | 6 +
src/app/models/permissioned_object.rb | 136 +++++++---------
src/app/models/privilege.rb | 168 +++++++++++++-------
src/app/models/role.rb | 7 +-
src/app/models/template.rb | 5 +
src/app/services/application_service.rb | 35 +++--
src/app/views/admin/users/_form.haml | 4 +-
src/app/views/admin/users/edit.haml | 2 +-
src/app/views/dashboard/summary.haml | 20 ++--
src/app/views/layouts/_main_nav.html.erb | 2 +-
src/app/views/permissions/list.haml | 6 +-
src/app/views/pools/show.haml | 2 +-
src/app/views/providers/accounts.haml | 4 +-
src/app/views/users/_form.haml | 4 +-
src/app/views/users/edit.haml | 2 +-
.../20110107000000_privilege_model_refactor.rb | 53 ++++++
src/db/seeds.rb | 163 ++++++++------------
src/features/support/custom.rb | 4 -
src/features/support/hooks.rb | 17 --
src/lib/tasks/cucumber.rake | 6 +-
src/spec/controllers/instance_controller_spec.rb | 12 +-
src/spec/controllers/users_controller_spec.rb | 7 -
src/spec/factories/base_permission_object.rb | 3 -
src/spec/factories/metadata_object.rb | 34 ----
src/spec/factories/permission.rb | 8 +-
src/spec/factories/pool.rb | 2 +-
src/spec/factories/pool_family.rb | 2 +-
src/spec/factories/user.rb | 5 +-
src/spec/fixtures/base_permission_objects.yml | 2 -
src/spec/fixtures/privileges.yml | 43 -----
src/spec/fixtures/roles.yml | 47 ------
src/spec/models/metadata_object_spec.rb | 2 +-
src/spec/models/permission_spec.rb | 58 +++++++
src/spec/models/pool_family_spec.rb | 4 +-
src/spec/services/registration_service_spec.rb | 14 +--
src/spec/spec_helper.rb | 2 +-
59 files changed, 705 insertions(+), 703 deletions(-)
create mode 100644 src/db/migrate/20110107000000_privilege_model_refactor.rb
delete mode 100644 src/spec/factories/base_permission_object.rb
delete mode 100644 src/spec/factories/metadata_object.rb
delete mode 100644 src/spec/fixtures/base_permission_objects.yml
delete mode 100644 src/spec/fixtures/privileges.yml
delete mode 100644 src/spec/fixtures/roles.yml
create mode 100644 src/spec/models/permission_spec.rb
diff --git a/src/app/controllers/admin/provider_accounts_controller.rb b/src/app/controllers/admin/provider_accounts_controller.rb
index 2c331f7..960f4f5 100644
--- a/src/app/controllers/admin/provider_accounts_controller.rb
+++ b/src/app/controllers/admin/provider_accounts_controller.rb
< at >< at > -8,6 +8,7 < at >< at > class Admin::ProviderAccountsController < ApplicationController
def show
< at >tab_captions = ['Properties', 'Credentials', 'History', 'Permissions']
< at >account = CloudAccount.find(params[:id])
+ require_privilege(Privilege::ACTION_VIEW, < at >account)
< at >details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab]
if params.delete :test_account
< at >< at > -34,7 +35,7 < at >< at > class Admin::ProviderAccountsController < ApplicationController
def create
< at >provider = Provider.find(params[:provider_id])
- require_privilege(Privilege::ACCOUNT_MODIFY, < at >provider)
+ require_privilege(Privilege::ACTION_CREATE, CloudAccount, < at >provider)
< at >providers = Provider.all
< at >cloud_account = CloudAccount.new(params[:cloud_account])
< at >< at > -73,13 +74,13 < at >< at > class Admin::ProviderAccountsController < ApplicationController
< at >cloud_account = CloudAccount.find(params[:id])
< at >quota = < at >cloud_account.quota
< at >provider = < at >cloud_account.provider
- require_privilege(Privilege::ACCOUNT_MODIFY,< at >provider)
+ require_privilege(Privilege::ACTION_MODIFY,< at >cloud_account)
end
def update
< at >cloud_account = CloudAccount.find(params[:id])
< at >provider = < at >cloud_account.provider
- require_privilege(Privilege::ACCOUNT_MODIFY, < at >provider)
+ require_privilege(Privilege::ACTION_MODIFY,< at >cloud_account)
< at >quota = < at >cloud_account.quota
if params.delete :test_account
< at >< at > -101,7 +102,9 < at >< at > class Admin::ProviderAccountsController < ApplicationController
if (not params[:accounts_selected]) or (params[:accounts_selected].length == 0)
flash[:notice] = "You must select some accounts first."
else
- CloudAccount.destroy(params[:accounts_selected])
+ CloudAccount.find(params[:accounts_selected]).each do |account|
+ account.destroy if check_privilege(Privilege::ACTION_MODIFY, account)
+ end
end
redirect_to admin_provider_accounts_url
end
diff --git a/src/app/controllers/admin/providers_controller.rb b/src/app/controllers/admin/providers_controller.rb
index aac2c1d..61a405b 100644
--- a/src/app/controllers/admin/providers_controller.rb
+++ b/src/app/controllers/admin/providers_controller.rb
< at >< at > -6,19 +6,20 < at >< at > class Admin::ProvidersController < ApplicationController
end
def new
- require_privilege(Privilege::PROVIDER_MODIFY)
+ require_privilege(Privilege::ACTION_CREATE, Provider)
< at >provider = Provider.new
kick_condor
end
def edit
< at >provider = Provider.find_by_id(params[:id])
- require_privilege(Privilege::PROVIDER_MODIFY, < at >provider)
+ require_privilege(Privilege::ACTION_MODIFY, < at >provider)
end
def show
< at >provider = Provider.find(params[:id])
< at >url_params = params.clone
+ require_privilege(Privilege::ACTION_VIEW, < at >provider)
< at >tab_captions = ['Properties', 'HW Profiles', 'Realms', 'Provider Accounts', 'Services','History','Permissions']
< at >details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab]
respond_to do |format|
< at >< at > -33,7 +34,7 < at >< at > class Admin::ProvidersController < ApplicationController
end
def create
- require_privilege(Privilege::PROVIDER_MODIFY)
+ require_privilege(Privilege::ACTION_CREATE, Provider)
< at >provider = Provider.new(params[:provider])
if params[:test_connection]
test_connection(< at >provider)
< at >< at > -52,8 +53,8 < at >< at > class Admin::ProvidersController < ApplicationController
end
def update
- require_privilege(Privilege::PROVIDER_MODIFY)
< at >provider = Provider.find_by_id(params[:id])
+ require_privilege(Privilege::ACTION_MODIFY, < at >provider)
previous_cloud_type = < at >provider.cloud_type
< at >provider.update_attributes(params[:provider])
if params[:test_connection]
< at >< at > -77,7 +78,9 < at >< at > class Admin::ProvidersController < ApplicationController
end
def multi_destroy
- Provider.destroy(params[:provider_selected])
+ Provider.find(params[:provider_selected]).each do |provider|
+ provider.destroy if check_privilege(Privilege::ACTION_MODIFY, provider)
+ end
redirect_to admin_providers_url
end
< at >< at > -97,7 +100,7 < at >< at > class Admin::ProvidersController < ApplicationController
< at >header = [{ :name => "Provider name", :sort_attr => :name },
{ :name => "Provider URL", :sort_attr => :name }
]
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_VIEW)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_VIEW)
< at >url_params = params.clone
end
end
diff --git a/src/app/controllers/admin/settings_controller.rb b/src/app/controllers/admin/settings_controller.rb
index accf398..2b816d4 100644
--- a/src/app/controllers/admin/settings_controller.rb
+++ b/src/app/controllers/admin/settings_controller.rb
< at >< at > -6,18 +6,12 < at >< at > class Admin::SettingsController < ApplicationController
KEYS = [SELF_SERVICE_DEFAULT_QUOTA]
def self_service
- if !is_admin?
- raise PermissionError.new('You have insufficient privileges to perform action.')
- return
- end
+ require_privilege(Privilege::ACTION_MODIFY)
< at >self_service_default_quota = MetadataObject.lookup(SELF_SERVICE_DEFAULT_QUOTA)
end
def general_settings
- if !is_admin?
- raise PermissionError.new('You have insufficient privileges to perform action.')
- return
- end
+ require_privilege(Privilege::ACTION_MODIFY)
end
def update
< at >< at > -47,9 +41,4 < at >< at > class Admin::SettingsController < ApplicationController
redirect_to :action => 'self_service'
end
- private
- def is_admin?
- is_admin = < at >current_user.permissions.collect { |p| p.role }.find { |r| r.name == "Administrator" }
- return is_admin == nil ? false : true
- end
end
diff --git a/src/app/controllers/admin/users_controller.rb b/src/app/controllers/admin/users_controller.rb
index 0e854a9..4648da9 100644
--- a/src/app/controllers/admin/users_controller.rb
+++ b/src/app/controllers/admin/users_controller.rb
< at >< at > -1,9 +1,9 < at >< at >
class Admin::UsersController < ApplicationController
before_filter :require_user
- before_filter :only_admin, :only => [:index, :multi_destroy]
before_filter :load_users, :only => [:index, :show]
def new
+ require_privilege(Privilege::ACTION_CREATE, User) unless current_user.nil?
< at >user = User.new
< at >user.quota = Quota.new
end
< at >< at > -13,8 +13,7 < at >< at > class Admin::UsersController < ApplicationController
redirect_to :action => 'new' and return
end
- # TODO: Shouldn't it be if current_user.nil? instead?
- require_privilege(Privilege::USER_MODIFY) unless current_user.nil?
+ require_privilege(Privilege::ACTION_MODIFY, User) unless current_user.nil?
< at >user = User.new(params[:user])
< at >registration = RegistrationService.new(< at >user)
< at >< at > -34,6 +33,7 < at >< at > class Admin::UsersController < ApplicationController
def show
< at >user = User.find_by_id(params[:id]) || current_user
+ require_privilege(Privilege::ACTION_VIEW, User) unless current_user == < at >user
< at >quota_resources = < at >user.quota.quota_resources
< at >url_params = params.clone
< at >< at > -52,15 +52,12 < at >< at > class Admin::UsersController < ApplicationController
def edit
< at >user = User.find_by_id(params[:id]) || current_user
-
- if cannot_modify_different_user?(< at >user)
- flash[:notice] = "Invalid Permission to perform this operation"
- redirect_to dashboard_url and return
- end
+ require_privilege(Privilege::ACTION_MODIFY, User) unless < at >user == current_user
end
def update
< at >user = User.find_by_id(params[:id]) || current_user
+ require_privilege(Privilege::ACTION_MODIFY, User) unless < at >user == current_user
if params[:commit] == "Reset"
redirect_to edit_admin_user_url(< at >user) and return
< at >< at > -68,20 +65,16 < at >< at > class Admin::UsersController < ApplicationController
redirect_to dashboard_url and return unless < at >user
- if cannot_modify_different_user = cannot_modify_different_user?(< at >user)
- flash[:notice] = "Invalid Permission to perform this operation"
- redirect_to dashboard_url and return
- end
-
unless < at >user.update_attributes(params[:user])
render :action => 'edit' and return
else
flash[:notice] = "User updated!"
- redirect_to cannot_modify_different_user ? dashboard_url : admin_users_url
+ redirect_to (< at >user == current_user) ? dashboard_url : admin_users_url
end
end
def multi_destroy
+ require_privilege(Privilege::ACTION_MODIFY, User)
User.destroy(params[:user_selected])
redirect_to admin_users_url
end
< at >< at > -101,15 +94,4 < at >< at > class Admin::UsersController < ApplicationController
end
end
- def only_admin
- unless current_user.permissions.collect { |p| p.role }.find { |r| r.name == "Administrator" }
- flash[:notice] = "Invalid Permission to perform this operation"
- redirect_to dashboard_url
- end
- end
-
- def cannot_modify_different_user?(user)
- user && user != current_user && !BasePermissionObject.general_permission_scope.can_modify_users(current_user)
- end
-
end
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb
index b77fe9c..b0386e0 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
< at >< at > -60,13 +60,6 < at >< at > class ApplicationController < ActionController::Base
'generic'
end
- perm_helper_string = ""
- Privilege::FULL_PRIVILEGE_LIST.each do |privilege|
- perm_helper_string += "def has_#{privilege}?(obj=< at >perm_obj); " +
- "check_privilege(\"#{privilege}\", obj) end; "
- end
- master_helper_module.module_eval perm_helper_string
-
helper_method :check_privilege
protected
< at >< at > -162,8 +155,8 < at >< at > class ApplicationController < ActionController::Base
def get_nav_items
if current_user.present?
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_VIEW)
- < at >pools = Pool.list_for_user(< at >current_user, Privilege::POOL_VIEW)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_VIEW)
+ < at >pools = Pool.list_for_user(< at >current_user, Privilege::ACTION_VIEW)
end
end
diff --git a/src/app/controllers/builds_controller.rb b/src/app/controllers/builds_controller.rb
index 7cf0ad6..e205171 100644
--- a/src/app/controllers/builds_controller.rb
+++ b/src/app/controllers/builds_controller.rb
< at >< at > -1,12 +1,12 < at >< at >
class BuildsController < ApplicationController
- before_filter [:require_user, :check_permission]
+ before_filter [:require_user]
def section_id
'build'
end
def index
- require_privilege(Privilege::IMAGE_VIEW)
+ require_privilege(Privilege::ACTION_VIEW, Template)
order = get_order('templates.name')
< at >running_images = Image.all(:include => :template, :conditions => ['status IN (?)', Image::ACTIVE_STATES], :order => order)
< at >completed_images = Image.all(:include => :template, :conditions => {:status => Image::STATE_COMPLETE}, :order => order)
< at >< at > -16,6 +16,7 < at >< at > class BuildsController < ApplicationController
def new
raise "select template to build" unless id = params[:template_id]
< at >tpl = Template.find(id)
+ check_permission
if < at >tpl.imported
flash[:warning] = "Build imported template is not supported"
redirect_to templates_path
< at >< at > -30,6 +31,7 < at >< at > class BuildsController < ApplicationController
end
< at >tpl = Template.find(params[:template_id])
+ check_permission
< at >all_targets = Image.available_targets
if params[:targets].blank?
< at >< at > -60,9 +62,11 < at >< at > class BuildsController < ApplicationController
end
def edit
+ # FIXME: is < at >tpl defined here? do we need check_permission here?
end
def update
+ # FIXME: is < at >tpl defined here? do we need check_permission here?
end
private
< at >< at > -82,6 +86,6 < at >< at > class BuildsController < ApplicationController
end
def check_permission
- require_privilege(Privilege::IMAGE_MODIFY)
+ require_privilege(Privilege::ACTION_MODIFY, < at >tpl)
end
end
diff --git a/src/app/controllers/cloud_accounts_controller.rb b/src/app/controllers/cloud_accounts_controller.rb
index 75a75d9..c2fe5e7 100644
--- a/src/app/controllers/cloud_accounts_controller.rb
+++ b/src/app/controllers/cloud_accounts_controller.rb
< at >< at > -31,19 +31,19 < at >< at > class CloudAccountsController < ApplicationController
def index
< at >provider = Provider.find(params[:provider_id])
- require_privilege(Privilege::ACCOUNT_VIEW, < at >provider)
+ require_privilege(Privilege::ACTION_VIEW, CloudAccount, < at >provider)
end
def new
< at >provider = Provider.find(params[:provider_id])
< at >cloud_account = CloudAccount.new
< at >quota = Quota.new
- require_privilege(Privilege::ACCOUNT_MODIFY, < at >provider)
+ require_privilege(Privilege::ACTION_CREATE, CloudAccount, < at >provider)
end
def create
< at >provider = Provider.find(params[:provider_id])
- require_privilege(Privilege::ACCOUNT_MODIFY,< at >provider)
+ require_privilege(Privilege::ACTION_CREATE, CloudAccount, < at >provider)
< at >cloud_account = CloudAccount.new(params[:cloud_account])
< at >cloud_account.provider = < at >provider
< at >cloud_account.quota = < at >quota = Quota.new
< at >< at > -80,13 +80,13 < at >< at > class CloudAccountsController < ApplicationController
< at >cloud_account = CloudAccount.find(params[:id])
< at >quota = < at >cloud_account.quota
< at >provider = < at >cloud_account.provider
- require_privilege(Privilege::ACCOUNT_MODIFY,< at >provider)
+ require_privilege(Privilege::ACTION_MODIFY, < at >cloud_account)
end
def update_accounts
< at >provider = Provider.find(params[:provider][:id])
- require_privilege(Privilege::ACCOUNT_MODIFY, < at >provider)
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_VIEW)
+ require_privilege(Privilege::ACTION_MODIFY, CloudAccount, < at >provider)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_VIEW)
success = true
< at >provider.cloud_accounts.each do |cloud_account|
< at >< at > -130,7 +130,7 < at >< at > class CloudAccountsController < ApplicationController
def update
< at >cloud_account = CloudAccount.find(params[:id])
< at >provider = < at >cloud_account.provider
- require_privilege(Privilege::ACCOUNT_MODIFY, < at >provider)
+ require_privilege(Privilege::ACTION_MODIFY, < at >cloud_account)
< at >quota = < at >cloud_account.quota
limit = params[:quota][:maximum_running_instances] if params[:quota]
< at >< at > -145,7 +145,7 < at >< at > class CloudAccountsController < ApplicationController
def key
< at >cloud_account = CloudAccount.find(params[:id])
- require_privilege(Privilege::ACCOUNT_MODIFY,< at >cloud_account.provider)
+ require_privilege(Privilege::ACTION_MODIFY,< at >cloud_account)
unless < at >cloud_account.instance_key.nil?
render :text => < at >cloud_account.instance_key.pem
end
< at >< at > -154,7 +154,7 < at >< at > class CloudAccountsController < ApplicationController
def destroy
account = CloudAccount.find(params[:id])
provider = account.provider
- require_privilege(Privilege::ACCOUNT_MODIFY, provider)
+ require_privilege(Privilege::ACTION_MODIFY, account)
if account.destroy
flash[:notice] = "Cloud Account destroyed"
else
< at >< at > -176,6 +176,6 < at >< at > class CloudAccountsController < ApplicationController
private
def load_providers
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_VIEW)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_VIEW)
end
end
diff --git a/src/app/controllers/dashboard_controller.rb b/src/app/controllers/dashboard_controller.rb
index 8d37a12..5254dd7 100644
--- a/src/app/controllers/dashboard_controller.rb
+++ b/src/app/controllers/dashboard_controller.rb
< at >< at > -70,16 +70,6 < at >< at > class DashboardController < ApplicationController
< at >cloud_accounts = CloudAccount.find(:all)
- # Now need to check any permissions are set since default permission and pool
- # may not be set for the admin user
- if < at >current_user.permissions
- # FIXME remove general role based permission check, replace w/
- # more granular / per-permission-object permission checks on the
- # dashboard in the future (here and in dashboard views)
- < at >is_admin = < at >current_user.permissions.collect { |p| p.role }.
- find { |r| r.name == "Administrator" }
- end
-
render :action => 'monitor'
end
diff --git a/src/app/controllers/hardware_profiles_controller.rb b/src/app/controllers/hardware_profiles_controller.rb
index c3afae2..d18110c 100644
--- a/src/app/controllers/hardware_profiles_controller.rb
+++ b/src/app/controllers/hardware_profiles_controller.rb
< at >< at > -23,7 +23,6 < at >< at > class HardwareProfilesController < ApplicationController
def index
< at >hardware_profiles = HardwareProfile.find(:all)
- #require_privilege(Privilege::PROVIDER_VIEW, < at >hardware_profile) ?
end
def new
diff --git a/src/app/controllers/image_factory/builds_controller.rb b/src/app/controllers/image_factory/builds_controller.rb
index 97bd32f..df9aba6 100644
--- a/src/app/controllers/image_factory/builds_controller.rb
+++ b/src/app/controllers/image_factory/builds_controller.rb
< at >< at > -1,9 +1,10 < at >< at >
class ImageFactory::BuildsController < ApplicationController
- before_filter [:require_user, :check_permission]
+ before_filter [:require_user]
def new
raise "select template to build" unless id = params[:template_id]
< at >tpl = Template.find(id)
+ check_permission
if < at >tpl.imported
flash[:warning] = "Build imported template is not supported"
redirect_to templates_path
< at >< at > -13,6 +14,7 < at >< at > class ImageFactory::BuildsController < ApplicationController
def create
< at >tpl = Template.find(params[:template_id])
+ check_permission
< at >all_targets = Image.available_targets
if params[:targets].blank?
< at >< at > -43,9 +45,11 < at >< at > class ImageFactory::BuildsController < ApplicationController
end
def edit
+ # FIXME: is < at >tpl defined here? do we need check_permission here?
end
def update
+ # FIXME: is < at >tpl defined here? do we need check_permission here?
end
private
< at >< at > -65,6 +69,6 < at >< at > class ImageFactory::BuildsController < ApplicationController
end
def check_permission
- require_privilege(Privilege::IMAGE_MODIFY)
+ require_privilege(Privilege::ACTION_MODIFY, < at >tpl)
end
end
diff --git a/src/app/controllers/image_factory/templates_controller.rb b/src/app/controllers/image_factory/templates_controller.rb
index fbba625..a1b0fec 100644
--- a/src/app/controllers/image_factory/templates_controller.rb
+++ b/src/app/controllers/image_factory/templates_controller.rb
< at >< at > -2,7 +2,6 < at >< at > require 'util/repository_manager'
class ImageFactory::TemplatesController < ApplicationController
before_filter :require_user
- before_filter :check_permission, :except => [:index, :show]
before_filter :load_templates, :only => [:index, :show]
def index
< at >< at > -10,6 +9,7 < at >< at > class ImageFactory::TemplatesController < ApplicationController
def show
< at >tpl = Template.find(params[:id])
+ require_privilege(Privilege::ACTION_VIEW, < at >tpl)
< at >url_params = params.clone
< at >tab_captions = ['Properties', 'Images']
< at >details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab]
< at >< at > -26,6 +26,7 < at >< at > class ImageFactory::TemplatesController < ApplicationController
end
def new
+ check_create_permission
# can't use < at >template variable - is used by compass (or something other)
< at >tpl = Template.new(params[:tpl])
< at >repository_manager = RepositoryManager.new(:repositories => params[:repository] || < at >tpl.platform)
< at >< at > -34,9 +35,11 < at >< at > class ImageFactory::TemplatesController < ApplicationController
def add_selected
if params[:tpl] and not params[:tpl][:id].blank?
< at >tpl = Template.find(params[:tpl][:id])
+ check_edit_permission
< at >tpl.attributes = params[:tpl]
else
< at >tpl = Template.new(params[:tpl])
+ check_create_permission
end
< at >repository_manager = RepositoryManager.new(:repositories => params[:repository] || < at >tpl.platform)
< at >tpl.add_software(params[:packages].to_a + params[:selected_packages].to_a + params[:cached_packages].to_a,
< at >< at > -46,11 +49,13 < at >< at > class ImageFactory::TemplatesController < ApplicationController
def edit
< at >tpl = Template.find(params[:id])
+ check_edit_permission
< at >tpl.attributes = params[:tpl] unless params[:tpl].blank?
< at >repository_manager = RepositoryManager.new(:repositories => params[:repository] || < at >tpl.platform)
end
def create
+ check_create_permission
< at >tpl = Template.new(params[:tpl])
< at >tpl.packages = params[:packages]
if < at >tpl.save
< at >< at > -65,6 +70,7 < at >< at > class ImageFactory::TemplatesController < ApplicationController
def update
< at >tpl = Template.find(params[:id])
+ check_edit_permission
< at >tpl.packages = []
if < at >tpl.update_attributes(params[:tpl])
< at >< at > -120,7 +126,13 < at >< at > class ImageFactory::TemplatesController < ApplicationController
end
def managed_content
- < at >tpl = params[:template_id].blank? ? Template.new : Template.find(params[:template_id])
+ if params[:template_id].blank?
+ < at >tpl = Template.new
+ check_create_permission
+ else
+ < at >tpl = Template.find(params[:template_id])
+ check_edit_permission
+ end
< at >tpl.add_software(params[:packages].to_a + params[:selected_packages].to_a,
params[:groups].to_a + params[:selected_groups].to_a)
render :layout => false
< at >< at > -133,9 +145,11 < at >< at > class ImageFactory::TemplatesController < ApplicationController
else
errs = {}
Template.find(ids).each do |t|
- t.destroy
- unless t.destroyed?
- errs[t.name] = t.errors.full_messages.join(". ")
+ if check_permission(Privilege::ACTION_MODIFY, t)
+ t.destroy
+ errs[t.name] = t.errors.full_messages.join(". ") unless t.destroyed?
+ else
+ errs[t.name] = "You don't have permission to delete #{t.name}"
end
end
if errs.empty?
< at >< at > -148,9 +162,11 < at >< at > class ImageFactory::TemplatesController < ApplicationController
end
def assembly
+ # FIXME: do we need perm check here?
end
def deployment_definition
+ # FIXME: do we need perm check here?
< at >all_targets = Image.available_targets
end
< at >< at > -158,9 +174,11 < at >< at > class ImageFactory::TemplatesController < ApplicationController
params[:packages].delete(params[:name]) unless params[:name].blank?
if params[:tpl] and not params[:tpl][:id].blank?
< at >tpl = Template.find(params[:tpl][:id])
+ check_edit_permission
< at >tpl.attributes = params[:tpl]
else
< at >tpl = Template.new(params[:tpl])
+ check_create_permission
end
< at >tpl.add_software(params[:packages].to_a, params[:groups].to_a)
< at >repository_manager = RepositoryManager.new(:repositories => params[:repository] || < at >tpl.platform)
< at >< at > -168,9 +186,13 < at >< at > class ImageFactory::TemplatesController < ApplicationController
end
def multi_destroy
- # FIXME: set correct check permission when we will have it
- require_privilege(Privilege::IMAGE_MODIFY)
- Template.destroy(params[:selected])
+ < at >tpl = Template.find(params[:selected])
+ if check_edit_permission
+ < at >tpl.destroy
+ errs[< at >tpl.name] = < at >tpl.errors.full_messages.join(". ") unless < at >tpl.destroyed?
+ else
+ errs[< at >tpl.name] = "You don't have permission to delete #{< at >tpl.name}"
+ end
redirect_to image_factory_templates_url
end
< at >< at > -184,7 +206,6 < at >< at > class ImageFactory::TemplatesController < ApplicationController
{:name => 'ARCH', :sort_attr => 'templates.architecture'},
{:name => 'STATUS', :sort_attr => 'status'},
]
- require_privilege(Privilege::IMAGE_VIEW)
< at >images = tpl.images
end
< at >< at > -197,18 +218,21 < at >< at > class ImageFactory::TemplatesController < ApplicationController
{:name => 'ARCH', :sort_attr => 'architecture'},
]
- # TODO: add template permission check
- require_privilege(Privilege::IMAGE_VIEW)
- < at >templates = Template.find(
- :all,
- :include => :images,
- :order => get_order('name')
- )
+ < at >templates = Template.list_for_user(Privilege::ACTION_VIEW,
+ :include => :images,
+ :order => get_order('name')
+ )
< at >url_params = params.clone
end
def set_package_vars(set_all = false)
- < at >tpl = params[:id].blank? ? Template.new : Template.find(params[:id])
+ if params[:id].blank?
+ < at >tpl = Template.new
+ check_create_permission
+ else
+ < at >tpl = Template.find(params[:id])
+ check_edit_permission
+ end
< at >tpl.attributes = params[:tpl] unless params[:tpl].nil?
< at >repository_manager = RepositoryManager.new(:repositories => params[:repository] || < at >tpl.platform)
< at >groups = < at >repository_manager.groups
< at >< at > -230,8 +254,12 < at >< at > class ImageFactory::TemplatesController < ApplicationController
flash.now[:error][:failures].merge!(errs)
end
- def check_permission
- require_privilege(Privilege::IMAGE_MODIFY)
+ def check_create_permission
+ require_privilege(Privilege::ACTION_CREATE, Template)
+ end
+
+ def check_edit_permission
+ require_privilege(Privilege::ACTION_MODIFY, < at >tpl)
end
def get_selected_id
diff --git a/src/app/controllers/instances_controller.rb b/src/app/controllers/instances_controller.rb
index 5e68b8e..142a336 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
< at >< at > -35,7 +35,7 < at >< at > class InstancesController < ApplicationController
end
def index
- < at >pools = Pool.list_for_user(< at >current_user, Privilege::INSTANCE_MODIFY)
+ < at >pools = Pool.list_for_user(< at >current_user, Privilege::ACTION_MODIFY, :target_type => Instance)
< at >order_dir = params[:order_dir] == 'desc' ? 'desc' : 'asc'
< at >order_field = params[:order_field] || 'name'
< at >< at > -69,7 +69,7 < at >< at > class InstancesController < ApplicationController
def new
< at >instance = Instance.new(params[:instance])
- require_privilege(Privilege::INSTANCE_MODIFY, < at >instance.pool) if < at >instance.pool
+ require_privilege(Privilege::ACTION_CREATE, Instance, < at >instance.pool) if < at >instance.pool
# FIXME: we need to list only templates for particular user,
# => TODO: add TEMPLATE_* permissions
< at >templates = Template.paginate(
< at >< at > -81,7 +81,7 < at >< at > class InstancesController < ApplicationController
def configure
< at >instance = Instance.new(params[:instance])
- require_privilege(Privilege::INSTANCE_MODIFY, < at >instance.pool)
+ require_privilege(Privilege::ACTION_CREATE, Instance, < at >instance.pool)
< at >hardware_profiles = HardwareProfile.find(:all, :include => :architecture,
:conditions => {:provider_id => nil,
'hardware_profile_properties.value' => < at >instance.template.architecture})
< at >< at > -97,7 +97,7 < at >< at > class InstancesController < ApplicationController
< at >instance.state = Instance::STATE_NEW
< at >instance.owner = current_user
- require_privilege(Privilege::INSTANCE_MODIFY,
+ require_privilege(Privilege::ACTION_CREATE, Instance,
Pool.find(< at >instance.pool_id))
#FIXME: This should probably be in a transaction
if < at >instance.save!
< at >< at > -131,7 +131,7 < at >< at > class InstancesController < ApplicationController
end
< at >instance = Instance.find((params[:id] || []).first)
- require_privilege(Privilege::INSTANCE_CONTROL,< at >instance.pool)
+ require_privilege(Privilege::ACTION_USE,< at >instance)
if params[:instance_details]
render :action => 'show'
< at >< at > -190,7 +190,7 < at >< at > class InstancesController < ApplicationController
def instance
< at >instance = Instance.find(params[:id])
- require_privilege(Privilege::INSTANCE_VIEW, < at >instance.pool)
+ require_privilege(Privilege::ACTION_VIEW, < at >instance)
end
end
diff --git a/src/app/controllers/permissions_controller.rb b/src/app/controllers/permissions_controller.rb
index c326e14..a2991d9 100644
--- a/src/app/controllers/permissions_controller.rb
+++ b/src/app/controllers/permissions_controller.rb
< at >< at > -21,15 +21,15 < at >< at > class PermissionsController < ApplicationController
def show
< at >permission = Permission.find(params[:id])
- require_privilege(Privilege::PERM_VIEW, < at >permission.permission_object)
+ require_privilege(Privilege::ACTION_PERM_VIEW, < at >permission.permission_object)
end
def list
- set_permission_object Privilege::PERM_VIEW
+ set_permission_object Privilege::ACTION_PERM_VIEW
end
def new
- set_permission_object Privilege::PERM_SET
+ set_permission_object Privilege::ACTION_PERM_SET
< at >permission = Permission.new(:permission_object_type => < at >permission_object.class,
:permission_object_id => < at >permission_object.id)
< at >users = User.all
< at >< at > -38,7 +38,7 < at >< at > class PermissionsController < ApplicationController
def create
< at >permission = Permission.new(params[:permission])
- require_privilege(Privilege::PERM_SET, < at >permission.permission_object)
+ require_privilege(Privilege::ACTION_PERM_SET, < at >permission.permission_object)
if request.post? && < at >permission.save
flash[:notice] = "Permission record added."
redirect_to :action => "list",
< at >< at > -55,7 +55,7 < at >< at > class PermissionsController < ApplicationController
def destroy
if request.post?
p =Permission.find(params[:permission][:id])
- require_privilege(Privilege::PERM_SET, p.permission_object)
+ require_privilege(Privilege::ACTION_PERM_SET, p.permission_object)
p.destroy
end
redirect_to :action => "list",
< at >< at > -65,7 +65,7 < at >< at > class PermissionsController < ApplicationController
private
- def set_permission_object(privilege)
+ def set_permission_object(action)
if !params[:permission_object_type].nil?
< at >permission_object =
params[:permission_object_type].constantize.find(params[:permission_object_id])
< at >< at > -83,7 +83,7 < at >< at > class PermissionsController < ApplicationController
raise ActiveRecord::RecordNotFound if < at >permission_object.nil?
- require_privilege(privilege, < at >permission_object)
+ require_privilege(action, < at >permission_object)
end
end
diff --git a/src/app/controllers/pools_controller.rb b/src/app/controllers/pools_controller.rb
index 47cdc77..fdc3650 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
< at >< at > -44,16 +44,19 < at >< at > class PoolsController < ApplicationController
def show
< at >pool = Pool.find(params[:id])
+ require_privilege(Privilege::ACTION_VIEW, < at >pool)
end
def edit
< at >pool = Pool.find(params[:id])
+ require_privilege(Privilege::ACTION_MODIFY, < at >pool)
end
def list
#FIXME: clean this up, many error cases here
< at >pool = Pool.find(params[:id])
- require_privilege(Privilege::INSTANCE_VIEW,< at >pool)
+ # FIXME: really we need perm-filtered list here
+ require_privilege(Privilege::ACTION_VIEW, Instance, < at >pool)
< at >pool.reload
< at >order_dir = params[:order_dir] == 'desc' ? 'desc' : 'asc'
< at >< at > -74,23 +77,23 < at >< at > class PoolsController < ApplicationController
def hardware_profiles
< at >pool = Pool.find(params[:id])
< at >hardware_profiles = < at >pool.hardware_profiles
- require_privilege(Privilege::POOL_VIEW, < at >pool)
+ require_privilege(Privilege::ACTION_VIEW, < at >pool)
end
def realms
< at >pool = Pool.find(params[:id])
< at >realm_names = < at >pool.realms
- require_privilege(Privilege::POOL_VIEW,< at >pool)
+ require_privilege(Privilege::ACTION_VIEW, < at >pool)
end
def new
- require_privilege(Privilege::POOL_MODIFY)
- < at >pools = Pool.list_for_user(< at >current_user, Privilege::POOL_MODIFY)
+ require_privilege(Privilege::ACTION_CREATE, Pool)
+ < at >pools = Pool.list_for_user(< at >current_user, Privilege::ACTION_MODIFY)
< at >pool = Pool.new
end
def create
- require_privilege(Privilege::POOL_MODIFY)
+ require_privilege(Privilege::ACTION_CREATE, Pool)
#FIXME: This should probably be in a transaction
< at >pool = Pool.new(params[:pool])
< at >< at > -118,6 +121,7 < at >< at > class PoolsController < ApplicationController
if type == "edit"
redirect_to :action => 'edit', :id => pool_id
elsif type == "delete"
+ require_privilege(Privilege::ACTION_MODIFY, Pool.find(pool_id))
params[:id] = pool_id
destroy
end
< at >< at > -130,27 +134,5 < at >< at > class PoolsController < ApplicationController
def delete
end
- def accounts_for_pool
- < at >pool = Pool.find(params[:pool_id])
- require_privilege(Privilege::ACCOUNT_VIEW,< at >pool)
- < at >cloud_accounts = []
- all_accounts = CloudAccount.list_for_user(< at >current_user, Privilege::ACCOUNT_ADD)
- all_accounts.each {|account|
- < at >cloud_accounts << account unless < at >pool.cloud_accounts.map{|x| x.id}.include?(account.id)
- }
- end
-
- def add_account
- < at >pool = Pool.find(params[:pool])
- < at >cloud_account = CloudAccount.find(params[:cloud_account])
- require_privilege(Privilege::ACCOUNT_ADD,< at >pool)
- require_privilege(Privilege::ACCOUNT_ADD,< at >cloud_account)
- Pool.transaction do
- < at >pool.cloud_accounts << < at >cloud_account unless < at >pool.cloud_accounts.map{|x| x.id}.include?(< at >cloud_account.id)
- < at >pool.save!
- < at >pool.populate_realms([< at >cloud_account])
- end
- redirect_to :action => 'show', :id => < at >pool.id
- end
kick_condor
end
diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb
index 0754d65..0104f95 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
< at >< at > -32,25 +32,25 < at >< at > class ProvidersController < ApplicationController
def show
< at >provider = Provider.find(:first, :conditions => {:id => params[:id]})
- require_privilege(Privilege::PROVIDER_VIEW, < at >provider)
+ require_privilege(Privilege::ACTION_VIEW, < at >provider)
end
def edit
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_MODIFY)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_VIEW)
< at >provider = Provider.find(:first, :conditions => {:id => params[:id]})
- require_privilege(Privilege::PROVIDER_MODIFY, < at >provider)
+ require_privilege(Privilege::ACTION_MODIFY, < at >provider)
end
def new
- require_privilege(Privilege::PROVIDER_MODIFY)
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_MODIFY)
+ require_privilege(Privilege::ACTION_CREATE, Provider)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_MODIFY)
< at >provider = Provider.new(params[:provider])
kick_condor
end
def create
- require_privilege(Privilege::PROVIDER_MODIFY)
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_MODIFY)
+ require_privilege(Privilege::ACTION_CREATE, Provider)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_MODIFY)
< at >provider = Provider.new(params[:provider])
if params[:test_connection]
< at >< at > -70,9 +70,9 < at >< at > class ProvidersController < ApplicationController
end
def update
- require_privilege(Privilege::PROVIDER_MODIFY)
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_MODIFY)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_MODIFY)
< at >provider = Provider.find(:first, :conditions => {:id => params[:id]})
+ require_privilege(Privilege::ACTION_MODIFY, < at >provider)
previous_cloud_type = < at >provider.cloud_type
< at >provider.update_attributes(params[:provider])
< at >< at > -99,7 +99,7 < at >< at > class ProvidersController < ApplicationController
def destroy
if request.post? || request.delete?
< at >provider = Provider.find(params[:id])
- require_privilege(Privilege::PROVIDER_MODIFY, < at >provider)
+ require_privilege(Privilege::ACTION_MODIFY, < at >provider)
if < at >provider.destroy and < at >provider.destroyed?
redirect_to :action => "index"
flash[:notice] = "Provider Deleted"
< at >< at > -117,17 +117,18 < at >< at > class ProvidersController < ApplicationController
def hardware_profiles
< at >provider = Provider.find(params[:id])
< at >hardware_profiles = < at >provider.hardware_profiles
- require_privilege(Privilege::PROVIDER_VIEW, < at >provider)
+ require_privilege(Privilege::ACTION_VIEW, < at >provider)
end
def realms
< at >provider = Provider.find(params[:id])
< at >realm_names = < at >provider.realms.collect { |r| r.name }
- require_privilege(Privilege::PROVIDER_VIEW, < at >provider)
+ require_privilege(Privilege::ACTION_VIEW, < at >provider)
end
def settings
< at >provider = Provider.find(params[:id])
+ require_privilege(Privilege::ACTION_VIEW, < at >provider)
end
def list
< at >< at > -145,6 +146,6 < at >< at > class ProvidersController < ApplicationController
protected
def load_providers
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_VIEW)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_VIEW)
end
end
diff --git a/src/app/controllers/quotas_controller.rb b/src/app/controllers/quotas_controller.rb
index e9937fb..df9bb41 100644
--- a/src/app/controllers/quotas_controller.rb
+++ b/src/app/controllers/quotas_controller.rb
< at >< at > -28,7 +28,7 < at >< at > class QuotasController < ApplicationController
< at >parent_type = params[:parent_type]
< at >quota = < at >parent.quota
- require_privilege(Privilege::QUOTA_VIEW, < at >parent)
+ require_privilege(Privilege::ACTION_VIEW, Quota, < at >parent)
end
def edit
< at >< at > -38,13 +38,13 < at >< at > class QuotasController < ApplicationController
< at >quota = < at >parent.quota
- require_privilege(Privilege::QUOTA_MODIFY, < at >parent)
+ require_privilege(Privilege::ACTION_MODIFY, Quota, < at >parent)
end
def update
< at >parent = < at >parent = get_parent_object(params)
< at >parent_type = params[:parent_type]
- require_privilege(Privilege::QUOTA_MODIFY, < at >parent)
+ require_privilege(Privilege::ACTION_MODIFY, Quota, < at >parent)
< at >quota = < at >parent.quota
< at >name = get_parent_name(< at >parent, < at >parent_type)
< at >< at > -60,7 +60,7 < at >< at > class QuotasController < ApplicationController
def reset
< at >parent = < at >parent = get_parent_object(params)
< at >parent_type = params[:parent_type]
- require_privilege(Privilege::QUOTA_MODIFY, < at >parent)
+ require_privilege(Privilege::ACTION_MODIFY, Quota, < at >parent)
< at >quota = < at >parent.quota
< at >quota.maximum_running_instances = Quota::NO_LIMIT
diff --git a/src/app/controllers/resources/instances_controller.rb b/src/app/controllers/resources/instances_controller.rb
index 3bd0c45..241dbba 100644
--- a/src/app/controllers/resources/instances_controller.rb
+++ b/src/app/controllers/resources/instances_controller.rb
< at >< at > -5,7 +5,7 < at >< at > class Resources::InstancesController < ApplicationController
def new
< at >instance = Instance.new(params[:instance])
- #require_privilege(Privilege::INSTANCE_MODIFY, < at >instance.pool) if < at >instance.pool
+ #require_privilege(Privilege::ACTION_CREATE, Instance, < at >instance.pool) if < at >instance.pool
unless < at >instance.template
redirect_to select_template_resources_instances_path
< at >< at > -36,7 +36,7 < at >< at > class Resources::InstancesController < ApplicationController
< at >instance.owner = current_user
begin
- require_privilege(Privilege::INSTANCE_MODIFY,
+ require_privilege(Privilege::ACTION_CREATE, Instance,
Pool.find(< at >instance.pool_id))
free_quota = Quota.can_start_instance?(< at >instance, nil)
< at >instance.transaction do
< at >< at > -120,11 +120,11 < at >< at > class Resources::InstancesController < ApplicationController
def load_instance
< at >instance = Instance.find((params[:id] || []).first)
- require_privilege(Privilege::INSTANCE_CONTROL,< at >instance.pool)
+ require_privilege(Privilege::ACTION_USE,< at >instance)
end
def init_new_instance_attrs
- < at >pools = Pool.list_for_user(< at >current_user, Privilege::INSTANCE_MODIFY)
+ < at >pools = Pool.list_for_user(< at >current_user, Privilege::ACTION_MODIFY, :target_type => Instance)
< at >realms = Realm.find(:all, :conditions => { :provider_id => nil })
< at >hardware_profiles = HardwareProfile.all(
:include => :architecture,
< at >< at > -145,7 +145,7 < at >< at > class Resources::InstancesController < ApplicationController
{:name => 'CREATED BY', :sort_attr => 'users.last_name'},
]
- pools = Pool.list_for_user(< at >current_user, Privilege::INSTANCE_MODIFY)
+ pools = Pool.list_for_user(< at >current_user, Privilege::ACTION_MODIFY, :target_type => Instance)
< at >instances = Instance.all(
:include => [:template, :owner],
:conditions => {:pool_id => pools},
diff --git a/src/app/controllers/resources/pools_controller.rb b/src/app/controllers/resources/pools_controller.rb
index ffd1f55..3205da9 100644
--- a/src/app/controllers/resources/pools_controller.rb
+++ b/src/app/controllers/resources/pools_controller.rb
< at >< at > -18,6 +18,7 < at >< at > class Resources::PoolsController < ApplicationController
def show
< at >pool = Pool.find(params[:id])
+ require_privilege(Privilege::ACTION_VIEW, < at >pool)
< at >url_params = params.clone
< at >tab_captions = ['Properties', 'Deployments', 'Instances', 'History', 'Permissions']
< at >details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab]
< at >< at > -33,12 +34,12 < at >< at > class Resources::PoolsController < ApplicationController
end
def new
- require_privilege(Privilege::POOL_MODIFY)
+ require_privilege(Privilege::ACTION_CREATE, Pool)
< at >pool = Pool.new
end
def create
- require_privilege(Privilege::POOL_MODIFY)
+ require_privilege(Privilege::ACTION_CREATE, Pool)
< at >pool = Pool.new(params[:pool])
quota = Quota.new
< at >< at > -55,15 +56,13 < at >< at > class Resources::PoolsController < ApplicationController
end
def edit
- require_privilege(Privilege::POOL_MODIFY)
-
< at >pool = Pool.find(params[:id])
+ require_privilege(Privilege::ACTION_MODIFY, < at >pool)
end
def update
- require_privilege(Privilege::POOL_MODIFY)
-
< at >pool = Pool.find(params[:id])
+ require_privilege(Privilege::ACTION_MODIFY, < at >pool)
if < at >pool.update_attributes(params[:pool])
flash[:notice] = "Pool updated."
redirect_to :action => 'show', :id => < at >pool.id
< at >< at > -73,7 +72,9 < at >< at > class Resources::PoolsController < ApplicationController
end
def multi_destroy
- Pool.destroy(params[:pools_selected])
+ Pool.find(params[:pools_selected]).each do |pool|
+ pool.destroy if check_privilege(Privilege::ACTION_MODIFY, pool)
+ end
redirect_to resources_pools_url
end
diff --git a/src/app/controllers/settings_controller.rb b/src/app/controllers/settings_controller.rb
index ae20e12..0166e71 100644
--- a/src/app/controllers/settings_controller.rb
+++ b/src/app/controllers/settings_controller.rb
< at >< at > -31,22 +31,16 < at >< at > class SettingsController < ApplicationController
end
def index
- < at >providers = Provider.list_for_user(< at >current_user, Privilege::PROVIDER_VIEW)
+ < at >providers = Provider.list_for_user(< at >current_user, Privilege::ACTION_VIEW)
end
def self_service
- if !is_admin?
- raise PermissionError.new('You have insufficient privileges to perform action.')
- return
- end
+ require_privilege(Privilege::ACTION_MODIFY)
< at >self_service_default_quota = MetadataObject.lookup(SELF_SERVICE_DEFAULT_QUOTA)
end
def general_settings
- if !is_admin?
- raise PermissionError.new('You have insufficient privileges to perform action.')
- return
- end
+ require_privilege(Privilege::ACTION_MODIFY)
end
def update
< at >< at > -76,9 +70,4 < at >< at > class SettingsController < ApplicationController
redirect_to :action => 'self_service'
end
- private
- def is_admin?
- is_admin = < at >current_user.permissions.collect { |p| p.role }.find { |r| r.name == "Administrator" }
- return is_admin == nil ? false : true
- end
end
diff --git a/src/app/controllers/templates_controller.rb b/src/app/controllers/templates_controller.rb
index 403e6c3..e19c8e6 100644
--- a/src/app/controllers/templates_controller.rb
+++ b/src/app/controllers/templates_controller.rb
< at >< at > -2,7 +2,6 < at >< at > require 'util/repository_manager'
class TemplatesController < ApplicationController
before_filter :require_user
- before_filter :check_permission, :except => :index
layout :layout
def layout
< at >< at > -14,13 +13,10 < at >< at > class TemplatesController < ApplicationController
end
def index
- # TODO: add template permission check
- require_privilege(Privilege::IMAGE_VIEW)
- < at >templates = Template.find(
- :all,
- :include => :images,
- :order => get_order('name')
- )
+ < at >templates = Template.list_for_user(current_user,
+ Privilege::ACTION_VIEW,
+ :include => :images,
+ :order => get_order('name'))
end
def index_action
< at >< at > -81,6 +77,7 < at >< at > class TemplatesController < ApplicationController
end
def new
+ check_create_permission
# can't use < at >template variable - is used by compass (or something other)
< at >tpl = Template.new(params[:tpl])
< at >repository_manager = RepositoryManager.new(:repositories => params[:repository] || < at >tpl.platform)
< at >< at > -91,12 +88,14 < at >< at > class TemplatesController < ApplicationController
def edit
< at >tpl = Template.find(params[:id])
+ check_edit_permission
< at >tpl.attributes = params[:tpl] unless params[:tpl].blank?
< at >repository_manager = RepositoryManager.new(:repositories => params[:repository] || < at >tpl.platform)
render :action => :edit
end
def create
+ check_create_permission
< at >tpl = Template.new(params[:tpl])
< at >tpl.packages = params[:packages]
if < at >tpl.save
< at >< at > -112,6 +111,7 < at >< at > class TemplatesController < ApplicationController
def update
< at >tpl = Template.find(params[:id])
< at >tpl.packages = []
+ check_edit_permission
if < at >tpl.update_attributes(params[:tpl])
< at >tpl.set_complete
< at >< at > -163,7 +163,13 < at >< at > class TemplatesController < ApplicationController
end
def managed_content
- < at >tpl = params[:template_id].blank? ? Template.new : Template.find(params[:template_id])
+ if params[:template_id].blank?
+ < at >tpl = Template.new
+ check_create_permission
+ else
+ < at >tpl = Template.find(params[:template_id])
+ check_edit_permission
+ end
< at >tpl.add_software(params[:packages].to_a + params[:selected_packages].to_a,
params[:groups].to_a + params[:selected_groups].to_a)
render :layout => false
< at >< at > -176,9 +182,11 < at >< at > class TemplatesController < ApplicationController
else
errs = {}
Template.find(ids).each do |t|
- t.destroy
- unless t.destroyed?
- errs[t.name] = t.errors.full_messages.join(". ")
+ if check_permission(Privilege::ACTION_MODIFY, t)
+ t.destroy
+ errs[t.name] = t.errors.full_messages.join(". ") unless t.destroyed?
+ else
+ errs[t.name] = "You don't have permission to delete #{t.name}"
end
end
if errs.empty?
< at >< at > -191,16 +199,24 < at >< at > class TemplatesController < ApplicationController
end
def assembly
+ # FIXME: do we need perm check here?
end
def deployment_definition
+ # FIXME: do we need perm check here?
< at >all_targets = Image.available_targets
end
private
def set_package_vars(set_all = false)
- < at >tpl = params[:id].blank? ? Template.new : Template.find(params[:id])
+ if params[:id].blank?
+ < at >tpl = Template.new
+ check_create_permission
+ else
+ < at >tpl = Template.find(params[:id])
+ check_edit_permission
+ end
< at >tpl.attributes = params[:tpl] unless params[:tpl].nil?
< at >repository_manager = RepositoryManager.new(:repositories => params[:repository] || < at >tpl.platform)
< at >groups = < at >repository_manager.groups
< at >< at > -222,8 +238,12 < at >< at > class TemplatesController < ApplicationController
flash.now[:error][:failures].merge!(errs)
end
- def check_permission
- require_privilege(Privilege::IMAGE_MODIFY)
+ def check_create_permission
+ require_privilege(Privilege::ACTION_CREATE, Template)
+ end
+
+ def check_edit_permission
+ require_privilege(Privilege::ACTION_MODIFY, < at >tpl)
end
def get_selected_id
diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb
index 0e3220f..b462893 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
< at >< at > -24,12 +24,13 < at >< at > class UsersController < ApplicationController
before_filter :current_user
def new
+ require_privilege(Privilege::ACTION_CREATE, User) unless current_user.nil?
< at >user = User.new
< at >user.quota = Quota.new
end
def create
- require_privilege(Privilege::USER_MODIFY) unless current_user.nil?
+ require_privilege(Privilege::ACTION_CREATE, User) unless current_user.nil?
< at >user = User.new(params[:user])
if params[:commit] == "Reset"
< at >< at > -58,39 +59,26 < at >< at > class UsersController < ApplicationController
else
< at >user = current_user
end
+ require_privilege(Privilege::ACTION_VIEW, User) unless current_user == < at >user
< at >quota_resources = < at >user.quota.quota_resources()
end
def edit
- < at >user = params[:id] ? User.find(params[:id]) : < at >current_user
-
- if < at >user
- if < at >user != < at >current_user
- if !BasePermissionObject.general_permission_scope.can_modify_users(< at >current_user)
- flash[:notice] = "Invalid Permission to perform this operation"
- redirect_to users_path
- end
- end
- end
+ < at >user = params[:id] ? User.find(params[:id]) : current_user
+ require_privilege(Privilege::ACTION_MODIFY, User) unless current_user == < at >user
end
def update
< at >user = params[:user][:id] ? User.find(params[:user][:id]) : < at >current_user
+ require_privilege(Privilege::ACTION_MODIFY, User) unless current_user == < at >user
if params[:commit] == "Save"
if < at >user
- has_users_modify = BasePermissionObject.general_permission_scope.can_modify_users(< at >current_user)
- if < at >user != < at >current_user
- if !has_users_modify
- flash[:notice] = "Invalid Permission to perform this operation"
- redirect_to :dashboard
- end
- end
if < at >user.update_attributes(params[:user])
flash[:notice] = "User updated!"
- if has_users_modify
- redirect_to users_path
- else
+ if < at >user == current_user
redirect_to :dashboard
+ else
+ redirect_to users_path
end
else
render :action => :edit
< at >< at > -102,21 +90,17 < at >< at > class UsersController < ApplicationController
end
def index
- if < at >current_user.permissions.collect { |p| p.role }.find { |r| r.name == "Administrator" }
+ require_privilege(Privilege::ACTION_VIEW, User)
+ < at >users = User.all
+ sort_order = params[:sort_by].nil? ? "login" : params[:sort_by]
+ if sort_order == "percentage_quota_used"
< at >users = User.all
- sort_order = params[:sort_by].nil? ? "login" : params[:sort_by]
- if sort_order == "percentage_quota_used"
- < at >users = User.all
- < at >users.sort! {|x,y| y.quota.percentage_used <=> x.quota.percentage_used }
- elsif sort_order == "quota"
- < at >users = User.all
- < at >users.sort! {|x,y| (x.quota.maximum_running_instances and y.quota.maximum_running_instances) ? x.quota.maximum_running_instances <=> y.quota.maximum_running_instances : (x ? 1 : -1) }
- else
- < at >users = User.find(:all, :order => sort_order)
- end
+ < at >users.sort! {|x,y| y.quota.percentage_used <=> x.quota.percentage_used }
+ elsif sort_order == "quota"
+ < at >users = User.all
+ < at >users.sort! {|x,y| (x.quota.maximum_running_instances and y.quota.maximum_running_instances) ? x.quota.maximum_running_instances <=> y.quota.maximum_running_instances : (x ? 1 : -1) }
else
- flash[:notice] = "Invalid Permission to perform this operation"
- redirect_to :dashboard
+ < at >users = User.find(:all, :order => sort_order)
end
end
< at >< at > -138,22 +122,19 < at >< at > class UsersController < ApplicationController
end
def destroy
- if < at >current_user.permissions.collect { |p| p.role }.find { |r| r.name == "Administrator" }
- if request.post? || request.delete?
- < at >user = User.find(params[:id])
- if < at >user == < at >current_user
- flash[:notice] = "Can not delete the currently logged in user!"
- elsif < at >user.destroy
- flash[:notice] = "User Deleted"
- else
- flash[:error] = {
- :summary => "Failed to delete User",
- :failures => < at >user.errors.full_messages,
- }
- end
+ require_privilege(Privilege::ACTION_MODIFY, User)
+ if request.post? || request.delete?
+ < at >user = User.find(params[:id])
+ if < at >user == < at >current_user
+ flash[:notice] = "Can not delete the currently logged in user!"
+ elsif < at >user.destroy
+ flash[:notice] = "User Deleted"
+ else
+ flash[:error] = {
+ :summary => "Failed to delete User",
+ :failures => < at >user.errors.full_messages,
+ }
end
- else
- flash[:notice] = "Invalid Permission to perform this operation"
end
redirect_to users_path
end
diff --git a/src/app/models/cloud_account.rb b/src/app/models/cloud_account.rb
index e4fe6c6..ee07b8d 100644
--- a/src/app/models/cloud_account.rb
+++ b/src/app/models/cloud_account.rb
< at >< at > -66,6 +66,27 < at >< at > class CloudAccount < ActiveRecord::Base
before_destroy :destroyable?
before_validation :read_x509_files
+ def object_list
+ super << provider
+ end
+ class << self
+ alias orig_list_for_user_include list_for_user_include
+ alias orig_list_for_user_conditions list_for_user_conditions
+ end
+
+ def self.list_for_user_include
+ includes = orig_list_for_user_include
+ includes << { :provider => {:permissions => {:role => :privileges}}}
+ includes
+ end
+
+ def self.list_for_user_conditions
+ "(#{orig_list_for_user_conditions}) or
+ (permissions_providers.user_id=:user and
+ privileges_roles.target_type=:target_type and
+ privileges_roles.action=:action)"
+ end
+
def destroyable?
instances.empty?
end
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index 8573c5a..5aa500d 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
< at >< at > -36,6 +36,10 < at >< at > class Instance < ActiveRecord::Base
belongs_to :instance_key
belongs_to :instance_hwp
+ has_many :permissions, :as => :permission_object, :dependent => :destroy,
+ :include => [:role],
+ :order => "permissions.id ASC"
+
validates_presence_of :pool_id
validates_presence_of :hardware_profile_id
validates_presence_of :template_id
< at >< at > -66,6 +70,27 < at >< at > class Instance < ActiveRecord::Base
validates_inclusion_of :state,
:in => STATES
+ def object_list
+ super << pool
+ end
+ class << self
+ alias orig_list_for_user_include list_for_user_include
+ alias orig_list_for_user_conditions list_for_user_conditions
+ end
+
+ def self.list_for_user_include
+ includes = orig_list_for_user_include
+ includes << { :pool => {:permissions => {:role => :privileges}}}
+ includes
+ end
+
+ def self.list_for_user_conditions
+ "(#{orig_list_for_user_conditions}) or
+ (permissions_pools.user_id=:user and
+ privileges_roles.target_type=:target_type and
+ privileges_roles.action=:action)"
+ end
+
def get_action_list(user=nil)
# return empty list rather than nil
# FIXME: not handling pending state now -- only current state
< at >< at > -142,7 +167,7 < at >< at > class Instance < ActiveRecord::Base
}
instances = []
- pools = Pool.list_for_user(user, Privilege::INSTANCE_VIEW)
+ pools = Pool.list_for_user(user, Privilege::ACTION_VIEW, Instance)
pools.each{|pool| pool.instances.each {|i| instances << i}}
instances.each do |i|
if i.state == Instance::STATE_RUNNING
diff --git a/src/app/models/permission.rb b/src/app/models/permission.rb
index 349b6a7..22b228a 100644
--- a/src/app/models/permission.rb
+++ b/src/app/models/permission.rb
< at >< at > -29,12 +29,18 < at >< at > class Permission < ActiveRecord::Base
belongs_to :permission_object, :polymorphic => true
# type-specific associations
+ belongs_to :pool_family, :class_name => "PoolFamily",
+ :foreign_key => "permission_object_id"
belongs_to :pool, :class_name => "Pool",
:foreign_key => "permission_object_id"
+ belongs_to :instance, :class_name => "Instance",
+ :foreign_key => "permission_object_id"
belongs_to :provider, :class_name => "Provider",
:foreign_key => "permission_object_id"
belongs_to :cloud_account, :class_name => "CloudAccount",
:foreign_key => "permission_object_id"
+ belongs_to :template, :class_name => "Template",
+ :foreign_key => "permission_object_id"
belongs_to :base_permission_object, :class_name => "BasePermissionObject",
:foreign_key => "permission_object_id"
diff --git a/src/app/models/permissioned_object.rb b/src/app/models/permissioned_object.rb
index 24aebe0..34efec8 100644
--- a/src/app/models/permissioned_object.rb
+++ b/src/app/models/permissioned_object.rb
< at >< at > -17,91 +17,77 < at >< at >
# MA 02110-1301, USA. A copy of the GNU General Public License is
# also available at http://www.gnu.org/copyleft/gpl.html.
module PermissionedObject
- def can_view_perms(user)
- has_privilege(user, Privilege::PERM_VIEW)
- end
- def can_set_perms(user)
- has_privilege(user, Privilege::PERM_SET)
- end
-
- def can_view_instances(user)
- has_privilege(user, Privilege::INSTANCE_VIEW)
- end
- def can_modify_instances(user)
- has_privilege(user, Privilege::INSTANCE_MODIFY)
- end
- def can_control_instances(user)
- has_privilege(user, Privilege::INSTANCE_CONTROL)
- end
-
- def can_view_stats(user)
- has_privilege(user, Privilege::STATS_VIEW)
- end
-
- def can_view_accounts(user)
- has_privilege(user, Privilege::ACCOUNT_VIEW)
- end
- def can_modify_accounts(user)
- has_privilege(user, Privilege::ACCOUNT_MODIFY)
- end
-
- def can_view_pools(user)
- has_privilege(user, Privilege::POOL_VIEW)
- end
- def can_modify_pools(user)
- has_privilege(user, Privilege::POOL_MODIFY)
- end
- def can_view_quotas(user)
- has_privilege(user, Privilege::QUOTA_VIEW)
- end
- def can_modify_quotas(user)
- has_privilege(user, Privilege::QUOTA_MODIFY)
- end
-
- def can_view_providers(user)
- has_privilege(user, Privilege::PROVIDER_VIEW)
- end
- def can_modify_providers(user)
- has_privilege(user, Privilege::PROVIDER_MODIFY)
- end
-
- def can_view_users(user)
- has_privilege(user, Privilege::USER_VIEW)
- end
- def can_modify_users(user)
- has_privilege(user, Privilege::USER_MODIFY)
- end
-
- def can_view_images(user)
- has_privilege(user, Privilege::IMAGE_VIEW)
- end
- def can_modify_images(user)
- has_privilege(user, Privilege::IMAGE_MODIFY)
+ def has_privilege(user, action, target_type=nil)
+ return false if user.nil? or action.nil?
+ target_type = self.class.default_privilege_target_type if target_type.nil?
+ object_list.each do |obj|
+ return true if obj.permissions.find(:first,
+ :include => [:role => :privileges],
+ :conditions =>
+ ["permissions.user_id=:user and
+ privileges.target_type=:target_type and
+ privileges.action=:action",
+ { :user => user.id,
+ :target_type => target_type.name,
+ :action => action}])
+ end
+ return false
end
- def has_privilege(user, privilege)
- return false if user.nil?
- permissions.find(:first, :include => [:role => :privileges],
- :conditions => ["permissions.user_id=:user and
- privileges.name=:priv",
- { :user => user.id,
- :priv => privilege }])
+ # Returns the list of objects to check for permissions on -- by default
+ # this object plus the Base permission object
+ def object_list
+ [self, BasePermissionObject.general_permission_scope]
end
# Any methods here will be able to use the context of the
# ActiveRecord model the module is included in.
def self.included(base)
base.class_eval do
- def self.list_for_user(user, privilege)
- if BasePermissionObject.general_permission_scope.has_privilege(user, privilege)
- all
+ def self.default_privilege_target_type
+ self.name.constantize
+ end
+ def self.list_for_user_include
+ [{:permissions => {:role => :privileges}}]
+ end
+ def self.list_for_user_conditions
+ "permissions.user_id=:user and
+ privileges.target_type=:target_type and
+ privileges.action=:action"
+ end
+ # :conditions in hash must match form ["foo=:param and ...", {:param => value}]
+ def self.list_for_user(user, action, find_hash={})
+ target_type = find_hash.fetch(:target_type, self.default_privilege_target_type)
+ query_include = find_hash[:include]
+ query_order = find_hash[:order]
+ query_conditions = find_hash[:conditions]
+ return [] if user.nil? or action.nil? or target_type.nil?
+ if BasePermissionObject.general_permission_scope.has_privilege(user,
+ action,
+ target_type)
+ find(:all, :include => query_include,
+ :order => query_order,
+ :conditions => query_conditions)
else
- find(:all, :include => {:permissions => {:role => :privileges}},
- :conditions => ["permissions.user_id=:user and
- privileges.name=:priv",
- {:user => user.id,
- :priv => privilege }])
+ include_clause = self.list_for_user_include
+ if query_include.is_a?(Array)
+ include_clause += query_include
+ elsif !query_include.nil?
+ include_clause << query_include
+ end
+ conditions_hash = {:user => user.id,
+ :target_type => target_type.name,
+ :action => action}
+ if query_conditions.nil?
+ conditions_str = self.list_for_user_conditions
+ else
+ conditions_str = "(#{self.list_for_user_include}) and (#{query_conditions[0]})"
+ conditions_hash.merge!(query_conditions[1]) { |key, h1, h2| h1 }
+ end
+ find(:all, :include => include_clause,
+ :conditions => [conditions_str, conditions_hash],
+ :order => query_order)
end
end
end
diff --git a/src/app/models/privilege.rb b/src/app/models/privilege.rb
index 552beef..6456d66 100644
--- a/src/app/models/privilege.rb
+++ b/src/app/models/privilege.rb
< at >< at > -18,66 +18,122 < at >< at >
# also available at http://www.gnu.org/copyleft/gpl.html.
class Privilege < ActiveRecord::Base
- has_and_belongs_to_many :roles
- validates_presence_of :name
- validates_uniqueness_of :name
+ ACTION_PERM_SET = "set_perms" # can create/modify/delete permission
+ # records on this object
+ ACTION_PERM_VIEW = "view_perms" # can view permission records on this
+ # object
+ ACTION_CREATE = "create" # can create objects of this type here
+ ACTION_MODIFY = "modify" # can modify objects of this type here
+ ACTION_VIEW = "view" # can view objects of this type here
+ ACTION_USE = "use" # can use objects of this type here
+ # the meaning of 'use' is type-specific:
+ # Template: add this template to an assembly
+ # Assembly: add this assembly to a deployable
+ # Deployable: choose this deployable to launch
+ # Instance: may perform actions on this instance
+ # Realm: may map this realm
+ # CloudAccount: May add this account to PoolFamily
- #default privileges
- PERM_SET = "set_perms" # can create/modify/delete permission
- # records on this object
- PERM_VIEW = "view_perms" # can view permission records on this
- # object
- # instance privileges normally checked at the pool level, although
- # instance-specific overrides could be a future enhancement.
- INSTANCE_MODIFY = "instance_modify" # can create, modify, delete, or
- # control (start, stop, etc) instances
- INSTANCE_CONTROL = "instance_control" # can control (start, stop, etc)
- # instances
- INSTANCE_VIEW = "instance_view" # can view instance metadata
- # do we need a separate "connect" privilege?
+ ACTIONS = [ ACTION_CREATE, ACTION_MODIFY, ACTION_USE, ACTION_VIEW,
+ ACTION_PERM_SET, ACTION_PERM_VIEW]
+ TYPES = { BasePermissionObject => [ACTION_MODIFY, ACTION_PERM_SET, ACTION_PERM_VIEW],
+ Template => ACTIONS,
+ Pool => ACTIONS - [ACTION_USE],
+ PoolFamily => ACTIONS - [ACTION_USE],
+ Instance => ACTIONS,
+ Quota => [ACTION_VIEW, ACTION_MODIFY],
+ HardwareProfile => ACTIONS - [ACTION_USE, ACTION_VIEW],
+ Realm => ACTIONS - [ACTION_VIEW],
+ Provider => ACTIONS - [ACTION_USE],
+ CloudAccount => ACTIONS,
+ User => [ ACTION_CREATE, ACTION_MODIFY, ACTION_VIEW] }
- # stats privileges normally checked at the pool level, although
- # instance-specific overrides could be a future enhancement.
- STATS_VIEW = "stats_view" # can view monitoring data for
- # instances
+ belongs_to :role
+ validates_presence_of :role_id
+ validates_presence_of :target_type
+ validates_presence_of :action
+ validates_uniqueness_of :action, :scope => [:target_type, :role_id]
- # to create(i.e. import) an account on a provider needs ACCOUNT_MODIFY on the
- # provider.
- ACCOUNT_MODIFY = "account_modify" # can create or modify cloud accounts
- ACCOUNT_VIEW = "account_view" # can view cloud accounts
+ # notes on available privilege action/type pairs. Format is:
+ # Type Scope
+ # Action Notes (action defined on scope above unless specified)
+ #
+ # BasePermissionObject the base perm object
+ # modify Can modify system settings, etc.
+ # view_perms Can view permissions
+ # set_perms Can set permissions
+ #
+ # Template This template/assembly/deployable or all T/A/D in this TADCollection
+ # view Can view
+ # use Can assign T/A/D to TAD collection;
+ # (if template) can add to assembly or can use to launch instance
+ # (if assembly) can add to deployable
+ # (if deployable) can use to launch deployment
+ # (if TAD Collection) not used
+ # modify Can modify
+ # create Can create (on BasePermissionObject)
+ # view_perms Can view permissions
+ # set_perms Can set permissions
+ #
+ # Pool This pool
+ # view Can view
+ # modify Can modify
+ # create Can create (on BasePermissionObject)
+ # view_perms Can view permissions
+ # set_perms Can set permissions
+ #
+ # PoolFamily This PoolFamily
+ # view Can view
+ # modify Can modify
+ # create Can create (on BasePermissionObject)
+ # view_perms Can view permissions
+ # set_perms Can set permissions
+ #
+ # Instance This Instance or instances within this Pool
+ # view Can view
+ # use Can perform lifecycle actions on and/or view console
+ # modify Can modify
+ # create Can create (within this Pool)
+ # view_perms Can view permissions
+ # set_perms Can set permissions (or can set instance permissions on this pool)
+ #
+ # Quota The Pool/CloudAccount/PoolFamily/User assigned the quota
+ # view Can view quota on this obj
+ # modify Can edit quota on this obj
+ #
+ # HardwareProfile This HardwareProfile
+ # modify (for Aeolus HWPs) Can modify
+ # create Can create (on BasePermissionObject)
+ # view_perms Can view permissions
+ # set_perms Can set permissions
+ #
+ # Realm This Realm (or realms within this provider)
+ # use (for provider Realm) can map realm or provider to aeolus realm
+ # modify (for Aeolus realms) Can modify
+ # create Can create (within this Pool)
+ # view_perms Can view permissions
+ # set_perms Can set permissions
+ #
+ # Provider This Provider
+ # view Can view
+ # modify Can modify
+ # create Can create (on BasePermissionObject)
+ # view_perms Can view permissions
+ # set_perms Can set permissions
+ #
+ # CloudAccount This CloudAccount
+ # view Can view
+ # use Can map to PoolFamily
+ # modify Can modify
+ # create Can create (within this Provider)
+ # view_perms Can view permissions
+ # set_perms Can set permissions
+ #
+ # User This User (set on BasePermissionObject)
+ # view Can view
+ # modify Can modify
+ # create Can create
- POOL_MODIFY = "pool_modify" # can create or modify a pool
- POOL_VIEW = "pool_view" # can view a pool
-
- # quota privileges normally checked at the pool or account level,
- # depending on which quota level we're dealing with
- QUOTA_MODIFY = "quota_modify" # can create or modify a quota
- QUOTA_VIEW = "quota_view" # can view a quota
-
- # provider privileges normally checked at the provider level, although
- # 'new provider' action requires this privilege at the SystemPermission level
- PROVIDER_MODIFY = "provider_modify" # can create or modify a provider
- PROVIDER_VIEW = "provider_view" # can view a provider
-
- # normally checked at the SystemPermission level
- USER_MODIFY = "user_modify" # can create a new user (other than
- # self-registration) or modify another
- # user's metadata (for admin-level
- # actions)
- USER_VIEW = "user_view" # can view a user's profile data
-
- IMAGE_VIEW = "image_view" # can view existing images (templates)
- IMAGE_MODIFY = "image_modify" # can create or modify images (templates)
-
- FULL_PRIVILEGE_LIST = [PERM_SET, PERM_VIEW,
- INSTANCE_MODIFY, INSTANCE_CONTROL, INSTANCE_VIEW,
- STATS_VIEW,
- ACCOUNT_MODIFY, ACCOUNT_VIEW,
- POOL_MODIFY, POOL_VIEW,
- QUOTA_MODIFY, QUOTA_VIEW,
- PROVIDER_MODIFY, PROVIDER_VIEW,
- USER_MODIFY, USER_VIEW,
- IMAGE_VIEW, IMAGE_MODIFY]
end
diff --git a/src/app/models/role.rb b/src/app/models/role.rb
index db4a9ac..300dad8 100644
--- a/src/app/models/role.rb
+++ b/src/app/models/role.rb
< at >< at > -18,10 +18,13 < at >< at >
# also available at http://www.gnu.org/copyleft/gpl.html.
class Role < ActiveRecord::Base
- has_many :permissions
- has_and_belongs_to_many :privileges, :uniq => true
+ has_many :permissions, :dependent => :destroy
+ has_many :privileges, :dependent => :destroy
+ validates_presence_of :scope
validates_presence_of :name
validates_uniqueness_of :name
+ validates_associated :privileges
+
end
diff --git a/src/app/models/template.rb b/src/app/models/template.rb
index d545f9b..bff586d 100644
--- a/src/app/models/template.rb
+++ b/src/app/models/template.rb
< at >< at > -2,12 +2,17 < at >< at > require 'util/image_descriptor_xml'
require 'typhoeus'
class Template < ActiveRecord::Base
+ include PermissionedObject
has_many :images, :dependent => :destroy
has_many :instances
before_validation :generate_uuid
before_save :update_xml
before_destroy :no_instances?
+ has_many :permissions, :as => :permission_object, :dependent => :destroy,
+ :include => [:role],
+ :order => "permissions.id ASC"
+
WAREHOUSE_CONFIG = YAML.load_file("#{RAILS_ROOT}/config/image_warehouse.yml")
validates_presence_of :uuid
diff --git a/src/app/services/application_service.rb b/src/app/services/application_service.rb
index 8161718..079c200 100644
--- a/src/app/services/application_service.rb
+++ b/src/app/services/application_service.rb
< at >< at > -40,19 +40,34 < at >< at > module ApplicationService
# < at >current_user must be defined
- def check_privilege(privilege, perm_obj)
- ((perm_obj and perm_obj.has_privilege(current_user, privilege)) or
- BasePermissionObject.general_permission_scope.has_privilege(current_user,
- privilege))
+ def check_privilege(action, *type_and_perm_obj)
+ target_type = nil
+ perm_obj = nil
+ type_and_perm_obj.each do |obj|
+ target_type=obj if obj.class==Class
+ perm_obj=obj if obj.is_a?(ActiveRecord::Base)
+ end
+ perm_obj=< at >perm_obj if perm_obj.nil?
+ perm_obj=BasePermissionObject.general_permission_scope if perm_obj.nil?
+ perm_obj.has_privilege(current_user, action, target_type)
end
- def authorized?(privilege, perm_obj=nil)
+ # Require a given privilege level to view this page
+ # 1. action is always required -- what action is being done (from Privilege::ACTIONS)
+ # 2. perm_obj is optional -- This is the resource on which to look for permission
+ # records. If omitted, check for site-wide permissions on BasePermissionObject
+ # 3. type is also optional -- if omitted it's taken from perm_obj.
+ # For example, if action is 'view', perm_obj is a Pool and type is omitted,
+ # then check for current user's "view pool" permission on this pool.
+ # if action is 'view', perm_obj is a Pool and type is Quota,
+ # then check for current user's "view quota" permission on this pool.
+ def require_privilege(action, *type_and_perm_obj)
+ perm_obj = nil
+ type_and_perm_obj.each do |obj|
+ perm_obj=obj if obj.is_a?(ActiveRecord::Base)
+ end
< at >perm_obj = perm_obj
- check_privilege(privilege,< at >perm_obj)
- end
-
- def require_privilege(privilege, perm_obj=nil)
- unless authorized?(privilege, perm_obj)
+ unless check_privilege(action, *type_and_perm_obj)
raise PermissionError.new(
'You have insufficient privileges to perform action.')
end
diff --git a/src/app/views/admin/users/_form.haml b/src/app/views/admin/users/_form.haml
index 3fdf33f..2d0945e 100644
--- a/src/app/views/admin/users/_form.haml
+++ b/src/app/views/admin/users/_form.haml
< at >< at > -8,7 +8,7 < at >< at >
%fieldset
= form.label :password_confirmation, t(:confirm_password), :class => "grid_3 alpha"
= form.password_field :password_confirmation, :class => "grid_5"
--if has_user_modify?
+-if check_privilege(Privilege::ACTION_MODIFY, User)
%fieldset.clear
= form.label :user_status, "User Status:", :class => "alpha grid_3"
.grid_5
< at >< at > -25,7 +25,7 < at >< at >
%fieldset.clear
= form.label :email, t(:email), :class => "alpha grid_3"
= form.text_field :email, :class => "grid_5"
--if has_user_modify?
+-if check_privilege(Privilege::ACTION_MODIFY, User)
%h3.grid_16 User Treatment
%fieldset.clearfix
= label_tag 'apply_treatment', t(:apply_treatment), :class => "alpha grid_3"
diff --git a/src/app/views/admin/users/edit.haml b/src/app/views/admin/users/edit.haml
index a367fec..69319e9 100644
--- a/src/app/views/admin/users/edit.haml
+++ b/src/app/views/admin/users/edit.haml
< at >< at > -1,4 +1,4 < at >< at >
</pre>Scott Seago2011-01-19T06:14:34InstanceKey patch (rev. 3)
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3706
<pre>Fixed one spec test, which for some reason passes for me but not for Tomas.
</pre>jprovazn-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org2011-01-13T14:34:15[PATCH aeolus 1/2] Added Cucumber Tests forProvider Search
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3702
<pre>From: Martyn Taylor <mtaylor-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
---
src/features/provider.feature | 22 ++++++++++++++++++++++
src/features/step_definitions/provider_steps.rb | 2 +-
2 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/features/provider.feature b/src/features/provider.feature
index 9e6f398..08704dd 100644
--- a/src/features/provider.feature
+++ b/src/features/provider.feature
< at >< at > -73,3 +73,25 < at >< at > Feature: Manage Providers
And there should not be any hardware profiles
And there should not be a cloud account
And there should not be a realm
+
+ Scenario: Search for hardware profiles
+ Given there are these providers:
+ | name | url |
+ | Test | http://testprovider.com/api |
+ | Mock | http://mockprovider.com/api |
+ | Other | http://sometesturl.com/api |
+ And I am on the admin providers page
+ Then I should see the following:
+ | Test | http://testprovider.com/api |
+ | Mock | http://mockprovider.com/ap |
+ | Other | http://sometesturl.com/api |
+ When I fill in "q" with "test"
+ And I press "Search"
+ Then I should see "Test"
+ And I should see "Other"
+ And I should not see "Mock"
+ When I fill in "q" with "Mock"
+ And I press "Search"
+ Then I should see "Mock"
+ And I should not see "Test"
+ And I should not see "Other"
\ No newline at end of file
diff --git a/src/features/step_definitions/provider_steps.rb b/src/features/step_definitions/provider_steps.rb
index 2673ae8..bc56276 100644
--- a/src/features/step_definitions/provider_steps.rb
+++ b/src/features/step_definitions/provider_steps.rb
< at >< at > -32,7 +32,7 < at >< at > end
Given /^there are these providers:$/ do |table|
table.hashes.each do |hash|
- Factory(:mock_provider, :name => hash['name'])
+ hash['url'].nil? ? Factory(:mock_provider, :name => hash['name']) : Factory(:mock_provider, :name => hash['name'], :url => hash['url'])
end
end
</pre>mtaylor-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org2011-01-17T17:34:25[PATCH aeolus] admin,Hardware Profiles UI for new Hardware Profile Model
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3698
<pre>From: Martyn Taylor <mtaylor-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
This patch allows users to create Hardware Profiles based on the new matching model.
N.B. Building the Hardware Profile in the HardwareProfile controller, is not very RESTy. This was a decision made to simplify the UI slightly, and create HardareProfile with breaking any validation.
---
.../admin/hardware_profiles_controller.rb | 135 +++++++++++++++++++-
src/app/models/hardware_profile.rb | 13 ++-
src/app/models/hardware_profile_property.rb | 2 +-
src/app/models/property_enum_entry.rb | 3 +
src/app/stylesheets/newui.scss | 5 +
src/app/views/admin/hardware_profiles/_form.haml | 28 ++++
src/app/views/admin/hardware_profiles/_list.haml | 35 +++---
.../_matching_provider_hardware_profiles.haml | 8 +-
.../views/admin/hardware_profiles/_properties.haml | 1 +
src/app/views/admin/hardware_profiles/create.haml | 6 +
src/app/views/admin/hardware_profiles/edit.haml | 7 +
src/app/views/admin/hardware_profiles/new.haml | 7 +
src/app/views/admin/provider_accounts/new.haml | 2 +-
src/config/routes.rb | 2 +
.../20090804135630_create_hardware_profiles.rb | 2 +-
src/features/hardware_profile.feature | 60 +++++++++
.../step_definitions/hardware_profile_steps.rb | 17 +++
src/features/support/paths.rb | 6 +
18 files changed, 310 insertions(+), 29 deletions(-)
create mode 100644 src/app/views/admin/hardware_profiles/_form.haml
create mode 100644 src/app/views/admin/hardware_profiles/create.haml
create mode 100644 src/app/views/admin/hardware_profiles/edit.haml
create mode 100644 src/app/views/admin/hardware_profiles/new.haml
diff --git a/src/app/controllers/admin/hardware_profiles_controller.rb b/src/app/controllers/admin/hardware_profiles_controller.rb
index 92edab0..f2b7e0f 100644
--- a/src/app/controllers/admin/hardware_profiles_controller.rb
+++ b/src/app/controllers/admin/hardware_profiles_controller.rb
< at >< at > -1,7 +1,10 < at >< at >
class Admin::HardwareProfilesController < ApplicationController
before_filter :require_user
before_filter :set_params_and_header, :only => [:index, :show]
- before_filter :load_hardware_profiles, :only => [:show]
+ before_filter :load_hardware_profiles, :only => [:index, :show]
+ before_filter :load_hardware_profile, :only => [:show]
+ before_filter :setup_new_hardware_profile, :only => [:new]
+ before_filter :setup_hardware_profile, :only => [:new, :create, :edit, :update]
def index
< at >params = params
< at >< at > -39,7 +42,77 < at >< at > class Admin::HardwareProfilesController < ApplicationController
end
end
+ def new
+ end
+
+ def create
+ build_hardware_profile(params[:hardware_profile])
+ if params[:commit] == 'Save'
+ if < at >hardware_profile.save!
+ redirect_to admin_hardware_profiles_path
+ else
+ params.delete :commit
+ render :action => 'create'
+ end
+ else
+ matching_provider_hardware_profiles
+ render :action => 'new'
+ end
+ end
+
+ def delete
+ end
+
+ def edit
+ unless < at >hardware_profile
+ < at >hardware_profile = HardwareProfile.find(params[:id])
+ end
+ matching_provider_hardware_profiles
+ end
+
+ def update
+ if params[:commit] == "Reset"
+ redirect_to edit_admin_hardware_profile_url(< at >hardware_profile) and return
+ end
+
+ if params[:id]
+ < at >hardware_profile = HardwareProfile.find(params[:id])
+ build_hardware_profile(params[:hardware_profile])
+ end
+
+ if params[:commit] == "Check Matches"
+ matching_provider_hardware_profiles
+ render :edit and return
+ end
+
+ unless < at >hardware_profile.save!
+ render :action => 'edit' and return
+ else
+ flash[:notice] = "Hardware Profile updated!"
+ redirect_to admin_hardware_profiles_path
+ end
+ end
+
+ def multi_destroy
+ HardwareProfile.destroy(params[:hardware_profile_selected])
+ redirect_to admin_hardware_profiles_path
+ end
+
private
+ def setup_new_hardware_profile
+ if params[:hardware_profile]
+ begin
+ < at >hardware_profile = HardwareProfile.new(remove_irrelevant_params(params[:hardware_profile]))
+ end
+ else
+ < at >hardware_profile = HardwareProfile.new(:memory => HardwareProfileProperty.new(:name => "memory", :unit => "MB"),
+ :cpu => HardwareProfileProperty.new(:name => "cpu", :unit => "count"),
+ :storage => HardwareProfileProperty.new(:name => "storage", :unit => "GB"),
+ :architecture => HardwareProfileProperty.new(:name => "architecture", :unit => "label"))
+ end
+ matching_provider_hardware_profiles
+ end
+
def properties
< at >properties_header = [
{ :name => "Name", :sort_attr => :name},
< at >< at > -63,8 +136,26 < at >< at > class Admin::HardwareProfilesController < ApplicationController
{ :name => "Storage", :sort_attr => :storage },
{ :name => "Virtual CPU", :sort_attr => :cpus}
]
- < at >matching_hwps = HardwareProfile.all(:include => "aggregator_hardware_profiles",
- :conditions => {:hardware_profile_map => { :aggregator_hardware_profile_id => params[:id] }})
+
+ begin
+ < at >matching_hwps = HardwareProfile.matching_hwps(< at >hardware_profile).map { |hwp| hwp[:hardware_profile] }
+ rescue
+ < at >matching_hwps = []
+ end
+ end
+
+ def setup_hardware_profile
+ < at >tab_captions = ['Matched Provider Hardware Profiles']
+ < at >details_tab = 'matching_provider_hardware_profiles'
+ < at >url_params = params
+ < at >header = [
+ { :name => "Name", :sort_attr => :name},
+ { :name => "Unit", :sort_attr => :unit},
+ { :name => "Kind", :sort_attr => :kind },
+ { :name => "Value (Default)", :sort_attr => :value},
+ { :name => "Enum Entries", :sort_attr => :false },
+ { :name => "Range First", :sort_attr => :range_first},
+ { :name => "Range Last", :sort_attr => :range_last }]
end
def set_params_and_header
< at >< at > -81,4 +172,42 < at >< at > class Admin::HardwareProfilesController < ApplicationController
def load_hardware_profiles
< at >hardware_profiles = HardwareProfile.all(:conditions => 'provider_id IS NULL')
end
+
+ def load_hardware_profile
+ < at >hardware_profile = HardwareProfile.find(params[:id])
+ end
+
+ def build_hardware_profile(params)
+ hwpps = [:memory_attributes, :cpu_attributes, :storage_attributes, :architecture_attributes]
+ enum_values = {}
+ hwpps.each do |attr|
+ unless params[attr][:kind] == "range"
+ params[attr].delete(:range_first)
+ params[attr].delete(:range_last)
+ end
+
+ unless params[attr][:kind] == "enum"
+ params[attr].delete(:enum)
+ else
+ enum_values[params[attr][:name]] = params[attr][:property_enum_entries].split(%r{,\s*})
+ end
+ params[attr].delete(:property_enum_entries)
+ end
+
+ < at >hardware_profile.nil? ? < at >hardware_profile = HardwareProfile.new(params) : < at >hardware_profile.update_attributes(params)
+ < at >hardware_profile.save!
+
+ # Set Property Enum Entries on enum types
+ begin
+ [< at >hardware_profile.memory, < at >hardware_profile.cpu, < at >hardware_profile.architecture, < at >hardware_profile.storage].each do |hwpp|
+ if hwpp.kind == "enum"
+ hwpp.property_enum_entries = enum_values[hwpp.name].map { |value| PropertyEnumEntry.new(:value => value) }
+ end
+ end
+ < at >hardware_profile.save!
+ rescue => e
+ < at >hardware_profile.delete!
+ raise e
+ end
+ end
end
diff --git a/src/app/models/hardware_profile.rb b/src/app/models/hardware_profile.rb
index 5e6e9e8..22dc5c4 100644
--- a/src/app/models/hardware_profile.rb
+++ b/src/app/models/hardware_profile.rb
< at >< at > -41,13 +41,18 < at >< at > class HardwareProfile < ActiveRecord::Base
belongs_to :memory, :class_name => "HardwareProfileProperty",
:dependent => :destroy
+
belongs_to :storage, :class_name => "HardwareProfileProperty",
:dependent => :destroy
+
belongs_to :cpu, :class_name => "HardwareProfileProperty",
:dependent => :destroy
+
belongs_to :architecture, :class_name => "HardwareProfileProperty",
:dependent => :destroy
+ accepts_nested_attributes_for :memory, :cpu, :storage, :architecture
+
has_and_belongs_to_many :aggregator_hardware_profiles,
:class_name => "HardwareProfile",
:join_table => "hardware_profile_map",
< at >< at > -60,8 +65,8 < at >< at > class HardwareProfile < ActiveRecord::Base
:foreign_key => "aggregator_hardware_profile_id",
:association_foreign_key => "provider_hardware_profile_id"
- validates_presence_of :external_key
- validates_uniqueness_of :external_key, :scope => [:provider_id]
+ #validates_presence_of :external_key
+ #validates_uniqueness_of :external_key, :scope => [:provider_id]
validates_presence_of :name
validates_uniqueness_of :name, :scope => [:provider_id]
< at >< at > -79,8 +84,8 < at >< at > class HardwareProfile < ActiveRecord::Base
def validate
if provider.nil?
if !aggregator_hardware_profiles.empty?
- errors.add(:aggregator_hardware_profiles,
- "Aggregator profiles only allowed for provider profiles")
+ #errors.add(:aggregator_hardware_profiles,
+ #"Aggregator profiles only allowed for provider profiles")
end
else
if !provider_hardware_profiles.empty?
diff --git a/src/app/models/hardware_profile_property.rb b/src/app/models/hardware_profile_property.rb
index 46e4b8e..3f6bdfe 100644
--- a/src/app/models/hardware_profile_property.rb
+++ b/src/app/models/hardware_profile_property.rb
< at >< at > -101,7 +101,7 < at >< at > class HardwareProfileProperty < ActiveRecord::Base
def to_s
case kind
when FIXED
- value
+ value.to_s
when RANGE
range_first.to_s + " - " + range_last.to_s
when ENUM
diff --git a/src/app/models/property_enum_entry.rb b/src/app/models/property_enum_entry.rb
index ff497ef..81bb67e 100644
--- a/src/app/models/property_enum_entry.rb
+++ b/src/app/models/property_enum_entry.rb
< at >< at > -32,4 +32,7 < at >< at > class PropertyEnumEntry < ActiveRecord::Base
HardwareProfileProperty::STORAGE or
p.hardware_profile_property.name ==
HardwareProfileProperty::CPU }
+ def to_s
+ value.to_s + ", "
+ end
end
diff --git a/src/app/stylesheets/newui.scss b/src/app/stylesheets/newui.scss
index 513d510..d0fbcc9 100644
--- a/src/app/stylesheets/newui.scss
+++ b/src/app/stylesheets/newui.scss
< at >< at > -1371,6 +1371,11 < at >< at > $content-left: 180px;
float: left;
}
+#list {
+ float: left;
+ width: 100%;
+}
+
#details-view {
border: 1px solid;
position: absolute;
diff --git a/src/app/views/admin/hardware_profiles/_form.haml b/src/app/views/admin/hardware_profiles/_form.haml
new file mode 100644
index 0000000..65278f2
--- /dev/null
+++ b/src/app/views/admin/hardware_profiles/_form.haml
< at >< at > -0,0 +1,28 < at >< at >
+=hwp_form.label :name
+=hwp_form.text_field :name
+%table
+ = sortable_table_header < at >header
+ - [:memory, :cpu, :storage, :architecture].each do |type|
+ - hwp_form.fields_for type do |hwpp_form|
+ %tr
+ %td
+ =hwpp_form.text_field(:name, :readonly => "readonly")
+ %td
+ =hwpp_form.text_field(:unit, :size => 5, :readonly => "readonly")
+ %td
+ -unless type == :architecture
+ =hwpp_form.select("kind", ["fixed", "range", "enum"], {})
+ -else
+ =hwpp_form.select("kind", ["fixed", "enum"], {})
+ %td
+ =hwpp_form.text_field(:value)
+ %td
+ =hwpp_form.text_field(:property_enum_entries)
+ %td
+ -unless type == :architecture
+ =hwpp_form.text_field(:range_first)
+ %td
+ -unless type == :architecture
+ =hwpp_form.text_field(:range_last)
+= hwp_form.submit 'Check Matches', :class => "submit formbutton"
+= hwp_form.submit 'Save', :class => 'submit formbutton'
\ No newline at end of file
diff --git a/src/app/views/admin/hardware_profiles/_list.haml b/src/app/views/admin/hardware_profiles/_list.haml
index 1001db3..e2f344e 100644
--- a/src/app/views/admin/hardware_profiles/_list.haml
+++ b/src/app/views/admin/hardware_profiles/_list.haml
< at >< at > -1,5 +1,7 < at >< at >
- form_tag do
#object-actions
+ = link_to "New Hardware Profile", new_admin_hardware_profile_path, :class => 'button'
+ = restful_submit_tag "Delete", "destroy", multi_destroy_admin_hardware_profiles_path, "DELETE", :id => 'delete_button'
#selections
%p
< at >< at > -8,19 +10,20 < at >< at >
%span> ,&nbsp;
= link_to "None", < at >url_params.merge(:select => 'none')
-%table
- = sortable_table_header < at >header
- - < at >hardware_profiles.each do |hwp|
- %tr
- %td
- - selected = < at >url_params[:select] == 'all'
- = check_box(:pool, "selected[#{hwp.id}]", :checked => selected)
- = link_to hwp.name, admin_hardware_profile_path(hwp)
- %td
- =hwp.architecture.to_s
- %td
- =hwp.memory.to_s
- %td
- =hwp.storage.to_s
- %td
- =hwp.cpu.to_s
+ #list
+ %table
+ = sortable_table_header < at >header
+ - < at >hardware_profiles.each do |hwp|
+ %tr
+ %td
+ - selected = < at >url_params[:select] == 'all'
+ %input{:name => "hardware_profile_selected[]", :type => "checkbox", :value => hwp.id, :id => "hardware_profile_checkbox_#{hwp.id}", :checked => selected }
+ = link_to hwp.name, admin_hardware_profile_path(hwp)
+ %td
+ =hwp.architecture.to_s
+ %td
+ =hwp.memory.to_s
+ %td
+ =hwp.storage.to_s
+ %td
+ =hwp.cpu.to_s
diff --git a/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml b/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml
index cfbb856..0f4ba7b 100644
--- a/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml
+++ b/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml
< at >< at > -1,11 +1,13 < at >< at >
-%h3
- = < at >hardware_profile.name
+- if < at >hardware_profile
+ %h3
+ =< at >hardware_profile.name
%table
= sortable_table_header < at >provider_hwps_header
- < at >matching_hwps.each do |hwp|
%tr
%td
- = link_to hwp.provider.name, admin_provider_path(hwp.provider)
+ - if hwp.provider
+ = link_to hwp.provider.name, admin_provider_path(hwp.provider)
%td
= link_to hwp.name, admin_hardware_profile_path(hwp)
%td
diff --git a/src/app/views/admin/hardware_profiles/_properties.haml b/src/app/views/admin/hardware_profiles/_properties.haml
index 590edc5..bc91219 100644
--- a/src/app/views/admin/hardware_profiles/_properties.haml
+++ b/src/app/views/admin/hardware_profiles/_properties.haml
< at >< at > -1,5 +1,6 < at >< at >
%h3
= < at >hardware_profile.name + "(" + (< at >hardware_profile.provider_id.nil? ? "Front End" : "Provider" ) + ")"
+= link_to 'Edit', edit_admin_hardware_profile_path(< at >hardware_profile), :class => 'button'
%table
= sortable_table_header < at >properties_header
- < at >hwp_properties.each do |hwpp|
diff --git a/src/app/views/admin/hardware_profiles/create.haml b/src/app/views/admin/hardware_profiles/create.haml
new file mode 100644
index 0000000..c26bbe9
--- /dev/null
+++ b/src/app/views/admin/hardware_profiles/create.haml
< at >< at > -0,0 +1,6 < at >< at >
+%h3
+ Check Matching Hardware Profiles
+- content_for :list do
+ = render :partial => "form"
+- content_for :details do
+ = render :partial => 'layouts/details_pane'
\ No newline at end of file
diff --git a/src/app/views/admin/hardware_profiles/edit.haml b/src/app/views/admin/hardware_profiles/edit.haml
new file mode 100644
index 0000000..e32eebd
--- /dev/null
+++ b/src/app/views/admin/hardware_profiles/edit.haml
< at >< at > -0,0 +1,7 < at >< at >
+- content_for :list do
+ %h3
+ Edit Hardware Profile
+ -form_for < at >hardware_profile, :url => admin_hardware_profile_path(< at >hardware_profile), :html => { :multipart => true } do |hwp_form|
+ = render :partial => "form", :locals => { :hwp_form => hwp_form }
+- content_for :details do
+ = render :partial => 'layouts/details_pane'
diff --git a/src/app/views/admin/hardware_profiles/new.haml b/src/app/views/admin/hardware_profiles/new.haml
new file mode 100644
index 0000000..3355c87
--- /dev/null
+++ b/src/app/views/admin/hardware_profiles/new.haml
< at >< at > -0,0 +1,7 < at >< at >
+- content_for :list do
+ %h3
+ New Hardware Profile
+ -form_for < at >hardware_profile, :url => admin_hardware_profiles_path, :html => { :multipart => true } do |hwp_form|
+ = render :partial => "form", :locals => { :hwp_form => hwp_form }
+- content_for :details do
+ = render :partial => 'layouts/details_pane'
\ No newline at end of file
diff --git a/src/app/views/admin/provider_accounts/new.haml b/src/app/views/admin/provider_accounts/new.haml
index e567bce..55e469c 100644
--- a/src/app/views/admin/provider_accounts/new.haml
+++ b/src/app/views/admin/provider_accounts/new.haml
< at >< at > -13,4 +13,4 < at >< at >
%p.requirement
%span.required *
\-
- = t('cloud_accounts.new.required_field')
+ = t('cloud_accounts.new.required_field')
\ No newline at end of file
diff --git a/src/config/routes.rb b/src/config/routes.rb
index ad9fb67..ba5109e 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
< at >< at > -49,6 +49,8 < at >< at > ActionController::Routing::Routes.draw do |map|
map.namespace 'admin' do |r|
r.resources :hardware_profiles, :realms
+ r.resources :hardware_profiles, :collection => { :multi_destroy => :delete }
+ r.resources :pool_families, :realms
r.resources :providers, :collection => { :multi_destroy => :delete }
r.resources :users, :collection => { :multi_destroy => :delete }
r.resources :provider_accounts, :collection => { :multi_destroy => :delete }
diff --git a/src/db/migrate/20090804135630_create_hardware_profiles.rb b/src/db/migrate/20090804135630_create_hardware_profiles.rb
index 5ad0435..ec4a50f 100644
--- a/src/db/migrate/20090804135630_create_hardware_profiles.rb
+++ b/src/db/migrate/20090804135630_create_hardware_profiles.rb
< at >< at > -40,7 +40,7 < at >< at > class CreateHardwareProfiles < ActiveRecord::Migration
end
create_table :hardware_profiles do |t|
- t.string :external_key, :null => false
+ t.string :external_key
t.string :name, :null => false, :limit => 1024
t.integer :memory_id
t.integer :storage_id
diff --git a/src/features/hardware_profile.feature b/src/features/hardware_profile.feature
index 5f63c96..9c0572d 100644
--- a/src/features/hardware_profile.feature
+++ b/src/features/hardware_profile.feature
< at >< at > -77,3 +77,63 < at >< at > Feature: Manage Pools
Then I should see "m1-small"
And I should not see "m1-large"
And I should not see "m1-xlarge"
+
+ Scenario: Create a new Hardware Profile
+ Given I am an authorised user
+ And I am on the hardware profiles page
+ When I follow "New Hardware Profile"
+ Then I should be on the new hardware profile page
+ When I fill in "name" with "Test Hardware Profile"
+ And I enter the following details for the Hardware Profile Properties
+ | name | kind | range_first | range_last | property_enum_entries | value | unit |
+ | memory | fixed | | | | 1740 | MB |
+ | cpu | range | 1 | 4 | | 2 | count |
+ | storage | range | 250 | 500 | | 300 | GB |
+ | architecture | enum | | | i386, x86_64 | i386 | label |
+ And I press "Save"
+ Then I should be on the hardware profiles page
+ And I should see the following:
+ | Test Hardware Profile | 1740 | 1 - 4 | 250 - 500 | i386, x86_64 |
+
+ Scenario: Check New Hardware Profile matching Provider Hardware Profiles
+ Given I am an authorised user
+ And there are the following provider hardware profiles:
+ | name | memory | cpu |storage | architecture |
+ | m1-small | 1740 | 1 | 250 | i386 |
+ | m1-medium | 1740 | 2 | 500 | i386 |
+ | m1-large | 2048 | 4 | 850 | x86_64 |
+ And I am on the new hardware profile page
+ When I fill in "name" with "Test Hardware Profile"
+ And I enter the following details for the Hardware Profile Properties
+ | name | kind | range_first | range_last | property_enum_entries | value | unit |
+ | memory | fixed | | | | 1740 | MB |
+ | cpu | range | 1 | 4 | | 2 | count |
+ | storage | range | 250 | 500 | | 300 | GB |
+ | architecture | enum | | | i386, x86_64 | i386 | label |
+ And I press "Check Matches"
+ Then I should see the following:
+ | Name | Memory | CPU | Storage | Architecture |
+ | m1-small | 1740 | 1 | 250 | i386 |
+ | m1-medium | 1740 | 2 | 500 | i386 |
+
+ Scenario: Update a HardwareProfile
+ Given I am an authorised user
+ And there are the following aggregator hardware profiles:
+ | name | memory | cpu |storage | architecture |
+ | m1-small | 1740 | 2 | 160 | i386 |
+ And I am on the hardware profiles page
+ When I follow "m1-small"
+ Then I should see "Properties"
+ When I follow "edit"
+ Then I should be on the edit hardware profiles page
+ When I enter the following details for the Hardware Profile Properties
+ | name | kind | range_first | range_last | property_enum_entries | value |
+ | memory | fixed | | | | 1740 |
+ | cpu | range | 1 | 4 | | 1 |
+ | storage | range | 250 | 500 | | 300 |
+ | architecture | enum | | | i386, x86_64 | i386 |
+ And I press "Save"
+ Then I should be on the hardware profiles page
+ Then I should see the following:
+ | Name | Memory | CPU | Storage | Architecture |
+ | m1-small | 1740 | 1 - 4 | 250 - 500 | i386, x86_64 |
diff --git a/src/features/step_definitions/hardware_profile_steps.rb b/src/features/step_definitions/hardware_profile_steps.rb
index d29d136..9a8ecbf 100644
--- a/src/features/step_definitions/hardware_profile_steps.rb
+++ b/src/features/step_definitions/hardware_profile_steps.rb
< at >< at > -19,4 +19,21 < at >< at > def create_hwp(hash, provider=nil)
cpu = Factory(:mock_hwp1_cpu, :value => hash[:cpu])
arch = Factory(:mock_hwp1_arch, :value => hash[:architecture])
Factory(:mock_hwp1, :name => hash[:name], :memory => memory, :cpu => cpu, :storage => storage, :architecture => arch, :provider => provider)
+end
+
+When /^I enter the following details for the Hardware Profile Properties$/ do |table|
+ table.hashes.each do |hash|
+ hash.each_pair do |key, value|
+ unless (hash[:name] == "architecture" && (key == "range_first" || key == "range_last")) || key == "name"
+ When "I fill in \"#{"hardware_profile_" + hash[:name] + "_attributes_" + key}\" with \"#{value}\""
+ end
+ end
+ end
+end
+
+Given /^there are the following provider hardware profiles:$/ do |table|
+ provider = Factory :mock_provider
+ table.hashes.each do |hash|
+ create_hwp(hash, provider)
+ end
end
\ No newline at end of file
diff --git a/src/features/support/paths.rb b/src/features/support/paths.rb
index c0c77dc..4bc7ba4 100644
--- a/src/features/support/paths.rb
+++ b/src/features/support/paths.rb
< at >< at > -98,6 +98,12 < at >< at > module NavigationHelpers
when /the hardware profiles page/
url_for admin_hardware_profiles_path
+ when /the new hardware profile page/
+ url_for new_admin_hardware_profile_path
+
+ when /the edit hardware profiles page/
+ url_for :action => 'edit', :controller => 'hardware_profiles', :only_path => true
+
when /^(.*)'s provider account page$/
admin_provider_account_path(CloudAccount.find_by_label($1))
</pre>mtaylor-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org2011-01-17T14:08:37[PATCH aeolus] Hardware Profiles UI
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3697
<pre>From: Martyn Taylor <mtaylor-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
---
.../admin/hardware_profiles_controller.rb | 114 +++++++++++++++++++-
src/app/models/hardware_profile.rb | 13 ++-
src/app/models/hardware_profile_property.rb | 2 +-
src/app/models/property_enum_entry.rb | 3 +
src/app/stylesheets/newui.scss | 5 +
src/app/views/admin/hardware_profiles/_form.haml | 28 +++++
src/app/views/admin/hardware_profiles/_list.haml | 37 ++++---
.../_matching_provider_hardware_profiles.haml | 8 +-
.../views/admin/hardware_profiles/_properties.haml | 1 +
src/app/views/admin/hardware_profiles/create.haml | 6 +
src/app/views/admin/hardware_profiles/edit.haml | 7 ++
src/app/views/admin/hardware_profiles/new.haml | 7 ++
src/app/views/admin/provider_accounts/new.haml | 2 +-
src/config/routes.rb | 3 +-
.../20090804135630_create_hardware_profiles.rb | 2 +-
src/features/hardware_profile.feature | 63 +++++++++++-
.../step_definitions/hardware_profile_steps.rb | 21 ++++
src/features/support/paths.rb | 6 +
18 files changed, 295 insertions(+), 33 deletions(-)
create mode 100644 src/app/views/admin/hardware_profiles/_form.haml
create mode 100644 src/app/views/admin/hardware_profiles/create.haml
create mode 100644 src/app/views/admin/hardware_profiles/edit.haml
create mode 100644 src/app/views/admin/hardware_profiles/new.haml
diff --git a/src/app/controllers/admin/hardware_profiles_controller.rb b/src/app/controllers/admin/hardware_profiles_controller.rb
index 67c655d..b57bd37 100644
--- a/src/app/controllers/admin/hardware_profiles_controller.rb
+++ b/src/app/controllers/admin/hardware_profiles_controller.rb
< at >< at > -2,6 +2,9 < at >< at > class Admin::HardwareProfilesController < ApplicationController
before_filter :require_user
before_filter :load_hardware_profiles, :only => [:index, :show]
before_filter :load_hardware_profile, :only => [:show]
+ before_filter :setup_new_hardware_profile, :only => [:new]
+ before_filter :setup_hardware_profile, :only => [:new, :create, :edit, :update]
+
def index
end
< at >< at > -29,12 +32,73 < at >< at > class Admin::HardwareProfilesController < ApplicationController
end
def create
+ build_hardware_profile(params[:hardware_profile])
+ if params[:commit] == 'Save'
+ if < at >hardware_profile.save!
+ redirect_to admin_hardware_profiles_path
+ else
+ params.delete :commit
+ render :action => 'create'
+ end
+ else
+ matching_provider_hardware_profiles
+ render :action => 'new'
+ end
end
def delete
end
+ def edit
+ unless < at >hardware_profile
+ < at >hardware_profile = HardwareProfile.find(params[:id])
+ end
+ matching_provider_hardware_profiles
+ end
+
+ def update
+ if params[:commit] == "Reset"
+ redirect_to edit_admin_hardware_profile_url(< at >hardware_profile) and return
+ end
+
+ if params[:id]
+ < at >hardware_profile = HardwareProfile.find(params[:id])
+ build_hardware_profile(params[:hardware_profile])
+ end
+
+ if params[:commit] == "Check Matches"
+ matching_provider_hardware_profiles
+ render :edit and return
+ end
+
+ unless < at >hardware_profile.save!
+ render :action => 'edit' and return
+ else
+ flash[:notice] = "Hardware Profile updated!"
+ redirect_to admin_hardware_profiles_path
+ end
+ end
+
+ def multi_destroy
+ HardwareProfile.destroy(params[:hardware_profile_selected])
+ redirect_to admin_hardware_profiles_path
+ end
+
private
+ def setup_new_hardware_profile
+ if params[:hardware_profile]
+ begin
+ < at >hardware_profile = HardwareProfile.new(remove_irrelevant_params(params[:hardware_profile]))
+ end
+ else
+ < at >hardware_profile = HardwareProfile.new(:memory => HardwareProfileProperty.new(:name => "memory", :unit => "MB"),
+ :cpu => HardwareProfileProperty.new(:name => "cpu", :unit => "count"),
+ :storage => HardwareProfileProperty.new(:name => "storage", :unit => "GB"),
+ :architecture => HardwareProfileProperty.new(:name => "architecture", :unit => "label"))
+ end
+ matching_provider_hardware_profiles
+ end
+
def properties
< at >properties_header = [
{ :name => "Name", :sort_attr => :name},
< at >< at > -58,8 +122,26 < at >< at > class Admin::HardwareProfilesController < ApplicationController
{ :name => "Storage", :sort_attr => :storage },
{ :name => "Virtual CPU", :sort_attr => :cpus}
]
- < at >matching_hwps = HardwareProfile.all(:include => "aggregator_hardware_profiles",
- :conditions => {:hardware_profile_map => { :aggregator_hardware_profile_id => params[:id] }})
+
+ begin
+ < at >matching_hwps = HardwareProfile.matching_hwps(< at >hardware_profile).map { |hwp| hwp[:hardware_profile] }
+ rescue
+ < at >matching_hwps = []
+ end
+ end
+
+ def setup_hardware_profile
+ < at >tab_captions = ['Matched Provider Hardware Profiles']
+ < at >details_tab = 'matching_provider_hardware_profiles'
+ < at >url_params = params
+ < at >header = [
+ { :name => "Name", :sort_attr => :name},
+ { :name => "Unit", :sort_attr => :unit},
+ { :name => "Kind", :sort_attr => :kind },
+ { :name => "Value (Default)", :sort_attr => :value},
+ { :name => "Enum Entries", :sort_attr => :false },
+ { :name => "Range First", :sort_attr => :range_first},
+ { :name => "Range Last", :sort_attr => :range_last }]
end
def load_hardware_profiles
< at >< at > -75,7 +157,33 < at >< at > class Admin::HardwareProfilesController < ApplicationController
end
def load_hardware_profile
- < at >hardware_profile = HardwareProfile.find((params[:id] || []).first)
+ < at >hardware_profile = HardwareProfile.find(params[:id])
end
+ def build_hardware_profile(params)
+ hwpps = [:memory_attributes, :cpu_attributes, :storage_attributes, :architecture_attributes]
+ enum_values = {}
+ hwpps.each do |attr|
+ unless params[attr][:kind] == "range"
+ params[attr].delete(:range_first)
+ params[attr].delete(:range_last)
+ end
+
+ unless params[attr][:kind] == "enum"
+ params[attr].delete(:enum)
+ else
+ enum_values[params[attr][:name]] = params[attr][:property_enum_entries].split(%r{,\s*})
+ end
+ params[attr].delete(:property_enum_entries)
+ end
+
+ < at >hardware_profile.nil? ? < at >hardware_profile = HardwareProfile.new(params) : < at >hardware_profile.update_attributes(params)
+
+ # Set Property Enum Entries on enum types
+ [< at >hardware_profile.memory, < at >hardware_profile.cpu, < at >hardware_profile.architecture, < at >hardware_profile.storage].each do |hwpp|
+ if hwpp.kind == "enum"
+ hwpp.property_enum_entries = enum_values[hwpp.name].map { |value| PropertyEnumEntry.new(:value => value) }
+ end
+ end
+ end
end
\ No newline at end of file
diff --git a/src/app/models/hardware_profile.rb b/src/app/models/hardware_profile.rb
index d7ae995..10f1283 100644
--- a/src/app/models/hardware_profile.rb
+++ b/src/app/models/hardware_profile.rb
< at >< at > -29,13 +29,18 < at >< at > class HardwareProfile < ActiveRecord::Base
belongs_to :memory, :class_name => "HardwareProfileProperty",
:dependent => :destroy
+
belongs_to :storage, :class_name => "HardwareProfileProperty",
:dependent => :destroy
+
belongs_to :cpu, :class_name => "HardwareProfileProperty",
:dependent => :destroy
+
belongs_to :architecture, :class_name => "HardwareProfileProperty",
:dependent => :destroy
+ accepts_nested_attributes_for :memory, :cpu, :storage, :architecture
+
has_and_belongs_to_many :aggregator_hardware_profiles,
:class_name => "HardwareProfile",
:join_table => "hardware_profile_map",
< at >< at > -48,8 +53,8 < at >< at > class HardwareProfile < ActiveRecord::Base
:foreign_key => "aggregator_hardware_profile_id",
:association_foreign_key => "provider_hardware_profile_id"
- validates_presence_of :external_key
- validates_uniqueness_of :external_key, :scope => [:provider_id]
+ #validates_presence_of :external_key
+ #validates_uniqueness_of :external_key, :scope => [:provider_id]
validates_presence_of :name
validates_uniqueness_of :name, :scope => [:provider_id]
< at >< at > -67,8 +72,8 < at >< at > class HardwareProfile < ActiveRecord::Base
def validate
if provider.nil?
if !aggregator_hardware_profiles.empty?
- errors.add(:aggregator_hardware_profiles,
- "Aggregator profiles only allowed for provider profiles")
+ #errors.add(:aggregator_hardware_profiles,
+ #"Aggregator profiles only allowed for provider profiles")
end
else
if !provider_hardware_profiles.empty?
diff --git a/src/app/models/hardware_profile_property.rb b/src/app/models/hardware_profile_property.rb
index 46e4b8e..3f6bdfe 100644
--- a/src/app/models/hardware_profile_property.rb
+++ b/src/app/models/hardware_profile_property.rb
< at >< at > -101,7 +101,7 < at >< at > class HardwareProfileProperty < ActiveRecord::Base
def to_s
case kind
when FIXED
- value
+ value.to_s
when RANGE
range_first.to_s + " - " + range_last.to_s
when ENUM
diff --git a/src/app/models/property_enum_entry.rb b/src/app/models/property_enum_entry.rb
index ff497ef..81bb67e 100644
--- a/src/app/models/property_enum_entry.rb
+++ b/src/app/models/property_enum_entry.rb
< at >< at > -32,4 +32,7 < at >< at > class PropertyEnumEntry < ActiveRecord::Base
HardwareProfileProperty::STORAGE or
p.hardware_profile_property.name ==
HardwareProfileProperty::CPU }
+ def to_s
+ value.to_s + ", "
+ end
end
diff --git a/src/app/stylesheets/newui.scss b/src/app/stylesheets/newui.scss
index 513d510..d0fbcc9 100644
--- a/src/app/stylesheets/newui.scss
+++ b/src/app/stylesheets/newui.scss
< at >< at > -1371,6 +1371,11 < at >< at > $content-left: 180px;
float: left;
}
+#list {
+ float: left;
+ width: 100%;
+}
+
#details-view {
border: 1px solid;
position: absolute;
diff --git a/src/app/views/admin/hardware_profiles/_form.haml b/src/app/views/admin/hardware_profiles/_form.haml
new file mode 100644
index 0000000..65278f2
--- /dev/null
+++ b/src/app/views/admin/hardware_profiles/_form.haml
< at >< at > -0,0 +1,28 < at >< at >
+=hwp_form.label :name
+=hwp_form.text_field :name
+%table
+ = sortable_table_header < at >header
+ - [:memory, :cpu, :storage, :architecture].each do |type|
+ - hwp_form.fields_for type do |hwpp_form|
+ %tr
+ %td
+ =hwpp_form.text_field(:name, :readonly => "readonly")
+ %td
+ =hwpp_form.text_field(:unit, :size => 5, :readonly => "readonly")
+ %td
+ -unless type == :architecture
+ =hwpp_form.select("kind", ["fixed", "range", "enum"], {})
+ -else
+ =hwpp_form.select("kind", ["fixed", "enum"], {})
+ %td
+ =hwpp_form.text_field(:value)
+ %td
+ =hwpp_form.text_field(:property_enum_entries)
+ %td
+ -unless type == :architecture
+ =hwpp_form.text_field(:range_first)
+ %td
+ -unless type == :architecture
+ =hwpp_form.text_field(:range_last)
+= hwp_form.submit 'Check Matches', :class => "submit formbutton"
+= hwp_form.submit 'Save', :class => 'submit formbutton'
\ No newline at end of file
diff --git a/src/app/views/admin/hardware_profiles/_list.haml b/src/app/views/admin/hardware_profiles/_list.haml
index 7399549..e2f344e 100644
--- a/src/app/views/admin/hardware_profiles/_list.haml
+++ b/src/app/views/admin/hardware_profiles/_list.haml
< at >< at > -1,7 +1,7 < at >< at >
- form_tag do
#object-actions
- = restful_submit_tag "Create", "create", admin_hardware_profiles_path, "PUT"
- = restful_submit_tag "Delete", "delete", admin_hardware_profiles_path, "DELETE"
+ = link_to "New Hardware Profile", new_admin_hardware_profile_path, :class => 'button'
+ = restful_submit_tag "Delete", "destroy", multi_destroy_admin_hardware_profiles_path, "DELETE", :id => 'delete_button'
#selections
%p
< at >< at > -10,19 +10,20 < at >< at >
%span> ,&nbsp;
= link_to "None", < at >url_params.merge(:select => 'none')
-%table
- = sortable_table_header < at >header
- - < at >hardware_profiles.each do |hwp|
- %tr
- %td
- - selected = < at >url_params[:select] == 'all'
- = check_box(:pool, "selected[#{hwp.id}]", :checked => selected)
- = link_to hwp.name, admin_hardware_profile_path(hwp)
- %td
- =hwp.architecture.to_s
- %td
- =hwp.memory.to_s
- %td
- =hwp.storage.to_s
- %td
- =hwp.cpu.to_s
+ #list
+ %table
+ = sortable_table_header < at >header
+ - < at >hardware_profiles.each do |hwp|
+ %tr
+ %td
+ - selected = < at >url_params[:select] == 'all'
+ %input{:name => "hardware_profile_selected[]", :type => "checkbox", :value => hwp.id, :id => "hardware_profile_checkbox_#{hwp.id}", :checked => selected }
+ = link_to hwp.name, admin_hardware_profile_path(hwp)
+ %td
+ =hwp.architecture.to_s
+ %td
+ =hwp.memory.to_s
+ %td
+ =hwp.storage.to_s
+ %td
+ =hwp.cpu.to_s
diff --git a/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml b/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml
index cfbb856..0f4ba7b 100644
--- a/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml
+++ b/src/app/views/admin/hardware_profiles/_matching_provider_hardware_profiles.haml
< at >< at > -1,11 +1,13 < at >< at >
-%h3
- = < at >hardware_profile.name
+- if < at >hardware_profile
+ %h3
+ =< at >hardware_profile.name
%table
= sortable_table_header < at >provider_hwps_header
- < at >matching_hwps.each do |hwp|
%tr
%td
- = link_to hwp.provider.name, admin_provider_path(hwp.provider)
+ - if hwp.provider
+ = link_to hwp.provider.name, admin_provider_path(hwp.provider)
%td
= link_to hwp.name, admin_hardware_profile_path(hwp)
%td
diff --git a/src/app/views/admin/hardware_profiles/_properties.haml b/src/app/views/admin/hardware_profiles/_properties.haml
index 590edc5..bc91219 100644
--- a/src/app/views/admin/hardware_profiles/_properties.haml
+++ b/src/app/views/admin/hardware_profiles/_properties.haml
< at >< at > -1,5 +1,6 < at >< at >
%h3
= < at >hardware_profile.name + "(" + (< at >hardware_profile.provider_id.nil? ? "Front End" : "Provider" ) + ")"
+= link_to 'Edit', edit_admin_hardware_profile_path(< at >hardware_profile), :class => 'button'
%table
= sortable_table_header < at >properties_header
- < at >hwp_properties.each do |hwpp|
diff --git a/src/app/views/admin/hardware_profiles/create.haml b/src/app/views/admin/hardware_profiles/create.haml
new file mode 100644
index 0000000..c26bbe9
--- /dev/null
+++ b/src/app/views/admin/hardware_profiles/create.haml
< at >< at > -0,0 +1,6 < at >< at >
+%h3
+ Check Matching Hardware Profiles
+- content_for :list do
+ = render :partial => "form"
+- content_for :details do
+ = render :partial => 'layouts/details_pane'
\ No newline at end of file
diff --git a/src/app/views/admin/hardware_profiles/edit.haml b/src/app/views/admin/hardware_profiles/edit.haml
new file mode 100644
index 0000000..e32eebd
--- /dev/null
+++ b/src/app/views/admin/hardware_profiles/edit.haml
< at >< at > -0,0 +1,7 < at >< at >
+- content_for :list do
+ %h3
+ Edit Hardware Profile
+ -form_for < at >hardware_profile, :url => admin_hardware_profile_path(< at >hardware_profile), :html => { :multipart => true } do |hwp_form|
+ = render :partial => "form", :locals => { :hwp_form => hwp_form }
+- content_for :details do
+ = render :partial => 'layouts/details_pane'
diff --git a/src/app/views/admin/hardware_profiles/new.haml b/src/app/views/admin/hardware_profiles/new.haml
new file mode 100644
index 0000000..3355c87
--- /dev/null
+++ b/src/app/views/admin/hardware_profiles/new.haml
< at >< at > -0,0 +1,7 < at >< at >
+- content_for :list do
+ %h3
+ New Hardware Profile
+ -form_for < at >hardware_profile, :url => admin_hardware_profiles_path, :html => { :multipart => true } do |hwp_form|
+ = render :partial => "form", :locals => { :hwp_form => hwp_form }
+- content_for :details do
+ = render :partial => 'layouts/details_pane'
\ No newline at end of file
diff --git a/src/app/views/admin/provider_accounts/new.haml b/src/app/views/admin/provider_accounts/new.haml
index e567bce..55e469c 100644
--- a/src/app/views/admin/provider_accounts/new.haml
+++ b/src/app/views/admin/provider_accounts/new.haml
< at >< at > -13,4 +13,4 < at >< at >
%p.requirement
%span.required *
\-
- = t('cloud_accounts.new.required_field')
+ = t('cloud_accounts.new.required_field')
\ No newline at end of file
diff --git a/src/config/routes.rb b/src/config/routes.rb
index 6d9b5cf..463031d 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
< at >< at > -47,7 +47,8 < at >< at > ActionController::Routing::Routes.draw do |map|
map.connect '/set_layout', :controller => 'application', :action => 'set_layout'
map.namespace 'admin' do |r|
- r.resources :hardware_profiles, :pool_families, :realms
+ r.resources :hardware_profiles, :collection => { :multi_destroy => :delete }
+ r.resources :pool_families, :realms
r.resources :providers, :collection => { :multi_destroy => :delete }
r.resources :users, :collection => { :multi_destroy => :delete }
r.resources :provider_accounts, :collection => { :multi_destroy => :delete }
diff --git a/src/db/migrate/20090804135630_create_hardware_profiles.rb b/src/db/migrate/20090804135630_create_hardware_profiles.rb
index 5ad0435..ec4a50f 100644
--- a/src/db/migrate/20090804135630_create_hardware_profiles.rb
+++ b/src/db/migrate/20090804135630_create_hardware_profiles.rb
< at >< at > -40,7 +40,7 < at >< at > class CreateHardwareProfiles < ActiveRecord::Migration
end
create_table :hardware_profiles do |t|
- t.string :external_key, :null => false
+ t.string :external_key
t.string :name, :null => false, :limit => 1024
t.integer :memory_id
t.integer :storage_id
diff --git a/src/features/hardware_profile.feature b/src/features/hardware_profile.feature
index 6f1cc81..e6fa89e 100644
--- a/src/features/hardware_profile.feature
+++ b/src/features/hardware_profile.feature
< at >< at > -48,4 +48,65 < at >< at > Feature: Manage Pools
And I follow "Matching Provider Hardware Profiles"
Then I should see the following:
| Name | Memory | CPU | Storage | Architecture |
- | m1-small | 1740 | 2 | 160 | i386 |
\ No newline at end of file
+ | m1-small | 1740 | 2 | 160 | i386 |
+
+ Scenario: Create a new Hardware Profile
+ Given I am an authorised user
+ And I am on the hardware profiles page
+ When I follow "New Hardware Profile"
+ Then I should be on the new hardware profile page
+ When I fill in "name" with "Test Hardware Profile"
+ And I enter the following details for the Hardware Profile Properties
+ | name | kind | range_first | range_last | property_enum_entries | value | unit |
+ | memory | fixed | | | | 1740 | MB |
+ | cpu | range | 1 | 4 | | 2 | count |
+ | storage | range | 250 | 500 | | 300 | GB |
+ | architecture | enum | | | i386, x86_64 | i386 | label |
+ And I press "Save"
+ Then I should be on the hardware profiles page
+ And I should see the following:
+ | Name | memory | cpu | storage | architecture |
+ | Test Hardware Profile | 1740 | 1 - 4 | 250 - 500 | i386, x86_64 |
+
+ Scenario: Check New Hardware Profile matching Provider Hardware Profiles
+ Given I am an authorised user
+ And there are the following provider hardware profiles:
+ | name | memory | cpu |storage | architecture |
+ | small | 1740 | 1 | 250 | i386 |
+ | medium | 1740 | 2 | 500 | i386 |
+ | large | 2048 | 4 | 850 | x86_64 |
+ And I am on the new hardware profile page
+ When I fill in "name" with "Test Hardware Profile"
+ And I enter the following details for the Hardware Profile Properties
+ | name | kind | range_first | range_last | property_enum_entries | value | unit |
+ | memory | fixed | | | | 1740 | MB |
+ | cpu | range | 1 | 4 | | 2 | count |
+ | storage | range | 250 | 500 | | 300 | GB |
+ | architecture | enum | | | i386, x86_64 | i386 | label |
+ And I press "Check Matches"
+ Then I should see the following:
+ | Name | Memory | CPU | Storage | Architecture |
+ | small | 1740 | 1 | 300 | i386 |
+ | medium | 1740 | 2 | 500 | i386 |
+
+ Scenario: Update a HardwareProfile
+ Given I am an authorised user
+ And there are the following aggregator hardware profiles:
+ | name | memory | cpu |storage | architecture |
+ | m1-small | 1740 | 2 | 160 | i386 |
+ And I am on the hardware profiles page
+ When I follow "m1-small"
+ Then I should see "Properties"
+ When I follow "edit"
+ Then I should be on the edit hardware profiles page
+ When I enter the following details for the Hardware Profile Properties
+ | name | kind | range_first | range_last | property_enum_entries | value |
+ | memory | fixed | | | | 1740 |
+ | cpu | range | 1 | 4 | | 1 |
+ | storage | range | 250 | 500 | | 300 |
+ | architecture | enum | | | i386, x86_64 | i386 |
+ And I press "Save"
+ Then I should be on the hardware profiles page
+ Then I should see the following:
+ | Name | Memory | CPU | Storage | Architecture |
+ | m1-small | 1740 | 1 - 4 | 250 - 500 | i386, x86_64 |
\ No newline at end of file
diff --git a/src/features/step_definitions/hardware_profile_steps.rb b/src/features/step_definitions/hardware_profile_steps.rb
index d29d136..8965517 100644
--- a/src/features/step_definitions/hardware_profile_steps.rb
+++ b/src/features/step_definitions/hardware_profile_steps.rb
< at >< at > -19,4 +19,25 < at >< at > def create_hwp(hash, provider=nil)
cpu = Factory(:mock_hwp1_cpu, :value => hash[:cpu])
arch = Factory(:mock_hwp1_arch, :value => hash[:architecture])
Factory(:mock_hwp1, :name => hash[:name], :memory => memory, :cpu => cpu, :storage => storage, :architecture => arch, :provider => provider)
+end
+
+When /^I enter the following details for the Hardware Profile Properties$/ do |table|
+ table.hashes.each do |hash|
+ hash.each_pair do |key, value|
+ unless (hash[:name] == "architecture" && (key == "range_first" || key == "range_last")) || key == "name"
+ When "I fill in \"#{"hardware_profile_" + hash[:name] + "_attributes_" + key}\" with \"#{value}\""
+ end
+ end
+ end
+end
+
+Given /^there are the following provider hardware profiles:$/ do |table|
+ provider = Factory :mock_provider
+ table.hashes do |hash|
+ memory = Factory(:mock_hwp1_memory, :value => hash[:memory])
+ cpu = Factory(:mock_hwp1_cpu, :value => hash[:cpu])
+ storage = Factory(:mock_hwp1_storage, :value => hash[:storage])
+ architecture = Factory(:mock_hwp1_architecture, :value => hash[:architecture])
+ Factory(:hardware_profile, :provider => provider, :memory => memory, :storage => storage, :cpu => cpu, :architecture => architecture)
+ end
end
\ No newline at end of file
diff --git a/src/features/support/paths.rb b/src/features/support/paths.rb
index 66de0d2..5dd1116 100644
--- a/src/features/support/paths.rb
+++ b/src/features/support/paths.rb
< at >< at > -98,6 +98,12 < at >< at > module NavigationHelpers
when /the hardware profiles page/
url_for admin_hardware_profiles_path
+ when /the new hardware profile page/
+ url_for new_admin_hardware_profile_path
+
+ when /the edit hardware profiles page/
+ url_for :action => 'edit', :controller => 'hardware_profiles', :only_path => true
+
when /^(.*)'s provider account page$/
admin_provider_account_path(CloudAccount.find_by_label($1))
</pre>mtaylor-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org2011-01-17T12:08:53[PATCH 0/2]: Remove bogus references
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3689
<pre>As mother always said, late is better than never. Since we are in the process
of renaming the whole project, I figured that I would remove any references
to absolutely ancient things. This series does that.
I did a run of these through the cucumber tests, and no new errors popped up.
That doesn't mean that they are perfect, just that they should be relatively
safe to commit. Please review and ACK.
</pre>Chris Lalancette2011-01-14T20:00:56[PATCH aeolus] Cucumber tests for Users search
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3688
<pre>From: Tomas Sedovic <tsedovic-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
---
src/features/step_definitions/user_steps.rb | 4 +++-
src/features/user.feature | 15 +++++++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/features/step_definitions/user_steps.rb b/src/features/step_definitions/user_steps.rb
index ed474e3..13932fa 100644
--- a/src/features/step_definitions/user_steps.rb
+++ b/src/features/step_definitions/user_steps.rb
< at >< at > -1,5 +1,7 < at >< at >
Given /^there is a user "([^"]*)"$/ do |name|
- User.find_by_login(name).should_not == nil
+ unless User.find_by_login(name)
+ Factory :user, :login => name, :email => "#{name}< at >example.com"
+ end
end
Given /^there are (\d+) users$/ do |number|
diff --git a/src/features/user.feature b/src/features/user.feature
index 89dd7d5..1819cb5 100644
--- a/src/features/user.feature
+++ b/src/features/user.feature
< at >< at > -42,3 +42,18 < at >< at > Feature: Manage Users
When I follow "cancel"
Then there should only be 2 users
And I should be on the admin users page
+
+ Scenario: Search for hardware profiles
+ Given there is a user "myuser"
+ And there is a user "someuser"
+ And I am on the admin users page
+ Then I should see "myuser"
+ And I should see "someuser"
+ When I fill in "q" with "some"
+ And I press "Search"
+ Then I should see "someuser"
+ And I should not see "myuser"
+ When I fill in "q" with "myuser"
+ And I press "Search"
+ Then I should see "myuser"
+ And I should not see "someuser"
</pre>tsedovic-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org2011-01-14T14:22:55[PATCH aeolus] Add search for Users
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3686
<pre>From: Tomas Sedovic <tsedovic-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
---
src/app/controllers/admin/users_controller.rb | 16 +++++++++++++++-
src/app/models/user.rb | 7 +++++++
2 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/app/controllers/admin/users_controller.rb b/src/app/controllers/admin/users_controller.rb
index 0e854a9..1c48dcb 100644
--- a/src/app/controllers/admin/users_controller.rb
+++ b/src/app/controllers/admin/users_controller.rb
< at >< at > -1,7 +1,21 < at >< at >
class Admin::UsersController < ApplicationController
before_filter :require_user
before_filter :only_admin, :only => [:index, :multi_destroy]
- before_filter :load_users, :only => [:index, :show]
+ before_filter :load_users, :only => [:show]
+
+ def index
+ < at >params = params
+ < at >search_term = params[:q]
+ if < at >search_term.blank?
+ load_users
+ return
+ end
+
+ search = User.search do
+ keywords(params[:q])
+ end
+ < at >users = search.results
+ end
def new
< at >user = User.new
diff --git a/src/app/models/user.rb b/src/app/models/user.rb
index 7942ae4..cc77d9d 100644
--- a/src/app/models/user.rb
+++ b/src/app/models/user.rb
< at >< at > -19,7 +19,14 < at >< at >
# Filters added to this controller apply to all controllers in the application.
# Likewise, all the methods added will be available for all controllers.
+require 'sunspot_rails'
class User < ActiveRecord::Base
+ searchable do
+ text :login, :as => :code_substring
+ text :last_name, :as => :code_substring
+ text :first_name, :as => :code_substring
+ text :email, :as => :code_substring
+ end
acts_as_authentic
has_many :permissions
</pre>tsedovic-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org2011-01-14T12:24:53[PATCH aggregator] Implement Assemblies basic UI
http://comments.gmane.org/gmane.comp.lib.deltacloud.devel/3685
<pre>From: Ladislav Martincik <lmartinc-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
---
.../image_factory/assemblies_controller.rb | 63 ++++++++++++++++++++
src/app/models/assembly.rb | 2 +
src/app/views/image_factory/assemblies/_form.haml | 7 ++
src/app/views/image_factory/assemblies/_list.haml | 28 +++++++++
.../image_factory/assemblies/_properties.haml | 4 +
src/app/views/image_factory/assemblies/edit.haml | 4 +
src/app/views/image_factory/assemblies/index.haml | 3 +-
src/app/views/image_factory/assemblies/new.haml | 3 +
src/app/views/image_factory/assemblies/show.haml | 5 ++
src/config/routes.rb | 2 +-
src/db/migrate/20110114111158_create_assemblies.rb | 13 ++++
src/features/assembly.feature | 50 ++++++++++++++++
src/features/step_definitions/assembly_steps.rb | 20 ++++++
src/features/support/paths.rb | 3 +
14 files changed, 205 insertions(+), 2 deletions(-)
create mode 100644 src/app/models/assembly.rb
create mode 100644 src/app/views/image_factory/assemblies/_form.haml
create mode 100644 src/app/views/image_factory/assemblies/_list.haml
create mode 100644 src/app/views/image_factory/assemblies/_properties.haml
create mode 100644 src/app/views/image_factory/assemblies/edit.haml
create mode 100644 src/app/views/image_factory/assemblies/new.haml
create mode 100644 src/app/views/image_factory/assemblies/show.haml
create mode 100644 src/db/migrate/20110114111158_create_assemblies.rb
create mode 100644 src/features/assembly.feature
create mode 100644 src/features/step_definitions/assembly_steps.rb
diff --git a/src/app/controllers/image_factory/assemblies_controller.rb b/src/app/controllers/image_factory/assemblies_controller.rb
index ce67f14..6627656 100644
--- a/src/app/controllers/image_factory/assemblies_controller.rb
+++ b/src/app/controllers/image_factory/assemblies_controller.rb
< at >< at > -1,6 +1,69 < at >< at >
class ImageFactory::AssembliesController < ApplicationController
before_filter :require_user
+ before_filter :load_assemblies, :only => [:index, :show]
def index
end
+
+ def show
+ < at >assembly = Assembly.find(params[:id])
+ < at >url_params = params.clone
+ < at >tab_captions = ['Properties']
+ < at >details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab]
+ respond_to do |format|
+ format.js do
+ if < at >url_params.delete :details_pane
+ render :partial => 'layouts/details_pane' and return
+ end
+ render :partial => < at >details_tab and return
+ end
+ format.html { render :action => 'show'}
+ end
+ end
+
+ def new
+ < at >assembly = Assembly.new
+ end
+
+ def create
+ < at >assembly = Assembly.new(params[:assembly])
+ if < at >assembly.save
+ flash[:notice] = "Assembly added."
+ redirect_to image_factory_assembly_url(< at >assembly)
+ else
+ render :action => :new
+ end
+ end
+
+ def edit
+ < at >assembly = Assembly.find(params[:id])
+ end
+
+ def update
+ < at >assembly = Assembly.find(params[:id])
+ if < at >assembly.update_attributes(params[:assembly])
+ flash[:notice] = "Assembly updated."
+ redirect_to image_factory_assembly_url(< at >assembly)
+ else
+ render :action => :edit
+ end
+ end
+
+ def multi_destroy
+ Assembly.destroy(params[:assemblies_selected])
+ redirect_to image_factory_assemblies_url
+ end
+
+ protected
+
+ def load_assemblies
+ < at >header = [
+ { :name => "Assembly name", :sort_attr => :name }
+ ]
+ < at >assemblies = Assembly.paginate(:all,
+ :page => params[:page] || 1,
+ :order => (params[:order_field] || 'name') +' '+ (params[:order_dir] || 'asc')
+ )
+ < at >url_params = params.clone
+ end
end
diff --git a/src/app/models/assembly.rb b/src/app/models/assembly.rb
new file mode 100644
index 0000000..5eac9de
--- /dev/null
+++ b/src/app/models/assembly.rb
< at >< at > -0,0 +1,2 < at >< at >
+class Assembly < ActiveRecord::Base
+end
diff --git a/src/app/views/image_factory/assemblies/_form.haml b/src/app/views/image_factory/assemblies/_form.haml
new file mode 100644
index 0000000..39556e5
--- /dev/null
+++ b/src/app/views/image_factory/assemblies/_form.haml
< at >< at > -0,0 +1,7 < at >< at >
+= form.error_messages
+%fieldset.clear
+ = form.label :name, t(:name), :class => "grid_3 alpha"
+ = form.text_field :name, :class => "grid_5"
+%fieldset.clearfix
+ = form.submit "Save", :class => "submit formbutton"
+ = link_to t(:cancel), image_factory_assemblies_path, :class => 'button formbutton'
diff --git a/src/app/views/image_factory/assemblies/_list.haml b/src/app/views/image_factory/assemblies/_list.haml
new file mode 100644
index 0000000..f29b322
--- /dev/null
+++ b/src/app/views/image_factory/assemblies/_list.haml
< at >< at > -0,0 +1,28 < at >< at >
+- form_tag do
+ = link_to "Create", new_image_factory_assembly_url, :class => 'button'
+ = restful_submit_tag "Delete", 'destroy', multi_destroy_image_factory_assemblies_path, 'DELETE', :id => 'delete_button'
+
+ %table#assemblies_table
+ %thead
+ %tr
+ %th
+ %th= link_to "Name", image_factory_assemblies_url(:sort_by => "name")
+ -< at >assemblies.each do |assembly|
+ %tr
+ %td
+ %input{:name => "assemblies_selected[]", :type => "checkbox", :value => assembly.id, :id => "assembly_checkbox_#{assembly.id}" }
+ %td= link_to assembly.name, image_factory_assembly_path(assembly)
+
+:javascript
+ $(document).ready(function () {
+ $('#delete_button').click(function(e) {
+ if ($("#assemblies_table input[< at >type=radio]:checked").length == 0) {
+ alert('Please select any assembly to be deleted before clicking Delete button.');
+ e.preventDefault();
+ } else {
+ if (!confirm("Are you sure you want to delete this assembly?")) {
+ e.preventDefault();
+ }
+ }
+ });
+ });
diff --git a/src/app/views/image_factory/assemblies/_properties.haml b/src/app/views/image_factory/assemblies/_properties.haml
new file mode 100644
index 0000000..5f91f6e
--- /dev/null
+++ b/src/app/views/image_factory/assemblies/_properties.haml
< at >< at > -0,0 +1,4 < at >< at >
+.grid_13
+ %h2 #{< at >assembly.name}
+
+ = link_to 'Edit', edit_image_factory_assembly_path(< at >assembly), :class => 'button'
diff --git a/src/app/views/image_factory/assemblies/edit.haml b/src/app/views/image_factory/assemblies/edit.haml
new file mode 100644
index 0000000..04871c3
--- /dev/null
+++ b/src/app/views/image_factory/assemblies/edit.haml
< at >< at > -0,0 +1,4 < at >< at >
+%h2 Editing Assembly: #{< at >assembly.name}
+
+- form_for < at >assembly, :url => image_factory_assembly_path(< at >assembly), :html => { :method => :put } do |f|
+ = render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/image_factory/assemblies/index.haml b/src/app/views/image_factory/assemblies/index.haml
index 766d92c..62ccbc6 100644
--- a/src/app/views/image_factory/assemblies/index.haml
+++ b/src/app/views/image_factory/assemblies/index.haml
< at >< at > -1 +1,2 < at >< at >
-image_factory/assemblies/index.haml
+- content_for :list do
+ = render :partial => 'list'
diff --git a/src/app/views/image_factory/assemblies/new.haml b/src/app/views/image_factory/assemblies/new.haml
new file mode 100644
index 0000000..4763405
--- /dev/null
+++ b/src/app/views/image_factory/assemblies/new.haml
< at >< at > -0,0 +1,3 < at >< at >
+%h2 New Assembly
+- form_for < at >assembly, :url => image_factory_assemblies_path do |f|
+ = render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/image_factory/assemblies/show.haml b/src/app/views/image_factory/assemblies/show.haml
new file mode 100644
index 0000000..05eeedd
--- /dev/null
+++ b/src/app/views/image_factory/assemblies/show.haml
< at >< at > -0,0 +1,5 < at >< at >
+- content_for :list do
+ = render :partial => 'list'
+
+- content_for :details do
+ = render :partial => 'layouts/details_pane'
diff --git a/src/config/routes.rb b/src/config/routes.rb
index ad9fb67..00aaade 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
< at >< at > -39,7 +39,7 < at >< at > ActionController::Routing::Routes.draw do |map|
end
map.namespace 'image_factory' do |r|
- r.resources :assemblies
+ r.resources :assemblies, :collection => { :multi_destroy => :delete }
r.resources :deployables, :collection => { :multi_destroy => :delete }
r.resources :templates, :collection => {:collections => :get, :add_selected => :get, :metagroup_packages => :get, :remove_package => :get, :multi_destroy => :delete}
r.resources :builds
diff --git a/src/db/migrate/20110114111158_create_assemblies.rb b/src/db/migrate/20110114111158_create_assemblies.rb
new file mode 100644
index 0000000..25aaf7b
--- /dev/null
+++ b/src/db/migrate/20110114111158_create_assemblies.rb
< at >< at > -0,0 +1,13 < at >< at >
+class CreateAssemblies < ActiveRecord::Migration
+ def self.up
+ create_table :assemblies do |t|
+ t.string :name
+
+ t.timestamps
+ end
+ end
+
+ def self.down
+ drop_table :assemblies
+ end
+end
diff --git a/src/features/assembly.feature b/src/features/assembly.feature
new file mode 100644
index 0000000..970f1b5
--- /dev/null
+++ b/src/features/assembly.feature
< at >< at > -0,0 +1,50 < at >< at >
+Feature: Manage assemblies
+ In order to manage my cloud infrastructure
+ As a user
+ I want to manage assemblies
+
+ Background:
+ Given I am an authorised user
+ And I am logged in
+ And I am using new UI
+
+ Scenario: List assemblies
+ Given I am on the homepage
+ And there is a assembly named "MySQL cluster"
+ When I go to the image factory assemblies page
+ Then I should see "MySQL cluster"
+
+ Scenario: Create a new Assembly
+ Given there is a assembly named "MySQL cluster"
+ And I am on the image factory assemblies page
+ When I follow "Create"
+ Then I should be on the new image factory assembly page
+ And I should see "New Assembly"
+ When I fill in "assembly[name]" with "App"
+ And I press "Save"
+ Then I should be on App's image factory assembly page
+ And I should see "Assembly added"
+ And I should have a assembly named "App"
+ And I should see "App"
+
+ Scenario: Edit a assembly
+ Given there is a assembly named "MySQL cluster"
+ And I am on the image factory assemblies page
+ When I follow "MySQL cluster"
+ And I follow "Edit"
+ Then I should be on the edit image factory assembly page
+ And I should see "Editing Assembly"
+ When I fill in "assembly[name]" with "AppModified"
+ And I press "Save"
+ Then I should be on AppModified's image factory assembly page
+ And I should see "Assembly updated"
+ And I should have a assembly named "AppModified"
+ And I should see "AppModified"
+
+ Scenario: Delete a assembly
+ Given there is a assembly named "App"
+ And I am on the image factory assemblies page
+ When I check the "App" assembly
+ And I press "Delete"
+ Then I should be on the image factory assemblies page
+ And there should be no assemblies
diff --git a/src/features/step_definitions/assembly_steps.rb b/src/features/step_definitions/assembly_steps.rb
new file mode 100644
index 0000000..cb9c5f0
--- /dev/null
+++ b/src/features/step_definitions/assembly_steps.rb
< at >< at > -0,0 +1,20 < at >< at >
+Then /^there should be no assemblies$/ do
+ Assembly.count.should == 0
+end
+
+Given /^there are no assemblies$/ do
+ Assembly.count.should == 0
+end
+
+Then /^I should have a assembly named "([^"]*)"$/ do |name|
+ Assembly.find_by_name(name).should_not be_nil
+end
+
+Given /^there is a assembly named "([^"]*)"$/ do |name|
+ Assembly.create!(:name => name)
+end
+
+When /^I check the "([^"]*)" assembly$/ do |name|
+ assembly = Assembly.find_by_name(name)
+ check("assembly_checkbox_#{assembly.id}")
+end
diff --git a/src/features/support/paths.rb b/src/features/support/paths.rb
index c0c77dc..dbe0077 100644
--- a/src/features/support/paths.rb
+++ b/src/features/support/paths.rb
< at >< at > -104,6 +104,9 < at >< at > module NavigationHelpers
when /^(.*)'s image factory deployable page$/
image_factory_deployable_path(Deployable.find_by_name($1))
+ when /^(.*)'s image factory assembly page$/
+ image_factory_assembly_path(Assembly.find_by_name($1))
+
# Add more mappings here.
# Here is an example that pulls values out of the Regexp:
#
</pre>lmartinc-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org2011-01-14T11:45:11Search EngineSearch the mailing list at Gmanequery
http://search.gmane.org/?group=$group=gmane.comp.lib.deltacloud.devel