From 5cc0a3cb7f4e5116968caf584f9049cc8ec5241e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Luka=C5=A1=C3=ADk?= Date: Tue, 13 Dec 2016 16:11:07 +0100 Subject: [PATCH] Refactor: extract @ems to let statement --- .../models/chargeback_container_image_spec.rb | 15 ++++++------ .../chargeback_container_project_spec.rb | 19 +++++++-------- spec/models/chargeback_vm_spec.rb | 24 +++++++++---------- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/spec/models/chargeback_container_image_spec.rb b/spec/models/chargeback_container_image_spec.rb index 0b19e5359e1..06a7accee05 100644 --- a/spec/models/chargeback_container_image_spec.rb +++ b/spec/models/chargeback_container_image_spec.rb @@ -10,19 +10,18 @@ let(:month_beginning) { ts.beginning_of_month.utc } let(:month_end) { ts.end_of_month.utc } let(:hours_in_month) { Time.days_in_month(month_beginning.month, month_beginning.year) * 24 } + let(:ems) { FactoryGirl.create(:ems_openshift) } before do MiqRegion.seed ChargebackRate.seed EvmSpecHelper.create_guid_miq_server_zone - @ems = FactoryGirl.create(:ems_openshift) - @node = FactoryGirl.create(:container_node, :name => "node") - @image = FactoryGirl.create(:container_image, :ext_management_system => @ems) + @image = FactoryGirl.create(:container_image, :ext_management_system => ems) @label = FactoryGirl.build(:custom_attribute, :name => "version_label-1", :value => "1.0.0-rc_2", :section => 'docker_labels') - @project = FactoryGirl.create(:container_project, :name => "my project", :ext_management_system => @ems) - @group = FactoryGirl.create(:container_group, :ext_management_system => @ems, :container_project => @project, + @project = FactoryGirl.create(:container_project, :name => "my project", :ext_management_system => ems) + @group = FactoryGirl.create(:container_group, :ext_management_system => ems, :container_project => @project, :container_node => @node) @container = FactoryGirl.create(:kubernetes_container, :container_group => @group, :container_image => @image) cat = FactoryGirl.create(:classification, :description => "Environment", :name => "environment", :single_value => true, :show => true) @@ -55,7 +54,7 @@ :derived_memory_available => memory_available, :derived_memory_used => memory_used, :net_usage_rate_average => net_usage_rate, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :tag_names => "", :resource_name => @project.name, :resource_id => @project.id) @@ -98,7 +97,7 @@ :derived_memory_available => memory_available, :derived_memory_used => memory_used, :net_usage_rate_average => net_usage_rate, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :tag_names => "", :resource_name => @project.name, :resource_id => @project.id) @@ -144,7 +143,7 @@ :derived_memory_available => memory_available, :derived_memory_used => memory_used, :net_usage_rate_average => net_usage_rate, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :tag_names => "", :resource_name => @project.name, :resource_id => @project.id) diff --git a/spec/models/chargeback_container_project_spec.rb b/spec/models/chargeback_container_project_spec.rb index 3fe57379bf6..79d6e091df3 100644 --- a/spec/models/chargeback_container_project_spec.rb +++ b/spec/models/chargeback_container_project_spec.rb @@ -10,18 +10,17 @@ let(:month_beginning) { ts.beginning_of_month.utc } let(:month_end) { ts.end_of_month.utc } let(:hours_in_month) { Time.days_in_month(month_beginning.month, month_beginning.year) * 24 } + let(:ems) {FactoryGirl.create(:ems_openshift) } before do MiqRegion.seed ChargebackRate.seed EvmSpecHelper.create_guid_miq_server_zone - @ems = FactoryGirl.create(:ems_openshift) - - @project = FactoryGirl.create(:container_project, :name => "my project", :ext_management_system => @ems) + @project = FactoryGirl.create(:container_project, :name => "my project", :ext_management_system => ems) @cbr = FactoryGirl.create(:chargeback_rate, :rate_type => "Compute") - temp = {:cb_rate => @cbr, :object => @ems} + temp = {:cb_rate => @cbr, :object => ems} ChargebackRate.set_assignments(:compute, [temp]) cat = FactoryGirl.create(:classification, :description => "Environment", :name => "environment", :single_value => true, :show => true) @@ -53,7 +52,7 @@ def used_average_for(metric, hours_in_interval) :derived_memory_available => memory_available, :derived_memory_used => memory_used, :net_usage_rate_average => net_usage_rate, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :tag_names => "", :resource_name => @project.name) end @@ -147,7 +146,7 @@ def used_average_for(metric, hours_in_interval) :derived_memory_available => memory_available, :derived_memory_used => memory_used, :net_usage_rate_average => net_usage_rate, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :tag_names => "", :resource_name => @project.name) end @@ -242,7 +241,7 @@ def used_average_for(metric, hours_in_interval) :derived_memory_available => memory_available, :derived_memory_used => memory_used, :net_usage_rate_average => net_usage_rate, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :tag_names => "", :resource_name => @project.name) end @@ -280,7 +279,7 @@ def used_average_for(metric, hours_in_interval) :derived_memory_available => memory_available, :derived_memory_used => memory_used, :net_usage_rate_average => net_usage_rate, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :tag_names => "environment/prod", :resource_name => @project.name) end @@ -319,7 +318,7 @@ def used_average_for(metric, hours_in_interval) :derived_memory_available => memory_available, :derived_memory_used => memory_used, :net_usage_rate_average => net_usage_rate, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :tag_names => "", :resource_name => @project.name) # Empty metric for fixed compute @@ -327,7 +326,7 @@ def used_average_for(metric, hours_in_interval) :timestamp => time + 12.hours, :cpu_usage_rate_average => 0.0, :derived_memory_used => 0.0, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :tag_names => "", :resource_name => @project.name) end diff --git a/spec/models/chargeback_vm_spec.rb b/spec/models/chargeback_vm_spec.rb index 3ec00f1cd9d..2f002711594 100644 --- a/spec/models/chargeback_vm_spec.rb +++ b/spec/models/chargeback_vm_spec.rb @@ -21,13 +21,13 @@ let(:month_beginning) { ts.beginning_of_month.utc } let(:month_end) { ts.end_of_month.utc } let(:hours_in_month) { Time.days_in_month(month_beginning.month, month_beginning.year) * 24 } + let(:ems) { FactoryGirl.create(:ems_vmware) } before do MiqRegion.seed ChargebackRate.seed EvmSpecHelper.create_guid_miq_server_zone - @ems = FactoryGirl.create(:ems_vmware) cat = FactoryGirl.create(:classification, :description => "Environment", :name => "environment", :single_value => true, :show => true) c = FactoryGirl.create(:classification, :name => "prod", :description => "Production", :parent_id => cat.id) @tag = Tag.find_by_name("/managed/environment/prod") @@ -39,7 +39,7 @@ @storage = FactoryGirl.create(:storage_target_vmware) @host1.storages << @storage - @ems_cluster = FactoryGirl.create(:ems_cluster, :ext_management_system => @ems) + @ems_cluster = FactoryGirl.create(:ems_cluster, :ext_management_system => ems) @ems_cluster.hosts << @host1 @cbr = FactoryGirl.create(:chargeback_rate, :rate_type => "Compute") @@ -88,7 +88,7 @@ :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :parent_storage_id => @storage.id, :resource_name => @vm1.name, ) @@ -153,7 +153,7 @@ def used_average_for(metric, hours_in_interval) :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :parent_storage_id => @storage.id, :resource_name => @vm1.name, ) @@ -446,7 +446,7 @@ def used_average_for(metric, hours_in_interval) :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :parent_storage_id => @storage.id, :resource_name => @vm_tenant.name, ) @@ -482,7 +482,7 @@ def used_average_for(metric, hours_in_interval) :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :parent_storage_id => @storage.id, :resource_name => @vm1.name, ) @@ -761,7 +761,7 @@ def used_average_for(metric, hours_in_interval) let(:metric_rollup) do FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => "2012-08-31T07:00:00Z", :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, - :parent_ems_id => @ems.id, :parent_storage_id => @storage.id, + :parent_ems_id => ems.id, :parent_storage_id => @storage.id, :resource => @vm1) end @@ -796,7 +796,7 @@ def used_average_for(metric, hours_in_interval) let(:metric_rollup) do FactoryGirl.build(:metric_rollup_vm_hr, :tag_names => 'environment/prod', :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, - :parent_ems_id => @ems.id, :parent_storage_id => @storage.id, + :parent_ems_id => ems.id, :parent_storage_id => @storage.id, :resource => @vm1, :resource_name => @vm1.name) end @@ -806,8 +806,8 @@ def used_average_for(metric, hours_in_interval) it 'sets extra fields' do extra_fields = ChargebackVm.new(report_options, metric_rollup).attributes - expected_fields = {"vm_name" => @vm1.name, "owner_name" => admin.name, "provider_name" => @ems.name, - "provider_uid" => @ems.guid, "vm_uid" => "ems_ref", "vm_guid" => @vm1.guid, + expected_fields = {"vm_name" => @vm1.name, "owner_name" => admin.name, "provider_name" => ems.name, + "provider_uid" => ems.guid, "vm_uid" => "ems_ref", "vm_guid" => @vm1.guid, "vm_id" => @vm1.id} expect(extra_fields).to include(expected_fields) @@ -845,7 +845,7 @@ def used_average_for(metric, hours_in_interval) let(:metric_rollup) do FactoryGirl.create(:metric_rollup_vm_hr, :timestamp => "2012-08-31T07:00:00Z", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, - :parent_ems_id => @ems.id, :parent_storage_id => @storage.id, + :parent_ems_id => ems.id, :parent_storage_id => @storage.id, :resource => @vm1) end @@ -880,7 +880,7 @@ def used_average_for(metric, hours_in_interval) :tag_names => "environment/prod", :parent_host_id => @host1.id, :parent_ems_cluster_id => @ems_cluster.id, - :parent_ems_id => @ems.id, + :parent_ems_id => ems.id, :parent_storage_id => @storage.id, :resource_name => @vm1.name, )