From f7b8f7b84ed814d4d903cd75c74d20d32f4a7023 Mon Sep 17 00:00:00 2001
From: Balazs Gibizer <balazs.gibizer@est.tech>
Date: Thu, 12 Dec 2019 16:10:57 +0100
Subject: [PATCH] Use reasonable name for provider mapping

This changes was cut out from I41868f8dc0aa5bff35d0e9e9982791f99df6fe0d
and it shorten the name of the provider mapping local variables and
removes a superfluous call to generating such mapping.

Change-Id: I0db1aa914881ab73f1455f69813c9c3c53a4520c
---
 nova/compute/manager.py | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 174b7139530b..3debbcbe752c 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2390,15 +2390,13 @@ class ComputeManager(manager.Manager):
         self._check_device_tagging(requested_networks, block_device_mapping)
         self._check_trusted_certs(instance)
 
-        request_group_resource_providers_mapping = \
-            self._get_request_group_mapping(request_spec)
+        provider_mapping = self._get_request_group_mapping(request_spec)
 
-        if request_group_resource_providers_mapping:
+        if provider_mapping:
             try:
                 compute_utils\
                     .update_pci_request_spec_with_allocated_interface_name(
-                        context, self.reportclient, instance,
-                        request_group_resource_providers_mapping)
+                        context, self.reportclient, instance, provider_mapping)
             except (exception.AmbiguousResourceProviderForPCIRequest,
                     exception.UnexpectedResourceProviderNameForPCIRequest
                     ) as e:
@@ -2421,13 +2419,9 @@ class ComputeManager(manager.Manager):
                                                      scheduler_hints)
                 image_meta = objects.ImageMeta.from_dict(image)
 
-                request_group_resource_providers_mapping = \
-                    self._get_request_group_mapping(request_spec)
-
                 with self._build_resources(context, instance,
                         requested_networks, security_groups, image_meta,
-                        block_device_mapping,
-                        request_group_resource_providers_mapping) as resources:
+                        block_device_mapping, provider_mapping) as resources:
                     instance.vm_state = vm_states.BUILDING
                     instance.task_state = task_states.SPAWNING
                     # NOTE(JoshNang) This also saves the changes to the
@@ -3422,16 +3416,14 @@ class ComputeManager(manager.Manager):
             allocations, rebuild_claim, scheduled_node, limits):
         """Helper to avoid deep nesting in the top-level method."""
 
-        request_group_resource_providers_mapping = None
+        provider_mapping = None
         if evacuate:
-            request_group_resource_providers_mapping = \
-                self._get_request_group_mapping(request_spec)
+            provider_mapping = self._get_request_group_mapping(request_spec)
 
-            if request_group_resource_providers_mapping:
+            if provider_mapping:
                 compute_utils.\
                     update_pci_request_spec_with_allocated_interface_name(
-                        context, self.reportclient, instance,
-                        request_group_resource_providers_mapping)
+                        context, self.reportclient, instance, provider_mapping)
 
         claim_context = rebuild_claim(
             context, instance, scheduled_node, allocations,
@@ -3442,7 +3434,7 @@ class ComputeManager(manager.Manager):
                 context, instance, orig_image_ref, image_meta, injected_files,
                 new_pass, orig_sys_metadata, bdms, evacuate, on_shared_storage,
                 preserve_ephemeral, migration, request_spec, allocations,
-                request_group_resource_providers_mapping)
+                provider_mapping)
 
     @staticmethod
     def _get_image_name(image_meta):
@@ -4839,15 +4831,13 @@ class ComputeManager(manager.Manager):
             # the request spec would already have the new flavor in it from the
             # else block below.
 
-        request_group_resource_providers_mapping = \
-            self._get_request_group_mapping(request_spec)
+        provider_mapping = self._get_request_group_mapping(request_spec)
 
-        if request_group_resource_providers_mapping:
+        if provider_mapping:
             try:
                 compute_utils.\
                     update_pci_request_spec_with_allocated_interface_name(
-                        context, self.reportclient, instance,
-                        request_group_resource_providers_mapping)
+                        context, self.reportclient, instance, provider_mapping)
             except (exception.AmbiguousResourceProviderForPCIRequest,
                     exception.UnexpectedResourceProviderNameForPCIRequest
                     ) as e: