diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-07 16:33:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-07 16:33:56 +0000 |
| commit | 9548e30591b051355895c4fa8f5b40687f8bc896 (patch) | |
| tree | ab85a933cad953fa90fae93ea31574b74e026f03 | |
| parent | f10c629e5773008500bdcee70a0ecb949c85b04d (diff) | |
| parent | fc22a04cfbab9a868347bea78a0b55c2b3316ef1 (diff) | |
| download | ceilometer-9548e30591b051355895c4fa8f5b40687f8bc896.tar.gz | |
Merge "Fix OrderedDict usage for Python 2.6" into proposed/juno
| -rw-r--r-- | ceilometer/ipmi/platform/intel_node_manager.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/ceilometer/ipmi/platform/intel_node_manager.py b/ceilometer/ipmi/platform/intel_node_manager.py index 000ee143..2b046e4e 100644 --- a/ceilometer/ipmi/platform/intel_node_manager.py +++ b/ceilometer/ipmi/platform/intel_node_manager.py @@ -33,10 +33,17 @@ from ceilometer.ipmi.platform import ipmitool from ceilometer.openstack.common.gettextutils import _ from oslo.config import cfg -try: - import collections as ordereddict -except ImportError: - import ordereddict + +def get_ordereddict(): + """A fix for py26 not having ordereddict.""" + try: + import collections + return collections.OrderedDict + except AttributeError: + import ordereddict + return ordereddict.OrderedDict + +OrderedDict = get_ordereddict() node_manager_init_retry = cfg.IntOpt('node_manager_init_retry', default=3, @@ -66,7 +73,7 @@ INTEL_PREFIX = '5701000d01' ONE_RETURN_TEMPLATE = {"ret": 1} -BMC_INFO_TEMPLATE = ordereddict.OrderedDict() +BMC_INFO_TEMPLATE = OrderedDict() BMC_INFO_TEMPLATE['Device_ID'] = 1 BMC_INFO_TEMPLATE['Device_Revision'] = 1 BMC_INFO_TEMPLATE['Firmware_Revision_1'] = 1 @@ -77,7 +84,7 @@ BMC_INFO_TEMPLATE['Manufacturer_ID'] = 3 BMC_INFO_TEMPLATE['Product_ID'] = 2 BMC_INFO_TEMPLATE['Auxiliary_Firmware_Revision'] = 4 -NM_STATISTICS_TEMPLATE = ordereddict.OrderedDict() +NM_STATISTICS_TEMPLATE = OrderedDict() NM_STATISTICS_TEMPLATE['Manufacturer_ID'] = 3 NM_STATISTICS_TEMPLATE['Current_value'] = 2 NM_STATISTICS_TEMPLATE['Minimum_value'] = 2 @@ -87,7 +94,7 @@ NM_STATISTICS_TEMPLATE['Time_stamp'] = 4 NM_STATISTICS_TEMPLATE['Report_period'] = 4 NM_STATISTICS_TEMPLATE["DomainID_PolicyState"] = 1 -NM_GET_DEVICE_ID_TEMPLATE = ordereddict.OrderedDict() +NM_GET_DEVICE_ID_TEMPLATE = OrderedDict() NM_GET_DEVICE_ID_TEMPLATE['Device_ID'] = 1 NM_GET_DEVICE_ID_TEMPLATE['Device_revision'] = 1 NM_GET_DEVICE_ID_TEMPLATE['Firmware_revision_1'] = 1 |