From 8b3d7578fb18ab0b449d4b4dc2a6da78f2b26ffe Mon Sep 17 00:00:00 2001 From: "Kyle L. Henderson" Date: Mon, 5 Oct 2015 19:27:08 -0500 Subject: [PATCH] Pass CONF proc weight to LPAR builder Fix code to pass the configured uncapped_proc_weight to the pypowervm VM standardizer. Without this, it was defaulting to the value in pypowervm versus the drivers CONF value (which happened to be the same.) Change-Id: I00cfc66612a59225558e9eff5636fe824a929566 --- nova_powervm/tests/virt/powervm/test_vm.py | 8 ++++++++ nova_powervm/virt/powervm/vm.py | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nova_powervm/tests/virt/powervm/test_vm.py b/nova_powervm/tests/virt/powervm/test_vm.py index e8d7a143..5c3830e9 100644 --- a/nova_powervm/tests/virt/powervm/test_vm.py +++ b/nova_powervm/tests/virt/powervm/test_vm.py @@ -59,6 +59,14 @@ class TestVMBuilder(test.TestCase): self.host_w = mock.MagicMock() self.lpar_b = vm.VMBuilder(self.host_w, self.adpt) + def test_conf_values(self): + # Test driver CONF values are passed to the standardizer + self.flags(uncapped_proc_weight=75, proc_units_factor=.25, + group='powervm') + lpar_bldr = vm.VMBuilder(self.host_w, self.adpt) + self.assertEqual(75, lpar_bldr.stdz.uncapped_weight) + self.assertEqual(.25, lpar_bldr.stdz.proc_units_factor) + def test_format_flavor(self): """Perform tests against _format_flavor.""" instance = objects.Instance(**powervm.TEST_INSTANCE) diff --git a/nova_powervm/virt/powervm/vm.py b/nova_powervm/virt/powervm/vm.py index d3d38f48..f0a58055 100644 --- a/nova_powervm/virt/powervm/vm.py +++ b/nova_powervm/virt/powervm/vm.py @@ -210,7 +210,8 @@ class VMBuilder(object): self.adapter = adapter self.host_w = host_w self.stdz = lpar_bldr.DefaultStandardize( - self.host_w, proc_units_factor=CONF.powervm.proc_units_factor) + self.host_w, uncapped_weight=CONF.powervm.uncapped_proc_weight, + proc_units_factor=CONF.powervm.proc_units_factor) def lpar_builder(self, instance, flavor): """Returns the pypowervm LPARBuilder for a given Nova flavor.