From 8b77e78f3df2bf15f1da18b705452e383efedc4d Mon Sep 17 00:00:00 2001 From: cima Date: Mon, 4 Apr 2016 15:17:35 +0200 Subject: [PATCH] Added missing support for resource states in unicode format in VM workload consolidation strategy Unicode type resource state is now handled in the same fashion as resource state specified by general string. Change-Id: I35ffa09015283b51c935515436735aecbe83a9d6 Closes-Bug: #1565764 --- .../strategy/strategies/vm_workload_consolidation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py index 260370fbb..b701ae532 100644 --- a/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py +++ b/watcher/decision_engine/strategy/strategies/vm_workload_consolidation.py @@ -20,6 +20,7 @@ from copy import deepcopy from oslo_log import log +import six from watcher._i18n import _LE, _LI from watcher.common import exception @@ -95,7 +96,7 @@ class VMWorkloadConsolidation(base.BaseStrategy): :param state: resource state of unknown type """ - if type(state) == str: + if isinstance(state, six.string_types): return state elif (type(state) == hyper_state.HypervisorState or type(state) == vm_state.VMState):