From 2f7976963dd64da0841fab5fdc4d3d8693ee8b99 Mon Sep 17 00:00:00 2001 From: zhurong Date: Sun, 8 Sep 2019 19:46:31 -0700 Subject: [PATCH] Using str replace encode or decode Change-Id: I22ca1ab147db94734c79473bd79ae39d766f11ad --- cyborg/conductor/manager.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cyborg/conductor/manager.py b/cyborg/conductor/manager.py index d9e73ab1..6734f086 100644 --- a/cyborg/conductor/manager.py +++ b/cyborg/conductor/manager.py @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +import six + from oslo_log import log as logging import oslo_messaging as messaging -from oslo_utils import encodeutils import uuid from cyborg.common import exception @@ -355,8 +356,8 @@ class ConductorManager(object): return def _get_sub_provider(self, context, parent, name): - name = encodeutils.safe_decode(name) - old_sub_pr_uuid = str(uuid.uuid3(uuid.NAMESPACE_DNS, name)) + old_sub_pr_uuid = str(uuid.uuid3(uuid.NAMESPACE_DNS, + six.ensure_str(name))) new_sub_pr_uuid = self.placement_client.ensure_resource_provider( context, old_sub_pr_uuid, name=name, parent_provider_uuid=parent) @@ -395,7 +396,7 @@ class ConductorManager(object): attrs = obj.attribute_list resource_class = [i.value for i in attrs if i.key == 'rc'][0] traits = [i.value for i in attrs - if encodeutils.safe_decode(i.key).startswith("trait")] + if six.ensure_str(i.key).startswith("trait")] total = obj.num_accelerators rp_uuid = self.provider_report(context, pr_name, resource_class, traits, total, parent_uuid) @@ -414,8 +415,7 @@ class ConductorManager(object): return result def get_rp_uuid_from_obj(self, obj): - rp_name = encodeutils.safe_decode(obj.name) - return str(uuid.uuid3(uuid.NAMESPACE_DNS, rp_name)) + return str(uuid.uuid3(uuid.NAMESPACE_DNS, six.ensure_str(obj.name))) def _delete_provider_and_sub_providers(self, context, rp_uuid): rp_in_tree = self.placement_client._get_providers_in_tree(context,