summaryrefslogtreecommitdiff
path: root/trove/taskmanager/models.py
diff options
context:
space:
mode:
authorTakashi Natsume <takanattie@gmail.com>2022-08-20 13:04:05 +0900
committerTakashi Natsume <takanattie@gmail.com>2022-10-15 12:42:46 +0000
commit8c94e21196756c0a799dfafb42cbcf4ad96109f6 (patch)
treedc495ef292b28fab380a2d86f657a10f8f344eb3 /trove/taskmanager/models.py
parent346e1612200563cdbeadc49186fd819dc6d4f950 (diff)
downloadtrove-8c94e21196756c0a799dfafb42cbcf4ad96109f6.tar.gz
Fix deprecation warnings
Fix the following deprecation warnings. * DeprecationWarning: Using the 'user' argument is deprecated in version '2.18' and will be removed in version '3.0', please use the 'user_id' argument instead * DeprecationWarning: Property 'user' has moved to 'user_id' in version '2.6' and will be removed in version '3.0' Change-Id: I18802ae1e2318eae3c62a26459178b259c728ac4 Signed-off-by: Takashi Natsume <takanattie@gmail.com>
Diffstat (limited to 'trove/taskmanager/models.py')
-rwxr-xr-xtrove/taskmanager/models.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py
index 58dd8f2b..fcfa2827 100755
--- a/trove/taskmanager/models.py
+++ b/trove/taskmanager/models.py
@@ -116,7 +116,7 @@ class NotifyMixin(object):
'state_description': self.status,
'state': self.status,
'tenant_id': self.tenant_id,
- 'user_id': self.context.user,
+ 'user_id': self.context.user_id,
}
if CONF.get(self.datastore_version.manager).volume_support:
@@ -980,7 +980,7 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin):
nics, files={}, scheduler_hints=None):
userdata = self.prepare_userdata(datastore_manager)
metadata = {'trove_project_id': self.tenant_id,
- 'trove_user_id': self.context.user,
+ 'trove_user_id': self.context.user_id,
'trove_instance_id': self.id}
bdmap_v2 = block_device_mapping_v2
config_drive = CONF.use_nova_server_config_drive