5:10 p.m.
https://bugzilla.redhat.com/show_bug.cgi?id=796783
---
lib/aeolus_image/import.rb | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/aeolus_image/import.rb b/lib/aeolus_image/import.rb
index fe0ce22..2e5a9d2 100644
--- a/lib/aeolus_image/import.rb
+++ b/lib/aeolus_image/import.rb
@@ -14,7 +14,7 @@
module Aeolus
module Image
- def self.import(provider_name, deltacloud_driver, image_id, account_id, xml=nil)
+ def self.import(provider_name, deltacloud_driver, image_id, account_id, environment,
xml=nil)
xml ||=
"<image><name>#{image_id}</name></image>"
image = Factory::Image.new(
:target_name => deltacloud_driver,
@@ -25,7 +25,8 @@ module Aeolus
image.save!
# Set the provider_account_id on the image
iwhd_image = Warehouse::Image.find(image.id)
- # Set the account on the provider image
+ iwhd_image.set_attr("environment", environment)
+ # Set the account on the provider image
# This assumes (as is currently correct) that there will only be one provider image
for imported images
pimg = iwhd_image.provider_images.first
pimg.set_attr('provider_account_identifier', account_id)
--
1.7.6.4
5:10 p.m.
New subject: [PATCH Conductor] Bug 796783: fixes lingering errors w/ image import
https://bugzilla.redhat.com/show_bug.cgi?id=796783
---
src/app/controllers/images_controller.rb | 2 +-
src/lib/image.rb | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/app/controllers/images_controller.rb
b/src/app/controllers/images_controller.rb
index 0c6b350..fb5f5f0 100644
--- a/src/app/controllers/images_controller.rb
+++ b/src/app/controllers/images_controller.rb
@@ -50,7 +50,7 @@ class ImagesController < ApplicationController
type = provider.provider_type
acct = ProviderAccount.enabled.find_by_provider_name_and_login(provider.name,
pimg.provider_account_identifier)
raise unless acct
- @account_groups = {type.deltacloud_driver => {:type => type, :accounts
=> [[acct,(a)environment.provider_accounts.include?(acct)]]}}
+ @account_groups = {type.deltacloud_driver => {:type => type, :accounts
=> [{:account => acct,:included =>
@environment.provider_accounts.include?(acct)}]}}
rescue Exception => e
@account_groups = ProviderAccount.enabled.group_by_type(@environment)
end
diff --git a/src/lib/image.rb b/src/lib/image.rb
index b9ce9b7..9911703 100644
--- a/src/lib/image.rb
+++ b/src/lib/image.rb
@@ -27,8 +27,7 @@ class Image
xml ||= "<image><name>#{img.name}</name></image>"
if img.name.present?
provider = provider_account.provider
account_id = provider_account.credentials_hash['username']
- image = Aeolus::Image.import(provider.name, provider.provider_type.deltacloud_driver,
image_id, account_id, xml)
- image.set_attr("environment", environment.name)
+ image = Aeolus::Image.import(provider.name, provider.provider_type.deltacloud_driver,
image_id, account_id, environment.name, xml)
image
end
end
--
1.7.6.4
6:32 p.m.
On 02/23/2012 03:10 PM, Scott Seago wrote:
https://bugzilla.redhat.com/show_bug.cgi?id=796783
---
lib/aeolus_image/import.rb | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/aeolus_image/import.rb b/lib/aeolus_image/import.rb
index fe0ce22..2e5a9d2 100644
--- a/lib/aeolus_image/import.rb
+++ b/lib/aeolus_image/import.rb
@@ -14,7 +14,7 @@
module Aeolus
module Image
- def self.import(provider_name, deltacloud_driver, image_id, account_id, xml=nil)
+ def self.import(provider_name, deltacloud_driver, image_id, account_id, environment,
xml=nil)
xml ||=
"<image><name>#{image_id}</name></image>"
image = Factory::Image.new(
:target_name => deltacloud_driver,
@@ -25,7 +25,8 @@ module Aeolus
image.save!
# Set the provider_account_id on the image
iwhd_image = Warehouse::Image.find(image.id)
- # Set the account on the provider image
+ iwhd_image.set_attr("environment", environment)
+ # Set the account on the provider image
# This assumes (as is currently correct) that there will only be one provider
image for imported images
pimg = iwhd_image.provider_images.first
pimg.set_attr('provider_account_identifier', account_id)
Ack and pushed.
6:32 p.m.
New subject: [PATCH Conductor] Bug 796783: fixes lingering errors w/ image import
On 02/23/2012 03:10 PM, Scott Seago wrote:
https://bugzilla.redhat.com/show_bug.cgi?id=796783
---
src/app/controllers/images_controller.rb | 2 +-
src/lib/image.rb | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/app/controllers/images_controller.rb
b/src/app/controllers/images_controller.rb
index 0c6b350..fb5f5f0 100644
--- a/src/app/controllers/images_controller.rb
+++ b/src/app/controllers/images_controller.rb
@@ -50,7 +50,7 @@ class ImagesController< ApplicationController
type = provider.provider_type
acct = ProviderAccount.enabled.find_by_provider_name_and_login(provider.name,
pimg.provider_account_identifier)
raise unless acct
- @account_groups = {type.deltacloud_driver => {:type => type, :accounts
=> [[acct,(a)environment.provider_accounts.include?(acct)]]}}
+ @account_groups = {type.deltacloud_driver => {:type => type, :accounts
=> [{:account => acct,:included =>
@environment.provider_accounts.include?(acct)}]}}
rescue Exception => e
@account_groups = ProviderAccount.enabled.group_by_type(@environment)
end
diff --git a/src/lib/image.rb b/src/lib/image.rb
index b9ce9b7..9911703 100644
--- a/src/lib/image.rb
+++ b/src/lib/image.rb
@@ -27,8 +27,7 @@ class Image
xml ||= "<image><name>#{img.name}</name></image>"
if img.name.present?
provider = provider_account.provider
account_id = provider_account.credentials_hash['username']
- image = Aeolus::Image.import(provider.name,
provider.provider_type.deltacloud_driver, image_id, account_id, xml)
- image.set_attr("environment", environment.name)
+ image = Aeolus::Image.import(provider.name,
provider.provider_type.deltacloud_driver, image_id, account_id, environment.name, xml)
image
end
end
Ack and pushed.
4470
days inactive
4471
days old
aeolus-devel@lists.fedorahosted.org
3 comments
2 participants
participants (2)
-
Richard Su -
Scott Seago