[PATCH conductor 2/5] Removed some methods from warehouse models
jprovazn at redhat.com
jprovazn at redhat.com
Wed Dec 14 14:09:21 UTC 2011
From: Jan Provaznik <jprovazn at redhat.com>
- removed 'provider' from ProviderImage model - in current code
it's easier to check directly provider_name anyway
- removed 'latest_build' from Image model, call replaced with equivalent
latest_pushed_build call from aeolus-image-rubygem
---
src/app/models/image.rb | 4 ----
src/app/models/instance.rb | 4 ++--
src/app/models/provider_image.rb | 5 -----
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/app/models/image.rb b/src/app/models/image.rb
index 053db9d..948cd25 100644
--- a/src/app/models/image.rb
+++ b/src/app/models/image.rb
@@ -30,10 +30,6 @@ class Image < WarehouseModel
end
end
- def latest_build
- ImageBuild.find(@latest_build) if @latest_build
- end
-
def image_builds
ImageBuild.find_all_by_image_uuid(self.uuid)
end
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index d146cce..ce1614b 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
@@ -346,7 +346,7 @@ class Instance < ActiveRecord::Base
errors << I18n.t('instances.errors.image_not_found', :b_uuid=> image_build_uuid, :i_uuid => image_uuid) if image_build.nil? and image.nil?
return [[], errors] unless errors.empty?
- build = image_build || image.latest_build
+ build = image_build || image.latest_pushed_build
provider_images = build ? build.provider_images : []
matched = []
pool.pool_family.provider_accounts.each do |account|
@@ -363,7 +363,7 @@ class Instance < ActiveRecord::Base
errors << I18n.t('instances.errors.hw_profile_match_not_found', :account_name => account.name)
next
end
- account_images = provider_images.select {|pi| pi.provider == account.provider}
+ account_images = provider_images.select {|pi| pi.provider_name == account.provider.name}
if account_images.empty?
errors << I18n.t('instances.errors.image_not_pushed_to_provider', :account_name => account.name)
next
diff --git a/src/app/models/provider_image.rb b/src/app/models/provider_image.rb
index 5a26bd4..b50a196 100644
--- a/src/app/models/provider_image.rb
+++ b/src/app/models/provider_image.rb
@@ -36,9 +36,4 @@ class ProviderImage < WarehouseModel
def provider_name
@provider
end
-
- def provider
- Provider.find_by_name(@provider)
- end
-
end
--
1.7.6
More information about the aeolus-devel
mailing list