From: Jan Provaznik <[email protected]>
- removed useless api.images call
- renamed populate_realms_and_images method to populate_realms
---
src/app/controllers/cloud_accounts_controller.rb | 2 +-
src/app/controllers/pools_controller.rb | 2 +-
src/app/models/cloud_account.rb | 8 +-------
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/app/controllers/cloud_accounts_controller.rb
b/src/app/controllers/cloud_accounts_controller.rb
index 47863d6..f1c55b6 100644
--- a/src/app/controllers/cloud_accounts_controller.rb
+++ b/src/app/controllers/cloud_accounts_controller.rb
@@ -50,7 +50,7 @@ class CloudAccountsController < ApplicationController
@cloud_account.quota_id = quota.id
@cloud_account.zones << Zone.default
@cloud_account.save!
- if request.post? && @cloud_account.save &&
@cloud_account.populate_realms_and_images
+ if request.post? && @cloud_account.save && @cloud_account.populate_realms
flash[:notice] = "Provider account added."
end
redirect_to :controller => "provider", :action => "accounts", :id =>
@provider
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index f699145..244be79 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -130,7 +130,7 @@ class PoolsController < ApplicationController
Pool.transaction do
@pool.cloud_accounts << @cloud_account unless
@pool.cloud_accounts.map{|x| x.id}.include?(@cloud_account.id)
@pool.save!
- @pool.populate_realms_and_images([...@cloud_account])
+ @pool.populate_realms([...@cloud_account])
end
redirect_to :action => 'show', :id => @pool.id
end
diff --git a/src/app/models/cloud_account.rb b/src/app/models/cloud_account.rb
index 1580b8b..466a398 100644
--- a/src/app/models/cloud_account.rb
+++ b/src/app/models/cloud_account.rb
@@ -76,15 +76,9 @@ class CloudAccount < ActiveRecord::Base
end
# FIXME: for already-mapped accounts, update rather than add new
- def populate_realms_and_images
+ def populate_realms
client = connect
realms = client.realms
- # FIXME: the "self" filtering has to go as soon as we have a decent image
selection UI
- if client.driver_name == "ec2"
- images = client.images(:owner_id=>:self)
- else
- images = client.images
- end
# FIXME: this should probably be in the same transaction as
cloud_account.save
self.transaction do
realms.each do |realm|
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
