-
Notifications
You must be signed in to change notification settings - Fork 125
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #708 from jaywcarman/add_cpu_cores_columns_to_reso…
…urce_pools Add new resource_pools column for cpu_cores_*
- Loading branch information
Showing
2 changed files
with
125 additions
and
0 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
db/migrate/20231018141450_add_cpu_cores_columns_to_resource_pools.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
class AddCpuCoresColumnsToResourcePools < ActiveRecord::Migration[6.0] | ||
class ResourcePool < ActiveRecord::Base | ||
include ActiveRecord::IdRegions | ||
self.inheritance_column = :_type_disabled | ||
end | ||
|
||
def up | ||
add_column :resource_pools, :cpu_cores_available, :float | ||
add_column :resource_pools, :cpu_cores_reserve, :float | ||
add_column :resource_pools, :cpu_cores_limit, :float | ||
|
||
say_with_time('Removing non-applicable data from IbmCloud::PowerVirtualServer resource pools') do | ||
ResourcePool.in_my_region.where(:type => %w[ManageIQ::Providers::IbmCloud::PowerVirtualServers::CloudManager::ResourcePool]).update_all( | ||
:cpu_shares => nil, | ||
:cpu_reserve => nil, | ||
:cpu_limit => nil | ||
) | ||
end | ||
|
||
say_with_time('Removing non-applicable data from IbmPowerHmc resource pools') do | ||
ResourcePool.in_my_region.where(:type => %w[ManageIQ::Providers::IbmPowerHmc::InfraManager::ProcessorResourcePool]).update_all( | ||
:cpu_shares => nil, | ||
:cpu_reserve => nil, | ||
:cpu_limit => nil | ||
) | ||
end | ||
end | ||
|
||
def down | ||
remove_column :resource_pools, :cpu_cores_available | ||
remove_column :resource_pools, :cpu_cores_reserve | ||
remove_column :resource_pools, :cpu_cores_limit | ||
end | ||
end |
91 changes: 91 additions & 0 deletions
91
spec/migrations/20231018141450_add_cpu_cores_columns_to_resource_pools_spec.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
require_migration | ||
|
||
describe AddCpuCoresColumnsToResourcePools do | ||
let(:resource_pools_stub) { migration_stub(:ResourcePool) } | ||
|
||
migration_context :up do | ||
it "Removes non-applicable data only from Power resource pools" do | ||
ibm_cloud_power_vs_resource_pool = resource_pools_stub.create( | ||
:type => "ManageIQ::Providers::IbmCloud::PowerVirtualServers::CloudManager::ResourcePool", | ||
:cpu_shares => 1, | ||
:cpu_reserve => 2, | ||
:cpu_limit => 3, | ||
:cpu_reserve_expand => true, | ||
:is_default => false | ||
) | ||
|
||
ibm_power_hmc_processor_resource_pool = resource_pools_stub.create( | ||
:type => "ManageIQ::Providers::IbmPowerHmc::InfraManager::ProcessorResourcePool", | ||
:cpu_shares => 1, | ||
:cpu_reserve => 2, | ||
:cpu_limit => -1, | ||
:cpu_reserve_expand => true, | ||
:is_default => false | ||
) | ||
|
||
migrate | ||
|
||
expect(ibm_cloud_power_vs_resource_pool.reload).to have_attributes( | ||
:cpu_shares => nil, | ||
:cpu_reserve => nil, | ||
:cpu_limit => nil, | ||
:cpu_reserve_expand => true, | ||
:is_default => false | ||
) | ||
|
||
expect(ibm_power_hmc_processor_resource_pool.reload).to have_attributes( | ||
:cpu_shares => nil, | ||
:cpu_reserve => nil, | ||
:cpu_limit => nil, | ||
:cpu_reserve_expand => true, | ||
:is_default => false | ||
) | ||
end | ||
|
||
it "Does not change non-Power resource pools" do | ||
vmware_resource_pool = resource_pools_stub.create( | ||
:type => "ManageIQ::Providers::Vmware::InfraManager::ResourcePool", | ||
:cpu_shares => 1, | ||
:cpu_reserve => 2, | ||
:cpu_limit => 3, | ||
:cpu_reserve_expand => true, | ||
:is_default => false | ||
) | ||
|
||
migrate | ||
|
||
expect(vmware_resource_pool).to have_attributes( | ||
:type => "ManageIQ::Providers::Vmware::InfraManager::ResourcePool", | ||
:cpu_shares => 1, | ||
:cpu_reserve => 2, | ||
:cpu_limit => 3, # rand(-1..65536) ? | ||
:cpu_reserve_expand => true, | ||
:is_default => false | ||
) | ||
end | ||
end | ||
|
||
migration_context :down do | ||
it "Does not change non-Power resource pools" do | ||
vmware_resource_pool = resource_pools_stub.create( | ||
:type => "ManageIQ::Providers::Vmware::InfraManager::ResourcePool", | ||
:cpu_shares => 1, | ||
:cpu_reserve => 2, | ||
:cpu_limit => 3, | ||
:cpu_reserve_expand => true, | ||
:is_default => false | ||
) | ||
|
||
migrate | ||
|
||
expect(vmware_resource_pool).to have_attributes( | ||
:type => "ManageIQ::Providers::Vmware::InfraManager::ResourcePool", | ||
:cpu_shares => 1, | ||
:cpu_reserve => 2, | ||
:cpu_limit => 3, # rand(-1..65536) ? | ||
:cpu_reserve_expand => true, | ||
:is_default => false | ||
) | ||
end | ||
end | ||
end |