From: Jozef Zigmund <[email protected]>
In this patch I rename relationships in other models, that they have some
relationship with ProviderAccount. Also I refactored all code, which is calling
model.cloud_account/s to model.provider_account/s.
---
.../controllers/provider_accounts_controller.rb | 2 +-
src/app/models/instance.rb | 2 +-
src/app/models/instance_observer.rb | 2 +-
src/app/models/instance_task.rb | 2 +-
src/app/models/pool.rb | 4 ++--
src/app/models/pool_family.rb | 2 +-
src/app/models/provider.rb | 6 +++---
src/app/models/quota.rb | 2 +-
src/app/services/graph_service.rb | 2 +-
src/app/util/condormatic.rb | 2 +-
src/app/views/instances/index.haml | 2 +-
src/app/views/instances/show.haml | 2 +-
src/app/views/providers/accounts.haml | 6 +++---
src/app/views/resources/instances/_list.haml | 2 +-
src/app/views/resources/instances/_properties.haml | 2 +-
src/image_builder_service/image_builder_service | 2 +-
src/lib/tasks/dc_tasks.rake | 2 +-
src/spec/models/pool_family_spec.rb | 4 ++--
src/spec/models/provider_spec.rb | 2 +-
19 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/app/controllers/provider_accounts_controller.rb
b/src/app/controllers/provider_accounts_controller.rb
index 9fbf126..a902150 100644
--- a/src/app/controllers/provider_accounts_controller.rb
+++ b/src/app/controllers/provider_accounts_controller.rb
@@ -89,7 +89,7 @@ class ProviderAccountsController < ApplicationController
@providers = Provider.list_for_user(@current_user, Privilege::VIEW)
success = true
- @provider.cloud_accounts.each do |cloud_account|
+ @provider.provider_accounts.each do |cloud_account|
attributes = params[:cloud_accounts][cloud_account.id.to_s]
password = attributes[:password]
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index b84a596..3d24404 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
@@ -36,7 +36,7 @@ class Instance < ActiveRecord::Base
@@per_page = 15
belongs_to :pool
- belongs_to :cloud_account
+ belongs_to :provider_account
belongs_to :hardware_profile
belongs_to :template
diff --git a/src/app/models/instance_observer.rb
b/src/app/models/instance_observer.rb
index 80b39c5..157ac39 100644
--- a/src/app/models/instance_observer.rb
+++ b/src/app/models/instance_observer.rb
@@ -36,7 +36,7 @@ class InstanceObserver < ActiveRecord::Observer
hwp = an_instance.hardware_profile
pool = an_instance.pool
user = an_instance.owner
- cloud_account = an_instance.cloud_account
+ cloud_account = an_instance.provider_account
[cloud_account, pool, user].each do |parent|
if parent
diff --git a/src/app/models/instance_task.rb b/src/app/models/instance_task.rb
index be76a6e..42bed29 100644
--- a/src/app/models/instance_task.rb
+++ b/src/app/models/instance_task.rb
@@ -46,7 +46,7 @@ class InstanceTask < Task
actions = []
# FIXME: cloud_account won't always be set here, but we're requiring
# front end realm for now.
- if cloud_account = instance.cloud_account and
+ if cloud_account = instance.provider_account and
conn = cloud_account.connect and c_state = conn.instance_state(state)
transitions = c_state.transitions
transitions.each do |transition|
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index 550ca79..0f9a4fb 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -47,8 +47,8 @@ class Pool < ActiveRecord::Base
def cloud_accounts
accounts = []
instances.each do |instance|
- if instance.cloud_account and !accounts.include?(instance.cloud_account)
- accounts << instance.cloud_account
+ if instance.provider_account and
!accounts.include?(instance.provider_account)
+ accounts << instance.provider_account
end
end
end
diff --git a/src/app/models/pool_family.rb b/src/app/models/pool_family.rb
index bc96fee..e083920 100644
--- a/src/app/models/pool_family.rb
+++ b/src/app/models/pool_family.rb
@@ -24,7 +24,7 @@ class PoolFamily < ActiveRecord::Base
DEFAULT_POOL_FAMILY_KEY = "default_pool_family"
has_many :pools, :dependent => :destroy
- has_and_belongs_to_many :cloud_accounts
+ has_and_belongs_to_many :provider_accounts
validates_presence_of :name
validates_uniqueness_of :name
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb
index affe1ae..d2c9dfb 100644
--- a/src/app/models/provider.rb
+++ b/src/app/models/provider.rb
@@ -55,8 +55,8 @@ class Provider < ActiveRecord::Base
# but a cloud account is silently not destroyed when there is
# an instance for the cloud account
def destroyable?
- unless self.cloud_accounts.empty?
- self.cloud_accounts.each do |c|
+ unless self.provider_accounts.empty?
+ self.provider_accounts.each do |c|
unless c.instances.empty?
inst_list = c.instances.map {|i| i.name}.join(', ')
self.errors.add_to_base "there are instances for cloud account
'#{c.name}': #{inst_list}"
@@ -122,7 +122,7 @@ class Provider < ActiveRecord::Base
# returns first provider of cloud_type which has at least one cloud account
def self.find_by_target_with_account(cloud_type)
Provider.all(:conditions => {:cloud_type => cloud_type}).each do |p|
- return p unless p.cloud_accounts.empty?
+ return p unless p.provider_accounts.empty?
end
nil
end
diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb
index 9f79e04..acb001a 100644
--- a/src/app/models/quota.rb
+++ b/src/app/models/quota.rb
@@ -22,7 +22,7 @@
class Quota < ActiveRecord::Base
has_one :pool
- has_one :cloud_account
+ has_one :provider_account
has_one :user
validates_numericality_of :maximum_total_instances,
diff --git a/src/app/services/graph_service.rb
b/src/app/services/graph_service.rb
index d85f0c3..c5f3065 100644
--- a/src/app/services/graph_service.rb
+++ b/src/app/services/graph_service.rb
@@ -126,7 +126,7 @@ class GraphService
providers = Provider.all
providers.each do |provider|
running_instances = 0
- provider.cloud_accounts.each do |account|
+ provider.provider_accounts.each do |account|
running_instances = running_instances +
account.quota.running_instances if account.quota
end
if running_instances > 0
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index 8b4e224..da265c0 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -216,7 +216,7 @@ def condormatic_classads_sync
# to it.
replicated_images = provider.replicated_images.find(:all,
:conditions => ['provider_image_key IS NOT NULL'])
- accounts = provider.cloud_accounts
+ accounts = provider.provider_accounts
hardware_profiles = provider.hardware_profiles
realms = provider.realms
accounts.each { |account|
diff --git a/src/app/views/instances/index.haml
b/src/app/views/instances/index.haml
index e33041e..8bbbb2a 100644
--- a/src/app/views/instances/index.haml
+++ b/src/app/views/instances/index.haml
@@ -123,5 +123,5 @@
%td= inst.hardware_profile.name
%td= inst.template.name
%td= inst.public_addresses
- %td= inst.cloud_account ? inst.cloud_account.provider.name : ''
+ %td= inst.provider_account ?
inst.provider_account.provider.name : ''
%td= owner_name(inst)
diff --git a/src/app/views/instances/show.haml
b/src/app/views/instances/show.haml
index 33b2897..7eab76e 100644
--- a/src/app/views/instances/show.haml
+++ b/src/app/views/instances/show.haml
@@ -18,7 +18,7 @@
%span= "#{@instance.template.xml.platform}
#{@instance.template.xml.platform_version}"
%li
= label_tag :provider, 'Provider'
- %span= @instance.cloud_account.provider.name if @instance.cloud_account
+ %span= @instance.provider_account.provider.name if
@instance.provider_account
%li
= label_tag :base_template, 'Base Template'
%span= @instance.template.name
diff --git a/src/app/views/providers/accounts.haml
b/src/app/views/providers/accounts.haml
index 984f257..63d42af 100644
--- a/src/app/views/providers/accounts.haml
+++ b/src/app/views/providers/accounts.haml
@@ -11,7 +11,7 @@
= t('.provider_accounts')
- form_tag ({:controller => 'cloud_accounts', :action =>
'update_accounts'}), :multipart => true do
= hidden_field :provider, :id, :value => @provider.id
- - @provider.cloud_accounts.each do |acct|
+ - @provider.provider_accounts.each do |acct|
%fieldset.clearfix.nomargin
%label.grid_4.la.alpha
= t('.account_name')
@@ -61,8 +61,8 @@
%a.button{ :href => remove_path, :name => "remove_acc_#{acct.id}",
:class => "tiny #{'disabled' unless remove_path}" }
= t(:remove)
%fieldset.clearfix.gap
- = link_to t(:reset), {:controller => 'provider', :action =>
'accounts', :id => @provider.id}, :class => "button dialogbutton" unless
@provider.cloud_accounts.empty?
- = submit_tag t(:save), :name => 'update_cloud_accounts', :class =>
"dialogbutton" unless @provider.cloud_accounts.empty?
+ = link_to t(:reset), {:controller => 'provider', :action =>
'accounts', :id => @provider.id}, :class => "button dialogbutton" unless
@provider.provider_accounts.empty?
+ = submit_tag t(:save), :name => 'update_cloud_accounts', :class =>
"dialogbutton" unless @provider.provider_accounts.empty?
%h2
= t('.new_provider_account')
diff --git a/src/app/views/resources/instances/_list.haml
b/src/app/views/resources/instances/_list.haml
index a83b565..b62d9e7 100644
--- a/src/app/views/resources/instances/_list.haml
+++ b/src/app/views/resources/instances/_list.haml
@@ -19,5 +19,5 @@
%td= inst.state
%td= inst.template.name
%td= inst.public_addresses
- %td= inst.cloud_account ? inst.cloud_account.provider.name : ''
+ %td= inst.provider_account ? inst.provider_account.provider.name : ''
%td= owner_name(inst)
diff --git a/src/app/views/resources/instances/_properties.haml
b/src/app/views/resources/instances/_properties.haml
index 5283e20..d14843c 100644
--- a/src/app/views/resources/instances/_properties.haml
+++ b/src/app/views/resources/instances/_properties.haml
@@ -16,7 +16,7 @@
%span= "#{@instance.template.xml.platform}
#{@instance.template.xml.platform_version}"
%li
= label_tag :provider, 'Provider'
- %span= @instance.cloud_account.provider.name if @instance.cloud_account
+ %span= @instance.provider_account.provider.name if
@instance.provider_account
%li
= label_tag :base_template, 'Base Template'
%span= @instance.template.name
diff --git a/src/image_builder_service/image_builder_service
b/src/image_builder_service/image_builder_service
index 0ffb74d..35099b0 100755
--- a/src/image_builder_service/image_builder_service
+++ b/src/image_builder_service/image_builder_service
@@ -121,7 +121,7 @@ class ImageBuilderService
# FIXME: this should be contained elsewhere (probably Image model) so we
# can keep logic out of here. Also, this currently only handles one
# account, we will need to be able to specify at some point.
- creds =
image.replicated_images.first.provider.cloud_accounts.first.build_credentials
+ creds =
image.replicated_images.first.provider.provider_accounts.first.build_credentials
#TODO: switch this back to uri once ActiveBuild retrieves it properly
ab = @console.build_image(image.template.xml.to_xml, image.target,
image.uuid, creds)
if ab
diff --git a/src/lib/tasks/dc_tasks.rake b/src/lib/tasks/dc_tasks.rake
index f1d0c7d..cf713a5 100644
--- a/src/lib/tasks/dc_tasks.rake
+++ b/src/lib/tasks/dc_tasks.rake
@@ -105,7 +105,7 @@ namespace :dc do
unless provider = Provider.find_by_name(provider_name)
raise "There is no provider with '#{provider_name}' name"
end
- unless account = provider.cloud_accounts.find_by_label(account_name)
+ unless account = provider.provider_accounts.find_by_label(account_name)
raise "There is no account with '#{account_name}' label"
end
account
diff --git a/src/spec/models/pool_family_spec.rb
b/src/spec/models/pool_family_spec.rb
index 2b69eab..58c18ec 100644
--- a/src/spec/models/pool_family_spec.rb
+++ b/src/spec/models/pool_family_spec.rb
@@ -27,8 +27,8 @@ describe PoolFamily do
end
it "should have account" do
- @pool_family.cloud_accounts.size.should == 1
- @pool_family.cloud_accounts[0].id.should == @cloud_account.id
+ @pool_family.provider_accounts.size.should == 1
+ @pool_family.provider_accounts[0].id.should == @cloud_account.id
end
end
diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb
index 1b86f92..e3af313 100644
--- a/src/spec/models/provider_spec.rb
+++ b/src/spec/models/provider_spec.rb
@@ -79,7 +79,7 @@ describe Provider do
HardwareProfile.destroy_all
instance = Factory(:instance)
- provider = instance.cloud_account.provider
+ provider = instance.provider_account.provider
provider.destroy
provider.destroyed?.should be_false
end
--
1.7.3.5
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
