Skip to content

Commit 43a54f5

Browse files
authored
Merge pull request #122 from vfebvre/shmem
Add memory_type advanced setting (dedicated or shared) for VM & Templates
2 parents ea94dcb + d246500 commit 43a54f5

File tree

3 files changed

+29
-1
lines changed

3 files changed

+29
-1
lines changed

app/models/manageiq/providers/ibm_power_hmc/inventory/parser/infra_manager.rb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,16 @@ def parse_vm_advanced_settings(vm, lpar)
469469
:value => proc_type,
470470
:read_only => true
471471
)
472+
473+
mem_type = lpar.shared_mem == "true" ? "shared" : "dedicated"
474+
persister.vms_and_templates_advanced_settings.build(
475+
:resource => vm,
476+
:name => 'memory_type',
477+
:display_name => _('Memory type'),
478+
:description => _('Dedicated or shared'),
479+
:value => mem_type,
480+
:read_only => true
481+
)
472482
end
473483

474484
def parse_templates

manageiq-providers-ibm_power_hmc.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
1919
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
2020
spec.require_paths = ["lib"]
2121

22-
spec.add_dependency "ibm_power_hmc", "~> 0.21.1"
22+
spec.add_dependency "ibm_power_hmc", "~> 0.22.0"
2323

2424
spec.add_development_dependency "manageiq-style"
2525
spec.add_development_dependency "simplecov", ">= 0.21.2"

spec/models/manageiq/providers/ibm_power_hmc/infra_manager/refresher_spec.rb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,12 @@ def assert_specific_vios
210210
:read_only => true
211211
)
212212

213+
setting = vios.advanced_settings.find_by(:name => "memory_type")
214+
expect(setting).to have_attributes(
215+
:value => "dedicated",
216+
:read_only => true
217+
)
218+
213219
expect(vios.labels.count).to eq(1)
214220
expect(vios.labels.first.name).to eq("ManageIQ")
215221

@@ -274,6 +280,12 @@ def assert_specific_lpar
274280
:read_only => true
275281
)
276282

283+
setting = lpar.advanced_settings.find_by(:name => "memory_type")
284+
expect(setting).to have_attributes(
285+
:value => "dedicated",
286+
:read_only => true
287+
)
288+
277289
expect(lpar.labels.count).to eq(1)
278290
expect(lpar.labels.first.name).to eq("ManageIQ")
279291

@@ -305,6 +317,12 @@ def assert_specific_template
305317
:value => "uncapped",
306318
:read_only => true
307319
)
320+
321+
setting = template.advanced_settings.find_by(:name => "memory_type")
322+
expect(setting).to have_attributes(
323+
:value => "dedicated",
324+
:read_only => true
325+
)
308326
end
309327

310328
def assert_specific_resource_pool_cpu

0 commit comments

Comments
 (0)