From 44280cd53f4768e856af6d705ca001f422675805 Mon Sep 17 00:00:00 2001 From: Eric Fried Date: Mon, 9 Dec 2019 12:09:08 -0600 Subject: [PATCH] FUP: Remove noqa and tone down an exception This is a followon from [1] to address [2] (remove unnecessary noqa comment from a long docstring line) and [3] (make the exception text for RequestGroupSuffixConflict calmer by s/!/./). [1] I55e4d61ba1c5920c44fd71eb36a9ed2cc64c4117 [2] https://review.opendev.org/#/c/696946/7/nova/scheduler/utils.py@84 [3] https://review.opendev.org/#/c/696946/7/nova/exception.py@2478 Change-Id: I8721be16c29697ca43c7ca1c32570e7daa1fb4c1 --- nova/exception.py | 2 +- nova/scheduler/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/exception.py b/nova/exception.py index df97218dcc7e..23b13cbd6799 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -2491,7 +2491,7 @@ class VPMEMCleanupFailed(NovaException): class RequestGroupSuffixConflict(NovaException): - msg_fmt = _("Duplicate request group suffix %(suffix)s!") + msg_fmt = _("Duplicate request group suffix %(suffix)s.") class AmbiguousResourceProviderForPCIRequest(NovaException): diff --git a/nova/scheduler/utils.py b/nova/scheduler/utils.py index af637dd9ffb4..267ba3aef56c 100644 --- a/nova/scheduler/utils.py +++ b/nova/scheduler/utils.py @@ -72,7 +72,7 @@ class ResourceRequest(object): ...where ``$S`` is a string suffix as supported via Placement microversion 1.33 - https://docs.openstack.org/placement/train/specs/train/implemented/2005575-nested-magic-1.html#arbitrary-group-suffixes # noqa + https://docs.openstack.org/placement/train/specs/train/implemented/2005575-nested-magic-1.html#arbitrary-group-suffixes .. note:: @@ -81,7 +81,7 @@ class ResourceRequest(object): The string suffix is used as the RequestGroup.requester_id to facilitate mapping of requests to allocation candidates using the ``mappings`` piece of the response added in Placement microversion 1.34 - https://docs.openstack.org/placement/train/specs/train/implemented/placement-resource-provider-request-group-mapping-in-allocation-candidates.html # noqa + https://docs.openstack.org/placement/train/specs/train/implemented/placement-resource-provider-request-group-mapping-in-allocation-candidates.html For image metadata, traits are extracted from the ``traits_required`` property, if present.