From: asteroide Date: Wed, 14 Oct 2015 19:24:57 +0000 (+0200) Subject: Change the way the tenant dict is updated with Keystone information on the add_tenant... X-Git-Tag: colorado.1.0~121 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F37%2F2537%2F1;p=moon.git Change the way the tenant dict is updated with Keystone information on the add_tenant_dict. Change-Id: Ifa164a51b0195f546b97267ffca677bbf3a18eca --- diff --git a/keystone-moon/keystone/contrib/moon/core.py b/keystone-moon/keystone/contrib/moon/core.py index f1bba652..bca90adb 100644 --- a/keystone-moon/keystone/contrib/moon/core.py +++ b/keystone-moon/keystone/contrib/moon/core.py @@ -411,7 +411,9 @@ class TenantManager(manager.Manager): if 'id' not in tenant_dict: tenant_dict['id'] = None keystone_tenant = self.__get_keystone_tenant_dict(tenant_dict['id'], tenant_dict['name']) - tenant_dict.update(keystone_tenant) + for att in keystone_tenant: + if keystone_tenant[att]: + tenant_dict[att] = keystone_tenant[att] # Sync users between intra_authz_extension and intra_admin_extension self.moonlog_api.debug("add_tenant_dict {}".format(tenant_dict)) if 'intra_admin_extension_id' in tenant_dict and tenant_dict['intra_admin_extension_id']: