Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract rates cache to separate class #12608

Merged
merged 2 commits into from
Nov 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions app/models/chargeback.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def self.build_results_for_report_chargeback(options)
_log.info("Calculating chargeback costs...")
@options = options = ReportOptions.new_from_h(options)

cb = new
rates = RatesCache.new

base_rollup = MetricRollup.includes(
:resource => [:hardware, :tenant, :tags, :vim_performance_states, :custom_attributes],
Expand Down Expand Up @@ -61,7 +61,7 @@ def self.build_results_for_report_chargeback(options)
# we need to select ChargebackRates for groups of MetricRollups records
# and rates are selected by first MetricRollup record
metric_rollup_record = metric_rollup_records.first
rates_to_apply = cb.get_rates(metric_rollup_record)
rates_to_apply = rates.get(metric_rollup_record)

# key contains resource_id and timestamp (query_start_time...query_end_time)
# extra_fields there some extra field like resource name and
Expand Down Expand Up @@ -124,17 +124,6 @@ def self.get_tag_keys_and_fields(perf, ts_key)
[key, extra_fields]
end

def get_rates(perf)
@rates ||= {}
@rates[perf.hash_features_affecting_rate] ||=
begin
prefix = Chargeback.report_cb_model(self.class.name).underscore
ChargebackRate.get_assigned_for_target(perf.resource,
:tag_list => perf.tag_list_reconstruct.map! { |t| prefix + t },
:parents => get_rate_parents(perf))
end
end

def calculate_costs(metric_rollup_records, rates, hours_in_interval)
chargeback_fields_present = metric_rollup_records.count(&:chargeback_fields_present?)
self.fixed_compute_metric = chargeback_fields_present if chargeback_fields_present
Expand Down Expand Up @@ -189,10 +178,6 @@ def self.report_tag_field
"tag_name"
end

def self.get_rate_parents
raise "Chargeback: get_rate_parents must be implemented in child class."
end

def self.set_chargeback_report_options(rpt, group_by, header_for_tag, tz)
rpt.cols = %w(start_date display_range)

Expand Down
24 changes: 24 additions & 0 deletions app/models/chargeback/rates_cache.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
class Chargeback
class RatesCache
def get(perf)
@rates ||= {}
@rates[perf.hash_features_affecting_rate] ||=
begin
prefix = tag_prefix(perf)
Copy link
Contributor

@lpichler lpichler Nov 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@isimluk is this same as

  prefix = Chargeback.report_cb_model(self.class.name).underscore

?

We was deriving prefix from chargeback class, (basically is report for VM, Projects or Contr. ) now you are doing it from perf record.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is the same. 👍

Each Chargeback.descendant has where_clause method. This where_class limits the resource_type of perf records coming here.

ChargebackRate.get_assigned_for_target(perf.resource,
:tag_list => perf.tag_list_reconstruct.map! { |t| prefix + t },
:parents => perf.parents_determining_rate)
end
end

private

def tag_prefix(perf)
case perf.resource_type
when Container.name then 'container_image'
when VmOrTemplate.name then 'vm'
when ContainerProject.name then 'container_project'
end
end
end
end
5 changes: 0 additions & 5 deletions app/models/chargeback_container_image.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,4 @@ def self.report_col_options
"total_cost" => {:grouping => [:total]}
}
end

def get_rate_parents(_perf)
# get rates from image tags only
[]
end
end # class ChargebackContainerImage
5 changes: 0 additions & 5 deletions app/models/chargeback_container_project.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,4 @@ def self.report_col_options
"total_cost" => {:grouping => [:total]}
}
end

def get_rate_parents(perf)
# Get rate from assigned containers providers only
[perf.parent_ems].compact
end
end # class Chargeback
6 changes: 0 additions & 6 deletions app/models/chargeback_vm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,4 @@ def self.report_col_options
"total_cost" => {:grouping => [:total]}
}
end

def get_rate_parents(perf)
@enterprise ||= MiqEnterprise.my_enterprise
parents = perf.resource_parents + [@enterprise]
parents.compact
end
end # class Chargeback
11 changes: 11 additions & 0 deletions app/models/metric/chargeback_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,15 @@ def resource_parents
resource.try(:tenant)
].compact
end

def parents_determining_rate
case resource_type
when VmOrTemplate.name
(resource_parents + [MiqEnterprise.my_enterprise]).compact
when ContainerProject.name
[parent_ems].compact
when Container.name
[]
end
end
end
75 changes: 1 addition & 74 deletions spec/models/chargeback_vm_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,79 +50,6 @@
Timecop.return
end

describe "#get_rate_parents" do
let(:vm) do
FactoryGirl.create(:vm_vmware, :name => "test_vm", :evm_owner => @admin, :ems_ref => "ems_ref",
:ems_cluster => @ems_cluster, :storage => @storage, :host => @host1,
:ext_management_system => @ems
)
end

let(:metric_rollup_without_parents) do
FactoryGirl.create(:metric_rollup_vm_hr,
:cpu_usagemhz_rate_average => @cpu_usagemhz_rate,
:derived_vm_numvcpus => @cpu_count,
:derived_memory_available => @memory_available,
:derived_memory_used => @memory_used,
:disk_usage_rate_average => @disk_usage_rate,
:net_usage_rate_average => @net_usage_rate,
:derived_vm_used_disk_storage => @vm_used_disk_storage.gigabytes,
:derived_vm_allocated_disk_storage => @vm_allocated_disk_storage.gigabytes,
:tag_names => "environment/prod",
:resource => vm
)
end

let(:metric_rollup_with_parents) do
FactoryGirl.create(:metric_rollup_vm_hr,
:cpu_usagemhz_rate_average => @cpu_usagemhz_rate,
:derived_vm_numvcpus => @cpu_count,
:derived_memory_available => @memory_available,
:derived_memory_used => @memory_used,
:disk_usage_rate_average => @disk_usage_rate,
:net_usage_rate_average => @net_usage_rate,
:derived_vm_used_disk_storage => @vm_used_disk_storage.gigabytes,
:derived_vm_allocated_disk_storage => @vm_allocated_disk_storage.gigabytes,
:tag_names => "environment/prod",
:resource => vm,
:parent_host_id => @host1.id,
:parent_ems_cluster_id => @ems_cluster.id,
:parent_ems_id => @ems.id,
:parent_storage_id => @storage.id,
)
end

it "uses resource's host, cluster, storage and ems" do
parents = described_class.new.send(:get_rate_parents, metric_rollup_without_parents)

expected_array = [
vm.host,
vm.ems_cluster,
vm.storage,
vm.ext_management_system,
vm.tenant,
MiqEnterprise.my_enterprise
].compact

expect(parents).to match_array(expected_array)
end

it "uses host, cluster, storage ems from MetricRollup record" do
parents = described_class.new.send(:get_rate_parents, metric_rollup_with_parents)

expected_array = [
metric_rollup_with_parents.parent_host,
metric_rollup_with_parents.parent_ems_cluster,
metric_rollup_with_parents.parent_storage,
metric_rollup_with_parents.parent_ems,
vm.tenant,
MiqEnterprise.my_enterprise
].compact

expect(parents).to match_array(expected_array)
end
end

let(:report_static_fields) { %w(vm_name) }

it "uses static fields" do
Expand Down Expand Up @@ -874,7 +801,7 @@ def used_average_for(metric, hours_in_interval)

before do
ChargebackRate.set_assignments(:compute, [rate_assignment_options])
@rate = chargeback_vm.get_rates(metric_rollup).first
@rate = Chargeback::RatesCache.new.get(metric_rollup).first
@assigned_rate = ChargebackRate.get_assignments("Compute").first
end

Expand Down
62 changes: 62 additions & 0 deletions spec/models/metric_rollup/chargeback_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
describe MetricRollup do
describe '#parents_determining_rate' do
before do
MiqRegion.seed
MiqEnterprise.seed
end

context 'VmOrTemplate' do
let(:ems) { FactoryGirl.build(:ems_vmware) }
let(:ems_cluster) { FactoryGirl.build(:ems_cluster, :ext_management_system => ems) }
let(:storage) { FactoryGirl.build(:storage_target_vmware) }
let(:host) { FactoryGirl.build(:host) }
let(:vm) do
FactoryGirl.create(:vm_vmware, :name => 'test_vm', :ems_ref => 'ems_ref',
:ems_cluster => ems_cluster, :storage => storage, :host => host,
:ext_management_system => ems
)
end

subject { metric_rollup.parents_determining_rate }

context 'metric_rollup record with parents not nil' do
let(:metric_rollup) do
FactoryGirl.build(:metric_rollup_vm_hr,
:resource => vm,
:parent_host => host,
:parent_ems_cluster => ems_cluster,
:parent_ems => ems,
:parent_storage => storage,
)
end

let(:parents_from_rollup) do
[
metric_rollup.parent_host,
metric_rollup.parent_ems_cluster,
metric_rollup.parent_storage,
metric_rollup.parent_ems,
MiqEnterprise.my_enterprise
]
end

it { is_expected.to match_array(parents_from_rollup) }
end

context 'metric_rollup record with parents nil' do
let(:metric_rollup) { FactoryGirl.build(:metric_rollup_vm_hr, :resource => vm) }
let(:parents_from_vm) do
[
vm.host,
vm.ems_cluster,
vm.storage,
vm.ext_management_system,
MiqEnterprise.my_enterprise
]
end

it { is_expected.to match_array(parents_from_vm) }
end
end
end
end