openstack
/
nova
Code Issues Proposed changes

Merge "hyperv: use standard architecture constants for CPU model"

This commit is contained in:
Jenkins 2015-01-24 20:37:50 +00:00 committed by Gerrit Code Review
parent 159e68eb1a 6db8f730e8
commit 733ef1176d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nova/virt/hyperv/constants.py
View File

@ -17,6 +17,7 @@
Constants used in ops classes Constants used in ops classes
""" """
from nova.compute import arch
from nova.compute import power_state from nova.compute import power_state
HYPERV_VM_STATE_ENABLED = 2 HYPERV_VM_STATE_ENABLED = 2
@ -35,13 +36,13 @@ HYPERV_POWER_STATE = {
} }
WMI_WIN32_PROCESSOR_ARCHITECTURE = { WMI_WIN32_PROCESSOR_ARCHITECTURE = {
0: 'x86', 0: arch.I686,
1: 'MIPS', 1: arch.MIPS,
2: 'Alpha', 2: arch.ALPHA,
3: 'PowerPC', 3: arch.PPC,
5: 'ARM', 5: arch.ARMV7,
6: 'Itanium-based systems', 6: arch.IA64,
9: 'x64', 9: arch.X86_64,
} }
PROCESSOR_FEATURE = { PROCESSOR_FEATURE = {