From: Jozef Zigmund <jzigmund(a)redhat.com>
---
src/app/controllers/builds_controller.rb | 8 +-
src/app/controllers/instances_controller.rb | 4 +-
src/app/models/icicle.rb | 2 +-
src/app/models/image.rb | 16 ++--
src/app/models/legacy_provider_image.rb | 69 ++++++++++++++++++++
src/app/models/provider.rb | 2 +-
src/app/models/provider_image.rb | 69 --------------------
src/app/models/push_job.rb | 6 +-
src/app/models/template.rb | 2 +-
src/app/util/condormatic.rb | 2 +-
src/app/views/templates/_builds.haml | 2 +-
...31_rename_replicated_image_to_provider_image.rb | 4 +-
.../20110221125633_add_uuid_to_providerimage.rb | 4 +-
src/db/migrate/20110222153957_create_icicles.rb | 2 +-
.../20110302120000_add_status_to_provider_image.rb | 16 ++--
src/features/step_definitions/instance_steps.rb | 2 +-
src/features/step_definitions/provider_steps.rb | 4 +-
src/spec/factories/legacy_provider_image.rb | 15 ++++
src/spec/factories/provider_image.rb | 15 ----
src/spec/factories/push_job.rb | 2 +-
src/spec/models/image_spec.rb | 2 +-
src/spec/models/legacy_provider_image_spec.rb | 24 +++++++
src/spec/models/provider_image_spec.rb | 24 -------
src/warehouse_sync/warehouse_sync.rb | 2 +-
24 files changed, 149 insertions(+), 149 deletions(-)
create mode 100644 src/app/models/legacy_provider_image.rb
delete mode 100644 src/app/models/provider_image.rb
create mode 100644 src/spec/factories/legacy_provider_image.rb
delete mode 100644 src/spec/factories/provider_image.rb
create mode 100644 src/spec/models/legacy_provider_image_spec.rb
delete mode 100644 src/spec/models/provider_image_spec.rb
diff --git a/src/app/controllers/builds_controller.rb
b/src/app/controllers/builds_controller.rb
index 4535439..b348b8b 100644
--- a/src/app/controllers/builds_controller.rb
+++ b/src/app/controllers/builds_controller.rb
@@ -23,10 +23,10 @@ class BuildsController < ApplicationController
def upload
@tpl = Template.find(params[:template_id])
- pimg = ProviderImage.create!(
+ pimg = LegacyProviderImage.create!(
:image => Image.find(params[:image_id]),
:provider => Provider.find(params[:provider_id]),
- :status => ProviderImage::STATE_QUEUED
+ :status => LegacyProviderImage::STATE_QUEUED
)
Delayed::Job.enqueue(PushJob.new(pimg.id))
redirect_to template_path(@tpl, :details_tab => 'builds')
@@ -61,7 +61,7 @@ class BuildsController < ApplicationController
flash[:warning] = "could not find image #{image_id}"
end
elsif params[:provider_image_id]
- provider_image = ProviderImage.find(params[:provider_image_id])
+ provider_image = LegacyProviderImage.find(params[:provider_image_id])
if provider_image
provider_image.retry_upload!
flash[:notice] = "Queued upload of provider image
#{provider_image.image.name} to #{provider_image.provider.name}"
@@ -81,7 +81,7 @@ class BuildsController < ApplicationController
def update_status
image = Image.find_by_uuid(params[:uuid])
- image = ProviderImage.find_by_uuid(params[:uuid]) unless image
+ image = LegacyProviderImage.find_by_uuid(params[:uuid]) unless image
if image
image.status = params[:status]
diff --git a/src/app/controllers/instances_controller.rb
b/src/app/controllers/instances_controller.rb
index ca69d32..f75e5eb 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -42,8 +42,8 @@ class InstancesController < ApplicationController
# => TODO: add TEMPLATE_* permissions
@templates = Template.paginate(
:page => params[:page] || 1,
- :include => {:images => :provider_images},
- :conditions => "provider_images.status =
'#{ProviderImage::STATE_COMPLETED}'"
+ :include => {:images => :legacy_provider_images},
+ :conditions => "legacy_provider_images.status =
'#{LegacyProviderImage::STATE_COMPLETED}'"
)
respond_to do |format|
format.html
diff --git a/src/app/models/icicle.rb b/src/app/models/icicle.rb
index a086285..9b16d74 100644
--- a/src/app/models/icicle.rb
+++ b/src/app/models/icicle.rb
@@ -16,7 +16,7 @@ class Icicle < ActiveRecord::Base
validates_presence_of :uuid
validates_uniqueness_of :uuid
- belongs_to :provider_image
+ belongs_to :legacy_provider_image
def self.create_or_update(uuid)
icicle = Icicle.find_by_uuid(uuid) || Icicle.new(:uuid => uuid)
diff --git a/src/app/models/image.rb b/src/app/models/image.rb
index 00a674b..b4d2600 100644
--- a/src/app/models/image.rb
+++ b/src/app/models/image.rb
@@ -48,8 +48,8 @@ class Image < ActiveRecord::Base
@@per_page = 15
belongs_to :template, :counter_cache => true
- has_many :provider_images, :dependent => :destroy
- has_many :providers, :through => :provider_images
+ has_many :legacy_provider_images, :dependent => :destroy
+ has_many :providers, :through => :legacy_provider_images
belongs_to :provider_type
validates_presence_of :name
@@ -91,12 +91,12 @@ class Image < ActiveRecord::Base
end
self.status = STATE_QUEUED
self.save!
- self.provider_images.each {|pimg| pimg.destroy}
+ self.legacy_provider_images.each {|pimg| pimg.destroy}
Delayed::Job.enqueue(BuildJob.new(self.id))
end
def not_uploaded_providers
- uploaded = self.provider_images
+ uploaded = self.legacy_provider_images
Provider.all(:conditions => {:provider_type_id =>
self.provider_type.id}).select do |p|
not uploaded.detect {|pimg| pimg.provider_id == p.id}
end
@@ -144,7 +144,7 @@ class Image < ActiveRecord::Base
raise "There is no image with '#{image_id}' id"
end
- if ProviderImage.find_by_provider_id_and_provider_image_key(account.provider.id,
image_id)
+ if
LegacyProviderImage.find_by_provider_id_and_provider_image_key(account.provider.id,
image_id)
raise "Image '#{image_id}' is already imported"
end
@@ -173,7 +173,7 @@ class Image < ActiveRecord::Base
image.upload
image.save!
- rep = ProviderImage.new(
+ rep = LegacyProviderImage.new(
:image_id => image.id,
:provider_id => account.provider.id,
:provider_image_key => image_id,
@@ -218,10 +218,10 @@ class Image < ActiveRecord::Base
provider_type.providers.each do |p|
# upload only to providers with account
unless p.provider_accounts.empty?
- pimg = ProviderImage.create!(
+ pimg = LegacyProviderImage.create!(
:image => self,
:provider => p,
- :status => ProviderImage::STATE_QUEUED
+ :status => LegacyProviderImage::STATE_QUEUED
)
Delayed::Job.enqueue(PushJob.new(pimg.id))
end
diff --git a/src/app/models/legacy_provider_image.rb
b/src/app/models/legacy_provider_image.rb
new file mode 100644
index 0000000..0948348
--- /dev/null
+++ b/src/app/models/legacy_provider_image.rb
@@ -0,0 +1,69 @@
+# == Schema Information
+# Schema version: 20110302120000
+#
+# Table name: provider_images
+#
+# id :integer not null, primary key
+# image_id :integer not null
+# provider_id :integer not null
+# provider_image_key :string(255)
+# uuid :string(255)
+# status :string(255)
+#
+
+class LegacyProviderImage < ActiveRecord::Base
+ include ImageWarehouseObject
+
+ belongs_to :provider
+ belongs_to :image
+ has_one :icicle, :dependent => :destroy
+
+ validates_presence_of :provider_id
+ validates_presence_of :image_id
+ validates_uniqueness_of :uuid, :allow_nil => true
+ validates_uniqueness_of :image_id, :scope => :provider_id
+
+ STATE_QUEUED = 'queued'
+ STATE_COMPLETED = 'completed'
+ STATE_CANCELED = 'canceled'
+ STATE_FAILED = 'failed'
+
+ ACTIVE_STATES = [ STATE_QUEUED ]
+ INACTIVE_STATES = [STATE_COMPLETED, STATE_FAILED, STATE_CANCELED]
+
+ def after_update
+ if self.status_changed? and self.status == STATE_COMPLETED
+ safe_warehouse_sync
+ end
+ end
+
+ def retry_upload!
+ self.status = STATE_QUEUED
+ self.save!
+ Delayed::Job.enqueue(PushJob.new(self.id))
+ end
+
+ def warehouse_bucket
+ 'legacy_provider_images'
+ end
+
+ def warehouse_sync
+ bucket = warehouse.bucket(warehouse_bucket)
+ raise WarehouseObjectNotFoundError unless bucket.include?(self.uuid)
+ obj = bucket.object(self.uuid)
+ attrs = obj.attrs([:uuid, :image, :icicle, :target_identifier])
+ unless attrs[:image]
+ raise "image uuid is not set"
+ end
+ unless img = Image.find_by_uuid(attrs[:image])
+ raise "image with uuid #{attrs[:image]} not found"
+ end
+ begin
+ self.icicle = Icicle.create_or_update(attrs[:icicle])
+ rescue
+ logger.error "Failed to fetch icicle '#{attrs[:icicle]}', setting
icicle to nil: #{$!.message}"
+ end
+ self.image_id = img.id
+ self.provider_image_key = attrs[:target_identifier]
+ end
+end
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb
index fa42beb..f1e648e 100644
--- a/src/app/models/provider.rb
+++ b/src/app/models/provider.rb
@@ -45,7 +45,7 @@ class Provider < ActiveRecord::Base
has_many :provider_accounts, :dependent => :destroy
has_many :hardware_profiles, :dependent => :destroy
- has_many :provider_images, :dependent => :destroy
+ has_many :legacy_provider_images, :dependent => :destroy
has_many :realms, :dependent => :destroy
has_many :realm_backend_targets, :as => :realm_or_provider
has_many :frontend_realms, :through => :realm_backend_targets
diff --git a/src/app/models/provider_image.rb b/src/app/models/provider_image.rb
deleted file mode 100644
index 23e9d6a..0000000
--- a/src/app/models/provider_image.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# == Schema Information
-# Schema version: 20110302120000
-#
-# Table name: provider_images
-#
-# id :integer not null, primary key
-# image_id :integer not null
-# provider_id :integer not null
-# provider_image_key :string(255)
-# uuid :string(255)
-# status :string(255)
-#
-
-class ProviderImage < ActiveRecord::Base
- include ImageWarehouseObject
-
- belongs_to :provider
- belongs_to :image
- has_one :icicle, :dependent => :destroy
-
- validates_presence_of :provider_id
- validates_presence_of :image_id
- validates_uniqueness_of :uuid, :allow_nil => true
- validates_uniqueness_of :image_id, :scope => :provider_id
-
- STATE_QUEUED = 'queued'
- STATE_COMPLETED = 'completed'
- STATE_CANCELED = 'canceled'
- STATE_FAILED = 'failed'
-
- ACTIVE_STATES = [ STATE_QUEUED ]
- INACTIVE_STATES = [STATE_COMPLETED, STATE_FAILED, STATE_CANCELED]
-
- def after_update
- if self.status_changed? and self.status == STATE_COMPLETED
- safe_warehouse_sync
- end
- end
-
- def retry_upload!
- self.status = STATE_QUEUED
- self.save!
- Delayed::Job.enqueue(PushJob.new(self.id))
- end
-
- def warehouse_bucket
- 'provider_images'
- end
-
- def warehouse_sync
- bucket = warehouse.bucket(warehouse_bucket)
- raise WarehouseObjectNotFoundError unless bucket.include?(self.uuid)
- obj = bucket.object(self.uuid)
- attrs = obj.attrs([:uuid, :image, :icicle, :target_identifier])
- unless attrs[:image]
- raise "image uuid is not set"
- end
- unless img = Image.find_by_uuid(attrs[:image])
- raise "image with uuid #{attrs[:image]} not found"
- end
- begin
- self.icicle = Icicle.create_or_update(attrs[:icicle])
- rescue
- logger.error "Failed to fetch icicle '#{attrs[:icicle]}', setting
icicle to nil: #{$!.message}"
- end
- self.image_id = img.id
- self.provider_image_key = attrs[:target_identifier]
- end
-end
diff --git a/src/app/models/push_job.rb b/src/app/models/push_job.rb
index 9983953..d96d63e 100644
--- a/src/app/models/push_job.rb
+++ b/src/app/models/push_job.rb
@@ -19,12 +19,12 @@
require 'rest_client'
require 'nokogiri'
-class PushJob < Struct.new(:provider_image_id, :hydra)
+class PushJob < Struct.new(:legacy_provider_image_id, :hydra)
def perform
@logger = Delayed::Worker.logger
@logger.info "--- start ---"
- @logger.info "PushJob for provider_image_id: #{provider_image_id}"
- provider_image = ProviderImage.find(provider_image_id)
+ @logger.info "PushJob for legacy_provider_image_id:
#{legacy_provider_image_id}"
+ provider_image = LegacyProviderImage.find(legacy_provider_image_id)
# TODO: what if a provider has multiple accounts
# for now pick first account
provider_account = provider_image.provider.provider_accounts.first
diff --git a/src/app/models/template.rb b/src/app/models/template.rb
index 004a47b..d9fd831 100644
--- a/src/app/models/template.rb
+++ b/src/app/models/template.rb
@@ -92,7 +92,7 @@ class Template < ActiveRecord::Base
def providers
# TODO: rewrite cleanly
- ProviderImage.all(
+ LegacyProviderImage.all(
:include => [:image, :provider],
:conditions => {:images => {:template_id => self.id}}
).map {|p| p.provider}
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index 60fd2f0..31dd5bb 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -48,7 +48,7 @@ def match(instance)
hwp = HardwareProfile.match_provider_hardware_profile(account.provider,
instance.hardware_profile)
- provider_images = hwp.provider.provider_images.find(:all,
+ provider_images = hwp.provider.legacy_provider_images.find(:all,
:conditions =>
['provider_image_key IS NOT NULL'])
provider_images.each do |pi|
if pi.image.template.id != template_id
diff --git a/src/app/views/templates/_builds.haml b/src/app/views/templates/_builds.haml
index 0431fbd..b546ae8 100644
--- a/src/app/views/templates/_builds.haml
+++ b/src/app/views/templates/_builds.haml
@@ -26,7 +26,7 @@ Builds for
= submit_tag "Retry build", :name => "build"
- if img.status == Image::STATE_COMPLETED
%ul
- - img.provider_images.each do |pimg|
+ - img.legacy_provider_images.each do |pimg|
%li
- form_tag(retry_builds_path, { :method => :post }) do
= "#{pimg.provider.name}: #{pimg.status}"
diff --git a/src/db/migrate/20110207110131_rename_replicated_image_to_provider_image.rb
b/src/db/migrate/20110207110131_rename_replicated_image_to_provider_image.rb
index 0e3f60c..7fe8691 100644
--- a/src/db/migrate/20110207110131_rename_replicated_image_to_provider_image.rb
+++ b/src/db/migrate/20110207110131_rename_replicated_image_to_provider_image.rb
@@ -1,9 +1,9 @@
class RenameReplicatedImageToProviderImage < ActiveRecord::Migration
def self.up
- rename_table :replicated_images, :provider_images
+ rename_table :replicated_images, :legacy_provider_images
end
def self.down
- rename_table :provider_images, :replicated_images
+ rename_table :legacy_provider_images, :replicated_images
end
end
diff --git a/src/db/migrate/20110221125633_add_uuid_to_providerimage.rb
b/src/db/migrate/20110221125633_add_uuid_to_providerimage.rb
index 6964437..76ac856 100644
--- a/src/db/migrate/20110221125633_add_uuid_to_providerimage.rb
+++ b/src/db/migrate/20110221125633_add_uuid_to_providerimage.rb
@@ -1,9 +1,9 @@
class AddUuidToProviderimage < ActiveRecord::Migration
def self.up
- add_column :provider_images, :uuid, :string
+ add_column :legacy_provider_images, :uuid, :string
end
def self.down
- remove_column :provider_images, :uuid
+ remove_column :legacy_provider_images, :uuid
end
end
diff --git a/src/db/migrate/20110222153957_create_icicles.rb
b/src/db/migrate/20110222153957_create_icicles.rb
index ccaf592..43fd5d6 100644
--- a/src/db/migrate/20110222153957_create_icicles.rb
+++ b/src/db/migrate/20110222153957_create_icicles.rb
@@ -3,7 +3,7 @@ class CreateIcicles < ActiveRecord::Migration
create_table :icicles do |t|
t.string :uuid
t.text :xml
- t.integer :provider_image_id
+ t.integer :legacy_provider_image_id
t.timestamps
end
end
diff --git a/src/db/migrate/20110302120000_add_status_to_provider_image.rb
b/src/db/migrate/20110302120000_add_status_to_provider_image.rb
index f5f9c5c..9225021 100644
--- a/src/db/migrate/20110302120000_add_status_to_provider_image.rb
+++ b/src/db/migrate/20110302120000_add_status_to_provider_image.rb
@@ -1,7 +1,7 @@
class AddStatusToProviderImage < ActiveRecord::Migration
def self.up
- add_column :provider_images, :status, :string
- ProviderImage.all.each do |image|
+ add_column :legacy_provider_images, :status, :string
+ LegacyProviderImage.all.each do |image|
if image.uploaded
image.status = 'completed'
else
@@ -9,14 +9,14 @@ class AddStatusToProviderImage < ActiveRecord::Migration
end
image.save!
end
- remove_column :provider_images, :uploaded
- remove_column :provider_images, :registered
+ remove_column :legacy_provider_images, :uploaded
+ remove_column :legacy_provider_images, :registered
end
def self.down
- add_column :provider_images, :uploaded, :boolean
- add_column :provider_images, :registered, :boolean
- ProviderImage.all.each do |image|
+ add_column :legacy_provider_images, :uploaded, :boolean
+ add_column :legacy_provider_images, :registered, :boolean
+ LegacyProviderImage.all.each do |image|
if image.status == 'completed'
image.uploaded = true
image.registered = true
@@ -26,6 +26,6 @@ class AddStatusToProviderImage < ActiveRecord::Migration
end
image.save!
end
- remove_column :provider_images, :status
+ remove_column :legacy_provider_images, :status
end
end
diff --git a/src/features/step_definitions/instance_steps.rb
b/src/features/step_definitions/instance_steps.rb
index 8f69cb0..52a8a47 100644
--- a/src/features/step_definitions/instance_steps.rb
+++ b/src/features/step_definitions/instance_steps.rb
@@ -56,7 +56,7 @@ Given /^there is a "([^"]*)" stopped instance$/ do
|name|
end
Given /^there is an uploaded image for a template$/ do
- Factory :provider_image
+ Factory :legacy_provider_image
end
Given /^there is "([^"]*)" conductor hardware profile$/ do |name|
diff --git a/src/features/step_definitions/provider_steps.rb
b/src/features/step_definitions/provider_steps.rb
index 334e7d1..5f5a637 100644
--- a/src/features/step_definitions/provider_steps.rb
+++ b/src/features/step_definitions/provider_steps.rb
@@ -37,7 +37,7 @@ Given /^there are these providers:$/ do |table|
end
Given /^this provider has (\d+) provider images$/ do |number|
- number.to_i.times { |i| Factory(:provider_image, :provider => @provider) }
+ number.to_i.times { |i| Factory(:legacy_provider_image, :provider => @provider) }
end
Given /^this provider has (\d+) hardware profiles$/ do |number|
@@ -54,7 +54,7 @@ Given /^this provider has a provider account$/ do
end
Then /^there should not be any provider images$/ do
- ProviderImage.find(:all, :conditions => { :provider_id => @provider.id}
).size.should == 0
+ LegacyProviderImage.find(:all, :conditions => { :provider_id => @provider.id}
).size.should == 0
end
Then /^there should not be any hardware profiles$/ do
diff --git a/src/spec/factories/legacy_provider_image.rb
b/src/spec/factories/legacy_provider_image.rb
new file mode 100644
index 0000000..a00728c
--- /dev/null
+++ b/src/spec/factories/legacy_provider_image.rb
@@ -0,0 +1,15 @@
+Factory.define :legacy_provider_image do |ri|
+ ri.association :image
+ ri.association :provider
+ ri.sequence(:provider_image_key) { |n| "provider_image_key#(n)" }
+ ri.status "completed"
+ ri.association :icicle
+end
+
+Factory.define :mock_provider_image, :parent => :legacy_provider_image do |i|
+ i.provider { |p| p.association(:mock_provider) }
+end
+
+Factory.define :ec2_provider_image, :parent => :legacy_provider_image do |i|
+ i.provider { |p| p.association(:ec2_provider) }
+end
diff --git a/src/spec/factories/provider_image.rb b/src/spec/factories/provider_image.rb
deleted file mode 100644
index 06c5645..0000000
--- a/src/spec/factories/provider_image.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-Factory.define :provider_image do |ri|
- ri.association :image
- ri.association :provider
- ri.sequence(:provider_image_key) { |n| "provider_image_key#(n)" }
- ri.status "completed"
- ri.association :icicle
-end
-
-Factory.define :mock_provider_image, :parent => :provider_image do |i|
- i.provider { |p| p.association(:mock_provider) }
-end
-
-Factory.define :ec2_provider_image, :parent => :provider_image do |i|
- i.provider { |p| p.association(:ec2_provider) }
-end
diff --git a/src/spec/factories/push_job.rb b/src/spec/factories/push_job.rb
index 7110339..4bd917c 100644
--- a/src/spec/factories/push_job.rb
+++ b/src/spec/factories/push_job.rb
@@ -1,3 +1,3 @@
Factory.define :push_job do |p|
- p.provider_image_id { Factory.create(:provider_image, :provider =>
Factory.create(:mock_provider_account).provider).id }
+ p.legacy_provider_image_id { Factory.create(:legacy_provider_image, :provider =>
Factory.create(:mock_provider_account).provider).id }
end
diff --git a/src/spec/models/image_spec.rb b/src/spec/models/image_spec.rb
index 001b197..6299aef 100644
--- a/src/spec/models/image_spec.rb
+++ b/src/spec/models/image_spec.rb
@@ -70,6 +70,6 @@ describe Image do
img.template.uploaded.should be_true
end.should change(Image, :count).by(1)
end.should change(Template, :count).by(1)
- end.should change(ProviderImage, :count).by(1)
+ end.should change(LegacyProviderImage, :count).by(1)
end
end
diff --git a/src/spec/models/legacy_provider_image_spec.rb
b/src/spec/models/legacy_provider_image_spec.rb
new file mode 100644
index 0000000..d2a7f2f
--- /dev/null
+++ b/src/spec/models/legacy_provider_image_spec.rb
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe LegacyProviderImage do
+ it "should have a provider_id" do
+ i = Factory.build(:mock_provider_image)
+ i.should be_valid
+ i.provider = nil
+ i.should_not be_valid
+ end
+
+ it "should have an image_id" do
+ i = Factory.build(:mock_provider_image)
+ i.should be_valid
+ i.image = nil
+ i.should_not be_valid
+ end
+
+ it "should have a unique uuid" do
+ i = Factory(:mock_provider_image, :uuid => '1')
+ i.should be_valid
+ i = Factory.build(:mock_provider_image, :uuid => '1')
+ i.should_not be_valid
+ end
+end
diff --git a/src/spec/models/provider_image_spec.rb
b/src/spec/models/provider_image_spec.rb
deleted file mode 100644
index 419d976..0000000
--- a/src/spec/models/provider_image_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe ProviderImage do
- it "should have a provider_id" do
- i = Factory.build(:mock_provider_image)
- i.should be_valid
- i.provider = nil
- i.should_not be_valid
- end
-
- it "should have an image_id" do
- i = Factory.build(:mock_provider_image)
- i.should be_valid
- i.image = nil
- i.should_not be_valid
- end
-
- it "should have a unique uuid" do
- i = Factory(:mock_provider_image, :uuid => '1')
- i.should be_valid
- i = Factory.build(:mock_provider_image, :uuid => '1')
- i.should_not be_valid
- end
-end
diff --git a/src/warehouse_sync/warehouse_sync.rb b/src/warehouse_sync/warehouse_sync.rb
index 37f7bab..adcbb5e 100644
--- a/src/warehouse_sync/warehouse_sync.rb
+++ b/src/warehouse_sync/warehouse_sync.rb
@@ -34,7 +34,7 @@ class WarehouseSync
end
end
@logger.info "*** syncing provider images"
- ProviderImage.all.each do |i|
+ LegacyProviderImage.all.each do |i|
i.safe_warehouse_sync
if i.changed?
i.save! rescue @logger.error "failed to save image #{i.uuid}:
#{$!.message}"
--
1.7.4.4