[dts] [PATCH]vm_power_manager: update and can run in new framwork

[dts] [PATCH]vm_power_manager: update and can run in new framwork

[Lijuan Tu]

Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
---
 conf/vm_power_manager.cfg                 | 3 ---
 test_plans/vm_power_manager_test_plan.rst | 1 +
 tests/TestSuite_vm_power_manager.py       | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/conf/vm_power_manager.cfg b/conf/vm_power_manager.cfg
index c77819b..9c8f87a 100644
--- a/conf/vm_power_manager.cfg
+++ b/conf/vm_power_manager.cfg
@@ -28,9 +28,6 @@ disk =
     file=/storage/vm-image/vm0.img,type=raw;
 login =
     user=root,password=tester;
-device =
-    pf_idx=0,guestpci=00:08.0;
-    pf_idx=1,guestpci=00:09.0;
 [vm1]
 mem =
     size=4096;
diff --git a/test_plans/vm_power_manager_test_plan.rst b/test_plans/vm_power_manager_test_plan.rst
index dff8197..3d56bcd 100644
--- a/test_plans/vm_power_manager_test_plan.rst
+++ b/test_plans/vm_power_manager_test_plan.rst
@@ -77,6 +77,7 @@ Prerequisites
 	- Enable Kernel features Huge page, UIO, IOMMU, KVM
 	- Enable Intel IOMMU in kernel commnand
 	- Disable Selinux
+       - Disable intel_pstate
 
 3. Virtualization:
 	- QEMU emulator version 1.6.1
diff --git a/tests/TestSuite_vm_power_manager.py b/tests/TestSuite_vm_power_manager.py
index e9d25b3..84f06dc 100644
--- a/tests/TestSuite_vm_power_manager.py
+++ b/tests/TestSuite_vm_power_manager.py
@@ -64,7 +64,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         self.vcpu_map = []
         # start vm
         self.vm_name = "vm0"
-        self.vm = LibvirtKvm(self.dut, self.vm_name, self.suite)
+        self.vm = LibvirtKvm(self.dut, self.vm_name, self.suite_name)
         channels = [
             {'path': '/tmp/powermonitor/%s.0' %
                 self.vm_name, 'name': 'virtio.serial.port.poweragent.0'},
@@ -252,7 +252,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
         cpus = self.dut.get_core_list('1S/4C/1T', socket=1)
         self.verify(len(cpus) == 4, "Can't allocate cores from numa 1")
 
-        vm2 = LibvirtKvm(self.dut, vm_name, self.suite)
+        vm2 = LibvirtKvm(self.dut, vm_name, self.suite_name)
         channels = [
             {'path': '/tmp/powermonitor/%s.0' %
                 vm_name, 'name': 'virtio.serial.port.poweragent.0'},
-- 
1.9.3

Re: [dts] [PATCH]vm_power_manager: update and can run in new framwork

[Liu, Yong]

Thanks, applied.

On 11/17/2016 04:51 PM, Lijuan Tu wrote:
> Signed-off-by: Lijuan Tu <lijuanx.a.tu@intel.com>
> ---
>   conf/vm_power_manager.cfg                 | 3 ---
>   test_plans/vm_power_manager_test_plan.rst | 1 +
>   tests/TestSuite_vm_power_manager.py       | 4 ++--
>   3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/conf/vm_power_manager.cfg b/conf/vm_power_manager.cfg
> index c77819b..9c8f87a 100644
> --- a/conf/vm_power_manager.cfg
> +++ b/conf/vm_power_manager.cfg
> @@ -28,9 +28,6 @@ disk =
>       file=/storage/vm-image/vm0.img,type=raw;
>   login =
>       user=root,password=tester;
> -device =
> -    pf_idx=0,guestpci=00:08.0;
> -    pf_idx=1,guestpci=00:09.0;
>   [vm1]
>   mem =
>       size=4096;
> diff --git a/test_plans/vm_power_manager_test_plan.rst b/test_plans/vm_power_manager_test_plan.rst
> index dff8197..3d56bcd 100644
> --- a/test_plans/vm_power_manager_test_plan.rst
> +++ b/test_plans/vm_power_manager_test_plan.rst
> @@ -77,6 +77,7 @@ Prerequisites
>   	- Enable Kernel features Huge page, UIO, IOMMU, KVM
>   	- Enable Intel IOMMU in kernel commnand
>   	- Disable Selinux
> +       - Disable intel_pstate
>   
>   3. Virtualization:
>   	- QEMU emulator version 1.6.1
> diff --git a/tests/TestSuite_vm_power_manager.py b/tests/TestSuite_vm_power_manager.py
> index e9d25b3..84f06dc 100644
> --- a/tests/TestSuite_vm_power_manager.py
> +++ b/tests/TestSuite_vm_power_manager.py
> @@ -64,7 +64,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
>           self.vcpu_map = []
>           # start vm
>           self.vm_name = "vm0"
> -        self.vm = LibvirtKvm(self.dut, self.vm_name, self.suite)
> +        self.vm = LibvirtKvm(self.dut, self.vm_name, self.suite_name)
>           channels = [
>               {'path': '/tmp/powermonitor/%s.0' %
>                   self.vm_name, 'name': 'virtio.serial.port.poweragent.0'},
> @@ -252,7 +252,7 @@ class TestVmPowerManager(TestCase, IxiaPacketGenerator):
>           cpus = self.dut.get_core_list('1S/4C/1T', socket=1)
>           self.verify(len(cpus) == 4, "Can't allocate cores from numa 1")
>   
> -        vm2 = LibvirtKvm(self.dut, vm_name, self.suite)
> +        vm2 = LibvirtKvm(self.dut, vm_name, self.suite_name)
>           channels = [
>               {'path': '/tmp/powermonitor/%s.0' %
>                   vm_name, 'name': 'virtio.serial.port.poweragent.0'},