Change the admin-visible logs for mdev support

Now that we want to support generic stateless mdev devices, we can't
really tell of pGPUs and vGPUs in our logs and we need to be more
generic.

Change-Id: I016773b6d6750db4f34ef6faac6d272c4177d883
Partially-Implements: blueprint generic-mdevs

Author: sbauza

nova/conf/devices.py

@@ -40,7 +40,7 @@
 ``[devices]/enabled_mdev_types``.
 
 If the same PCI address is provided for two different types, nova-compute will
-return an InvalidLibvirtGPUConfig exception at restart.
+return an InvalidLibvirtMdevConfig exception at restart.
 
 As an interim period, old configuration groups named ``[vgpu_$(MDEV_TYPE)]``
 will be accepted. A valid configuration could then be::

nova/exception.py

@@ -2337,8 +2337,8 @@ def __init__(self, arqs, **kwargs):
         self.arqs = arqs or []
 
 
-class InvalidLibvirtGPUConfig(NovaException):
-    msg_fmt = _('Invalid configuration for GPU devices: %(reason)s')
+class InvalidLibvirtMdevConfig(NovaException):
+    msg_fmt = _('Invalid configuration for mdev-capable devices: %(reason)s')
 
 
 class RequiredMixedInstancePolicy(Invalid):

nova/tests/unit/virt/libvirt/test_driver.py

@@ -25293,7 +25293,7 @@ def test_get_supported_vgpu_types_with_duplicate_types(self):
         # Provide the same pGPU PCI ID for two different types
         self.flags(device_addresses=['0000:84:00.0'], group='mdev_nvidia-11')
         self.flags(device_addresses=['0000:84:00.0'], group='mdev_nvidia-12')
-        self.assertRaises(exception.InvalidLibvirtGPUConfig,
+        self.assertRaises(exception.InvalidLibvirtMdevConfig,
                           libvirt_driver.LibvirtDriver,
                           fake.FakeVirtAPI(), False)
 
@@ -25304,7 +25304,7 @@ def test_get_supported_vgpu_types_with_invalid_pci_address(self):
         nova.conf.devices.register_dynamic_opts(CONF)
         # Fat-finger the PCI address
         self.flags(device_addresses=['whoops'], group='mdev_nvidia-11')
-        self.assertRaises(exception.InvalidLibvirtGPUConfig,
+        self.assertRaises(exception.InvalidLibvirtMdevConfig,
                           libvirt_driver.LibvirtDriver,
                           fake.FakeVirtAPI(), False)
 
@@ -25687,8 +25687,9 @@ def test_allocate_mdevs_with_no_idea_of_the_provider(self, mock_warning):
         self.assertRaises(exception.ComputeResourcesUnavailable,
                           drvr._allocate_mdevs, allocations=allocations)
         mock_warning.assert_called_once_with(
-            "pGPU device name %(name)s can't be guessed from the ProviderTree "
-            "roots %(roots)s", {'name': 'oops_I_did_it_again', 'roots': 'cn'})
+            "mdev-capable device name %(name)s can't be guessed from the "
+            "ProviderTree roots %(roots)s",
+            {'name': 'oops_I_did_it_again', 'roots': 'cn'})
 
     @mock.patch.object(libvirt_driver.LibvirtDriver, '_get_vgpu_type_per_pgpu')
     @mock.patch.object(libvirt_driver.LibvirtDriver, '_get_mediated_devices')
@@ -25808,7 +25809,7 @@ def test_recreate_mediated_device_on_init_host_with_wrong_config(
         drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
         # mdev1 was originally created for nvidia-99 but the operator messed up
         # the configuration by removing this type, we want to hardstop.
-        self.assertRaises(exception.InvalidLibvirtGPUConfig,
+        self.assertRaises(exception.InvalidLibvirtMdevConfig,
                           drvr.init_host, host='foo')
 
     @mock.patch.object(libvirt_guest.Guest, 'detach_device')

nova/virt/libvirt/driver.py

@@ -974,15 +974,14 @@ def _recreate_assigned_mediated_devices(self):
                     # vGPU type. We can't recreate the mdev until the operator
                     # modifies the configuration.
                     parent = "{}:{}:{}.{}".format(*parent[4:].split('_'))
-                    msg = ("The instance UUID %(inst)s uses a VGPU that "
-                           "its parent pGPU %(parent)s no longer "
-                           "supports as the instance vGPU type %(type)s "
-                           "is not accepted for the pGPU. Please correct "
+                    msg = ("The instance UUID %(inst)s uses a mediated device "
+                           "type %(type)s that is no longer supported by the "
+                           "parent PCI device, %(parent)s. Please correct "
                            "the configuration accordingly." %
                            {'inst': instance_uuid,
                             'parent': parent,
                             'type': dev_info['type']})
-                    raise exception.InvalidLibvirtGPUConfig(reason=msg)
+                    raise exception.InvalidLibvirtMdevConfig(reason=msg)
                 self._create_new_mediated_device(parent, uuid=mdev_uuid)
 
     def _check_file_backed_memory_support(self):
@@ -7414,15 +7413,15 @@ def _get_supported_vgpu_types(self):
                 return [first_type]
             for device_address in group.device_addresses:
                 if device_address in self.pgpu_type_mapping:
-                    raise exception.InvalidLibvirtGPUConfig(
+                    raise exception.InvalidLibvirtMdevConfig(
                         reason="duplicate types for PCI ID %s" % device_address
                     )
                 # Just checking whether the operator fat-fingered the address.
                 # If it's wrong, it will return an exception
                 try:
                     pci_utils.parse_address(device_address)
                 except exception.PciDeviceWrongAddressFormat:
-                    raise exception.InvalidLibvirtGPUConfig(
+                    raise exception.InvalidLibvirtMdevConfig(
                         reason="incorrect PCI address: %s" % device_address
                     )
                 self.pgpu_type_mapping[device_address] = vgpu_type
@@ -7452,12 +7451,12 @@ def _get_vgpu_type_per_pgpu(self, device_address):
         except (exception.PciDeviceWrongAddressFormat, IndexError):
             # this is not a valid PCI address
             LOG.warning("The PCI address %s was invalid for getting the "
-                        "related vGPU type", device_address)
+                        "related mdev type", device_address)
             return
         try:
             return self.pgpu_type_mapping.get(device_address)
         except KeyError:
-            LOG.warning("No vGPU type was configured for PCI address: %s",
+            LOG.warning("No mdev type was configured for PCI address: %s",
                         device_address)
             # We accept to return None instead of raising an exception
             # because we prefer the callers to return the existing exceptions
@@ -7877,7 +7876,7 @@ def _allocate_mdevs(self, allocations):
             # The provider doesn't exist, return a better understandable
             # exception
             raise exception.ComputeResourcesUnavailable(
-                reason='vGPU resource is not available')
+                reason='mdev-capable resource is not available')
         # FIXME(sbauza): The functional reshape test assumes that we could
         # run _allocate_mdevs() against non-nested RPs but this is impossible
         # as all inventories have been reshaped *before now* since it's done
@@ -7900,14 +7899,14 @@ def _allocate_mdevs(self, allocations):
                     break
             else:
                 LOG.warning(
-                    "pGPU device name %(name)s can't be guessed from the "
-                    "ProviderTree roots %(roots)s",
+                    "mdev-capable device name %(name)s can't be guessed from "
+                    "the ProviderTree roots %(roots)s",
                     {'name': rp_name,
                      'roots': ', '.join([root.name for root in roots])})
                 # We f... have no idea what was the parent device
                 # If we can't find devices having available VGPUs, just raise
                 raise exception.ComputeResourcesUnavailable(
-                    reason='vGPU resource is not available')
+                    reason='mdev-capable resource is not available')
 
         supported_types = self.supported_vgpu_types
         # Which mediated devices are created but not assigned to a guest ?
@@ -7925,7 +7924,7 @@ def _allocate_mdevs(self, allocations):
             if not chosen_mdev:
                 # If we can't find devices having available VGPUs, just raise
                 raise exception.ComputeResourcesUnavailable(
-                    reason='vGPU resource is not available')
+                    reason='mdev-capable resource is not available')
             else:
                 chosen_mdevs.append(chosen_mdev)
         return chosen_mdevs
@@ -7946,7 +7945,7 @@ def _detach_mediated_devices(self, guest):
                 # operation to support reallocating mediated devices.
                 if error_code == libvirt.VIR_ERR_CONFIG_UNSUPPORTED:
                     reason = _("Suspend is not supported for instances having "
-                               "attached vGPUs.")
+                               "attached mediated devices.")
                     raise exception.InstanceFaultRollback(
                         exception.InstanceSuspendFailure(reason=reason))
                 else: