From: Jozef Zigmund <jzigmund(a)redhat.com&gt; --- src/app/controllers/permissions_controller.rb | 4 ++-- src/app/controllers/quotas_controller.rb | 4 ++-- src/app/models/instance_task.rb | 6 +++--- src/app/models/pool.rb | 2 +- src/app/models/provider.rb | 2 +- src/app/models/provider_account.rb | 2 +- src/app/models/quota.rb | 8 ++++---- src/app/services/data_service_active_record.rb | 14 +++++++------- src/app/services/graph_service.rb | 20 ++++++++++---------- src/lib/tasks/demo_data.rake | 10 +++++----- src/spec/models/instance_observer_spec.rb | 4 ++-- src/spec/models/instance_spec.rb | 8 ++++---- src/test/fixtures/instances.yml | 2 +- src/test/fixtures/pool_accounts.yml | 2 +- src/test/fixtures/pools.yml | 2 +- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/app/controllers/permissions_controller.rb b/src/app/controllers/permissions_controller.rb index 380b97c..406b991 100644 --- a/src/app/controllers/permissions_controller.rb +++ b/src/app/controllers/permissions_controller.rb @@ -73,8 +73,8 @@ class PermissionsController < ApplicationController @permission_object = Pool.find params[:pool_id] elsif !params[:provider_id].nil? @permission_object = Provider.find params[:provider_id] - elsif !params[:cloud_account_id].nil? - @permission_object = ProviderAccount.find params[:cloud_account_id] + elsif !params[:provider_account_id].nil? + @permission_object = ProviderAccount.find params[:provider_account_id] elsif !params[:base_permission_object_id].nil? @permission_object = BasePermissionObject.find params[:base_permission_object_id] else diff --git a/src/app/controllers/quotas_controller.rb b/src/app/controllers/quotas_controller.rb index 0beb386..328361b 100644 --- a/src/app/controllers/quotas_controller.rb +++ b/src/app/controllers/quotas_controller.rb @@ -76,7 +76,7 @@ class QuotasController < ApplicationController def get_parent_object(params) if params[:parent_type] == "pool" return Pool.find(params[:id]) - elsif params[:parent_type] == "cloud_account" + elsif params[:parent_type] == "provider_account" return ProviderAccount.find(params[:id]) end #TODO Throw no match to pool or cloud account exception @@ -85,7 +85,7 @@ class QuotasController < ApplicationController def get_parent_name(parent, parent_type) if parent_type == "pool" return parent.name - elsif parent_type == "cloud_account" + elsif parent_type == "provider_account" return parent.username end #TODO Throw no match to pool or cloud account exception diff --git a/src/app/models/instance_task.rb b/src/app/models/instance_task.rb index 42bed29..c431ac1 100644 --- a/src/app/models/instance_task.rb +++ b/src/app/models/instance_task.rb @@ -44,10 +44,10 @@ class InstanceTask < Task # automatic transitions from transient states. def self.valid_actions_for_instance_state(state, instance, user=nil) actions = [] - # FIXME: cloud_account won't always be set here, but we're requiring + # FIXME: provider_account won't always be set here, but we're requiring # front end realm for now. - if cloud_account = instance.provider_account and - conn = cloud_account.connect and c_state = conn.instance_state(state) + if provider_account = instance.provider_account and + conn = provider_account.connect and c_state = conn.instance_state(state) transitions = c_state.transitions transitions.each do |transition| # FIXME if we allow actions based on the expected state after diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb index 0f9a4fb..475610a 100644 --- a/src/app/models/pool.rb +++ b/src/app/models/pool.rb @@ -44,7 +44,7 @@ class Pool < ActiveRecord::Base :include => [:role], :order => "permissions.id ASC" - def cloud_accounts + def provider_accounts accounts = [] instances.each do |instance| if instance.provider_account and !accounts.include?(instance.provider_account) diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index b4c1667..1a04763 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -121,7 +121,7 @@ class Provider < ActiveRecord::Base end def pools - cloud_accounts.collect {|account| account.pools}.flatten.uniq + provider_accounts.collect {|account| account.pools}.flatten.uniq end # returns first provider of provider_type which has at least one cloud account diff --git a/src/app/models/provider_account.rb b/src/app/models/provider_account.rb index 39dce11..8a66b0f 100644 --- a/src/app/models/provider_account.rb +++ b/src/app/models/provider_account.rb @@ -139,7 +139,7 @@ class ProviderAccount < ActiveRecord::Base def populate_realms client = connect realms = client.realms - # FIXME: this should probably be in the same transaction as cloud_account.save + # FIXME: this should probably be in the same transaction as provider_account.save self.transaction do realms.each do |realm| #ignore if it exists diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb index acb001a..15a664d 100644 --- a/src/app/models/quota.rb +++ b/src/app/models/quota.rb @@ -58,8 +58,8 @@ class Quota < ActiveRecord::Base end - def self.can_create_instance?(instance, cloud_account) - [instance.owner, instance.pool, cloud_account].each do |parent| + def self.can_create_instance?(instance, provider_account) + [instance.owner, instance.pool, provider_account].each do |parent| if parent quota = Quota.find(parent.quota_id) potential_total_instances = quota.total_instances + 1 @@ -71,8 +71,8 @@ class Quota < ActiveRecord::Base return true end - def self.can_start_instance?(instance, cloud_account) - [instance.owner, instance.pool, cloud_account].each do |parent| + def self.can_start_instance?(instance, provider_account) + [instance.owner, instance.pool, provider_account].each do |parent| if parent quota = Quota.find(parent.quota_id) potential_running_instances = quota.running_instances + 1 diff --git a/src/app/services/data_service_active_record.rb b/src/app/services/data_service_active_record.rb index 5833baa..31d33bb 100644 --- a/src/app/services/data_service_active_record.rb +++ b/src/app/services/data_service_active_record.rb @@ -65,11 +65,11 @@ class DataServiceActiveRecord data_points = [] free_instances = 0 - cloud_accounts = ProviderAccount.find(:all, :conditions => {:provider_id => provider.id}) - cloud_accounts.each do |cloud_account| - quota = cloud_account.quota + provider_accounts = ProviderAccount.find(:all, :conditions => {:provider_id => provider.id}) + provider_accounts.each do |provider_account| + quota = provider_account.quota if quota - data_points << TotalQuotaUsagePoint.new(cloud_account.username, quota.total_instances) + data_points << TotalQuotaUsagePoint.new(provider_account.username, quota.total_instances) free_instances += (quota.maximum_total_instances - quota.total_instances) end end @@ -175,9 +175,9 @@ class DataServiceActiveRecord instances = [] if parent.class == Provider - cloud_accounts = ProviderAccount.find(:all, :conditions => {:provider_id => parent.id}) - cloud_accounts.each do |cloud_account| - instances.concat(cloud_account.instances) + provider_accounts = ProviderAccount.find(:all, :conditions => {:provider_id => parent.id}) + provider_accounts.each do |provider_account| + instances.concat(provider_account.instances) end elsif parent.class == Pool || parent.class == ProviderAccount instances = parent.instances diff --git a/src/app/services/graph_service.rb b/src/app/services/graph_service.rb index c5f3065..109455c 100644 --- a/src/app/services/graph_service.rb +++ b/src/app/services/graph_service.rb @@ -10,16 +10,16 @@ class GraphService #if a specific cloud account is given, just return that cloud account's graph. #otherwise return all graphs user has permission to see. - if opts[:cloud_account] - cloud_account = opts[:cloud_account] - cloud_account_graphs = Hash.new - cloud_account_graphs[Graph::QUOTA_INSTANCES_IN_USE] = qos_failure_rate_graph(parent, opts = {}) - graphs[cloud_account] = cloud_account_graphs + if opts[:provider_account] + provider_account = opts[:provider_account] + provider_account_graphs = Hash.new + provider_account_graphs[Graph::QUOTA_INSTANCES_IN_USE] = qos_failure_rate_graph(parent, opts = {}) + graphs[provider_account] = provider_account_graphs else - ProviderAccount.all.each do |cloud_account| - cloud_account_graphs = Hash.new - cloud_account_graphs[Graph::QUOTA_INSTANCES_IN_USE] = quota_instances_in_use_graph(cloud_account,opts) - graphs[cloud_account] = cloud_account_graphs + ProviderAccount.all.each do |provider_account| + provider_account_graphs = Hash.new + provider_account_graphs[Graph::QUOTA_INSTANCES_IN_USE] = quota_instances_in_use_graph(provider_account,opts) + graphs[provider_account] = provider_account_graphs end end graphs @@ -67,7 +67,7 @@ class GraphService def self.quota_usage_graph (parent, opts = {}) x = [1,2] - #we'll just have zero values for the unexpected case where cloud_account has no quota + #we'll just have zero values for the unexpected case where provider_account has no quota y = x.collect { |v| 0 } if parent.quota quota = parent.quota diff --git a/src/lib/tasks/demo_data.rake b/src/lib/tasks/demo_data.rake index f3326fd..2f6fc35 100644 --- a/src/lib/tasks/demo_data.rake +++ b/src/lib/tasks/demo_data.rake @@ -25,17 +25,17 @@ namespace :db do SHORT_ACC = PROB_SHORT_REPONSE + PROB_FAILURE MEDIUM_ACC = PROB_MEDIUM_RESPONSE + PROB_SHORT_REPONSE + PROB_FAILURE - task :demo_data, :cloud_account_id, :user_id, :time_period, :number_of_tasks, :needs => :environment do |t, args| + task :demo_data, :provider_account_id, :user_id, :time_period, :number_of_tasks, :needs => :environment do |t, args| @time_scale = args[:time_period].to_f * 60 * 60 @number_of_tasks = args[:number_of_tasks] puts @number_of_tasks - cloud_account = ProviderAccount.find(args[:cloud_account_id]) + provider_account = ProviderAccount.find(args[:provider_account_id]) user = User.find(args[:user_id]) - instance = create_instance(cloud_account) + instance = create_instance(provider_account) started_at = Time.now create_tasks(instance, user) @@ -44,13 +44,13 @@ namespace :db do print_stats(started_at, ended_at) end - def create_instance(cloud_account) + def create_instance(provider_account) instance = Instance.new({:name => "instance" + Time.now.to_s, :hardware_profile_id => HardwareProfile.find(:first), :image_id => Image.find(:first), :state => Instance::STATE_NEW, :pool_id => 1, - :cloud_account_id => cloud_account.id + :provider_account_id => provider_account.id }) instance.save! return instance diff --git a/src/spec/models/instance_observer_spec.rb b/src/spec/models/instance_observer_spec.rb index 4acb78c..c5946f4 100644 --- a/src/spec/models/instance_observer_spec.rb +++ b/src/spec/models/instance_observer_spec.rb @@ -161,8 +161,8 @@ describe InstanceObserver do key.stub!(:id).and_return("1_user") client.stub!(:"feature?").and_return(true) client.stub!(:"create_key").and_return(key) - @cloud_account.stub!(:connect).and_return(client) - @instance.stub!(:cloud_account).and_return(@cloud_account) + @provider_account.stub!(:connect).and_return(client) + @instance.stub!(:provider_account).and_return(@provider_account) @instance.state = Instance::STATE_RUNNING @instance.save! diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb index e4d3a9f..bc49fa6 100644 --- a/src/spec/models/instance_spec.rb +++ b/src/spec/models/instance_spec.rb @@ -121,12 +121,12 @@ describe Instance do it "should return empty list of instance actions when connect to provider fails" do provider = Factory.build(:mock_provider2) - cloud_account = Factory.build(:provider_account, :provider => provider, + provider_account = Factory.build(:provider_account, :provider => provider, :username => 'john doe', :password => 'asdf') - cloud_account.stub!(:connect).and_return(nil) - cloud_account.stub!(:valid_credentials?).and_return(true) - instance = Factory.create(:instance, :provider_account => cloud_account) + provider_account.stub!(:connect).and_return(nil) + provider_account.stub!(:valid_credentials?).and_return(true) + instance = Factory.create(:instance, :provider_account => provider_account) instance.get_action_list.should be_empty end diff --git a/src/test/fixtures/instances.yml b/src/test/fixtures/instances.yml index 951258d..4ec5c7d 100644 --- a/src/test/fixtures/instances.yml +++ b/src/test/fixtures/instances.yml @@ -7,7 +7,7 @@ test_instance: image: fedora_13_image_frontend realm: us_realm pool: test_pool - cloud_account: mock_account + provider_account: mock_account public_address: private_address: state: stopped diff --git a/src/test/fixtures/pool_accounts.yml b/src/test/fixtures/pool_accounts.yml index c5db498..083d254 100644 --- a/src/test/fixtures/pool_accounts.yml +++ b/src/test/fixtures/pool_accounts.yml @@ -1,5 +1,5 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html test_pool_mock_account: - cloud_account: mock_account + provider_account: mock_account pool: test_pool diff --git a/src/test/fixtures/pools.yml b/src/test/fixtures/pools.yml index da63a52..a5d96bb 100644 --- a/src/test/fixtures/pools.yml +++ b/src/test/fixtures/pools.yml @@ -3,4 +3,4 @@ test_pool name: test_pool owner: test_user - cloud_accounts: mock_account + provider_accounts: mock_account -- 1.7.4