From 12b07e12e2f6f43eb7dd9230d25acff2c6ac8343 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 23 May 2017 08:13:19 -0500 Subject: [PATCH] Fix get_compute_limits error message We're currently using name_or_id in the error message whether it's there or not. Change-Id: Ieaddc57e52f7c26b410ebe0178e2c30f48897769 --- shade/openstackcloud.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py index 7ad03662a..7d7be4d31 100644 --- a/shade/openstackcloud.py +++ b/shade/openstackcloud.py @@ -1888,6 +1888,7 @@ class OpenStackCloud( """ kwargs = {} project_id = None + error_msg = "Failed to get limits" if name_or_id: proj = self.get_project(name_or_id) @@ -1895,10 +1896,10 @@ class OpenStackCloud( raise OpenStackCloudException("project does not exist") project_id = proj.id kwargs['tenant_id'] = project_id + error_msg = "{msg} for the project: {project} ".format( + msg=error_msg, project=name_or_id) - with _utils.shade_exceptions( - "Failed to get limits for the project: {} ".format( - name_or_id)): + with _utils.shade_exceptions(error_msg): # TODO(mordred) Before we convert this to REST, we need to add # in support for running calls with a different project context limits = self.manager.submit_task(_tasks.NovaLimitsGet(**kwargs))