Merge ~d0ugal/maas:bug/1876855 into maas:master

[Dougal Matthews]

LP: #1876855 Add can_probe to the driver power classes

This boolean flag determines if the power driver is suitable for use with
add_chassis.

The http API has been updated to use this flag when validating the allowed
list of driver names and the websocket API now includes this flag when
returning the list of power drivers from the general.power_drivers call.

To support backwards compatibility a new alias field was added to the driver classes. This allows them to be referred to by other names. For example "powerkvm" for virsh and "seamicro15k" for "sm15k"

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7587/console
COMMIT: 6d422ef802f869a9bb8b22c1fcace07a50a991c4

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7588/console
COMMIT: 56a25e7063c3f2ab44a65510f282553baa08dbed

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7d9c44fea608a1fa06cf0945682253a61d9552e1

review: Approve

[Dougal Matthews (d0ugal)]

I think this change is mostly ready for feedback. Sure there are some improvements that can be made

[Lee Trager (ltrager)]

Power drivers and Pod drivers use a different base class. get_all_power_types() should only be returning power drivers so you should be able to skip modifying the Pod drivers.

[Dougal Matthews (d0ugal)]

> Power drivers and Pod drivers use a different base class.
> get_all_power_types() should only be returning power drivers so you should be
> able to skip modifying the Pod drivers.

I made that change because I was seeing some unexpected behaviour. The PowerDriverRegistry also contains the pod drivers (as per the end of provisioningserver.drivers.power.registry).

However, because some of the names are duplicated (there is a virsh power driver and pod driver) I think the power driver is replaced by the pod driver in the registry. I thought this was a bug and got stuck trying to figure it out. I wonder if we still need the power drivers that also have pod drivers?

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7700/console
COMMIT: 31c2f3091ff479c097d6ec8f379d94cb42dfd637

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 035697a137f9fa67d7e1edcfa70add790f980e9a

review: Approve

[Dougal Matthews (d0ugal)]

> Power drivers and Pod drivers use a different base class.
> get_all_power_types() should only be returning power drivers so you should be
> able to skip modifying the Pod drivers.

I attempted to do this. However, I think this is the class heirachy;

provisioningserver.drivers.pod.PodDriver -> provisioningserver.drivers.pod.PodDriverBase -> provisioningserver.drivers.power.PowerDriverBase

So it seems that I can't skip pod drivers when adding a new abstract property to the power drivers. Maybe this wasn't intentional?

The method get_all_power_types currently returns all of the power drivers and pod drivers. I added a quick test to verify that which currently fails; https://pastebin.ubuntu.com/p/hm5qx9kdZn/

[Dougal Matthews (d0ugal)]

I also noticed that in provisioningserver.drivers.power.registry the PodDriverRegistry entries are added to the PowerDriverRegistry. However, since they are registered by name this means the virsh power driver is replaced by the virsh pod driver.

[Lee Trager (ltrager)]

LGTM!

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c4bc28e1217465a86e1a26eefd02c20461b087db

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 0bbca16f198642ab6e971245800d0808e5224695

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b586e6323baa1b28a66fae55e1dba8ede9de04a4

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7720/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b bug/1876855 lp:~d0ugal/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7722/consoleText

diff --git a/src/maasserver/api/machines.py b/src/maasserver/api/machines.py
index 72281b4..0ecf00a 100644
--- a/src/maasserver/api/machines.py
+++ b/src/maasserver/api/machines.py
@@ -43,6 +43,7 @@ from maasserver.api.utils import (
     get_optional_list,
     get_optional_param,
 )
+from maasserver.clusterrpc.driver_parameters import get_all_power_types
 from maasserver.enum import (
     BMC_TYPE,
     BRIDGE_TYPE,
@@ -2508,6 +2509,34 @@ class MachinesHandler(NodesHandler, PowersMixin):
                 machine.constraints_by_type["verbose_interfaces"] = interfaces
             return machine
 
+    def _get_chassis_param(self, request):
+        power_type_names = [
+            pt["name"] for pt in get_all_power_types() if pt["can_probe"]
+        ]
+
+        # NOTE: The http API accepts two additional names for backwards
+        # compatability. Previously the hardcoded list of chassis_type's was
+        # stored here and included powerkvm and seamicro15k. Neither of these
+        # are valid power driver names but they can be treated as virsh and
+        # sm15k.
+        power_type_names.extend(["powerkvm", "seamicro15k"])
+
+        chassis_type = get_mandatory_param(
+            request.POST,
+            "chassis_type",
+            validator=validators.OneOf(power_type_names),
+        )
+
+        # Convert sm15k to seamicro15k. This code was written to work with
+        # 'seamicro15k' but the power driver name in the provisioningserver is
+        # 'sm15k'. The following code expects the longer name. See the NOTE
+        # above for more context. Both powerkvm and virsh were previously
+        # supported so they don't need to be converted.
+        if chassis_type == "sm15k":
+            chassis_type = "seamicro15k"
+
+        return chassis_type
+
     @admin_method
     @operation(idempotent=False)
     def add_chassis(self, request):
@@ -2521,7 +2550,7 @@ class MachinesHandler(NodesHandler, PowersMixin):
         - ``msftocs``: Microsoft OCS Chassis Manager.
         - ``powerkvm``: Virtual Machines on Power KVM, managed by Virsh.
         - ``recs_box``: Christmann RECS|Box servers.
-        - ``seamicro15k``: Seamicro 1500 Chassis.
+        - ``sm15k``: Seamicro 1500 Chassis.
         - ``ucsm``: Cisco UCS Manager.
         - ``virsh``: virtual machines managed by Virsh.
         - ``vmware`` is the type for virtual machines managed by VMware.
@@ -2585,22 +2614,9 @@ class MachinesHandler(NodesHandler, PowersMixin):
         @error (http-status-code) "400" 400
         @error (content) "bad-params" Required parameters are missing.
         """
-        chassis_type = get_mandatory_param(
-            request.POST,
-            "chassis_type",
-            validator=validators.OneOf(
-                [
-                    "mscm",
-                    "msftocs",
-                    "powerkvm",
-                    "recs_box",
-                    "seamicro15k",
-                    "ucsm",
-                    "virsh",
-                    "vmware",
-                ]
-            ),
-        )
+
+        chassis_type = self._get_chassis_param(request)
+
         hostname = get_mandatory_param(request.POST, "hostname")
 
         if chassis_type in (
diff --git a/src/maasserver/api/tests/test_machines.py b/src/maasserver/api/tests/test_machines.py
index 98c4485..3adf781 100644
--- a/src/maasserver/api/tests/test_machines.py
+++ b/src/maasserver/api/tests/test_machines.py
@@ -2665,6 +2665,21 @@ class TestMachinesAPI(APITestCase.ForUser):
         )
         self.assertEqual(b"No provided chassis_type!", response.content)
 
+    def test_POST_add_chassis_invalid_chasis_type(self):
+        self.become_admin()
+        response = self.client.post(
+            reverse("machines_handler"),
+            {"op": "add_chassis", "chassis_type": "invalid"},
+        )
+        self.assertEqual(
+            http.client.BAD_REQUEST, response.status_code, response.content
+        )
+        self.assertTrue(
+            response.content.startswith(
+                b"Invalid chassis_type: Value must be one of: "
+            )
+        )
+
     def test_POST_add_chassis_requires_hostname(self):
         self.become_admin()
         response = self.client.post(
@@ -3058,7 +3073,7 @@ class TestMachinesAPI(APITestCase.ForUser):
                 ),
             )
 
-    def test_POST_add_chasis_only_allows_port_with_vmware_and_msftocs(self):
+    def test_POST_add_chassis_only_allows_port_with_vmware_and_msftocs(self):
         self.become_admin()
         for chassis_type in (
             "mscm",
@@ -3088,7 +3103,7 @@ class TestMachinesAPI(APITestCase.ForUser):
                 response.content,
             )
 
-    def test_POST_add_chasis_checks_port_too_high(self):
+    def test_POST_add_chassis_checks_port_too_high(self):
         self.become_admin()
         for chassis_type in ("msftocs", "recs_box", "vmware"):
             params = {
@@ -3110,7 +3125,7 @@ class TestMachinesAPI(APITestCase.ForUser):
                 response.content,
             )
 
-    def test_POST_add_chasis_checks_port_too_low(self):
+    def test_POST_add_chassis_checks_port_too_low(self):
         self.become_admin()
         for chassis_type in ("msftocs", "recs_box", "vmware"):
             params = {
@@ -3175,7 +3190,7 @@ class TestMachinesAPI(APITestCase.ForUser):
             ),
         )
 
-    def test_POST_add_chasis_only_allows_protocol_with_vmware(self):
+    def test_POST_add_chassis_only_allows_protocol_with_vmware(self):
         self.become_admin()
         for chassis_type in (
             "mscm",
diff --git a/src/maasserver/clusterrpc/driver_parameters.py b/src/maasserver/clusterrpc/driver_parameters.py
index 3c2175e..c29bba0 100644
--- a/src/maasserver/clusterrpc/driver_parameters.py
+++ b/src/maasserver/clusterrpc/driver_parameters.py
@@ -94,6 +94,7 @@ def add_power_driver_parameters(
     name,
     description,
     chassis,
+    can_probe,
     fields,
     missing_packages,
     parameters_set,
@@ -111,6 +112,8 @@ def add_power_driver_parameters(
     :type description: string
     :param chassis: Whether the power driver is for a chassis
     :type chassis: bool
+    :param can_probe: Whether the power driver supports add_chassis
+    :type can_probe: bool
     :param fields: The fields that make up the parameters for the power
         type. Will be validated against
         SETTING_PARAMETER_FIELD_SCHEMA.
@@ -137,6 +140,7 @@ def add_power_driver_parameters(
         "fields": fields,
         "missing_packages": missing_packages,
         "chassis": chassis,
+        "can_probe": can_probe,
     }
     if queryable is not None:
         params["queryable"] = queryable
@@ -262,6 +266,7 @@ def get_all_power_types(controllers=None, ignore_errors=True):
         fields = power_type.get("fields", [])
         description = power_type["description"]
         chassis = power_type["chassis"]
+        can_probe = power_type["can_probe"]
         missing_packages = power_type["missing_packages"]
         queryable = power_type.get("queryable")
         add_power_driver_parameters(
@@ -269,6 +274,7 @@ def get_all_power_types(controllers=None, ignore_errors=True):
             name,
             description,
             chassis,
+            can_probe,
             fields,
             missing_packages,
             merged_types,
diff --git a/src/maasserver/clusterrpc/tests/test_driver_parameters.py b/src/maasserver/clusterrpc/tests/test_driver_parameters.py
index 6e31cad..9334fa3 100644
--- a/src/maasserver/clusterrpc/tests/test_driver_parameters.py
+++ b/src/maasserver/clusterrpc/tests/test_driver_parameters.py
@@ -297,6 +297,7 @@ class TestAddPowerTypeParameters(MAASServerTestCase):
             name="blah",
             description="baz",
             chassis=True,
+            can_probe=False,
             fields=[self.make_field()],
             missing_packages=[],
             parameters_set=existing_parameters,
@@ -323,6 +324,7 @@ class TestAddPowerTypeParameters(MAASServerTestCase):
             name="blah",
             description="baz",
             chassis=False,
+            can_probe=False,
             fields=fields,
             missing_packages=missing_packages,
             parameters_set=existing_parameters,
@@ -334,6 +336,7 @@ class TestAddPowerTypeParameters(MAASServerTestCase):
                     "name": "blah",
                     "description": "baz",
                     "chassis": False,
+                    "can_probe": False,
                     "fields": fields,
                     "missing_packages": missing_packages,
                 }
@@ -349,6 +352,7 @@ class TestAddPowerTypeParameters(MAASServerTestCase):
             name="blah",
             description="baz",
             chassis=False,
+            can_probe=False,
             fields=[{}],
             missing_packages=[],
             parameters_set=[],
@@ -362,6 +366,7 @@ class TestAddPowerTypeParameters(MAASServerTestCase):
             name="blah",
             description="baz",
             chassis=False,
+            can_probe=False,
             fields=fields,
             missing_packages=[],
             parameters_set=parameters_set,
diff --git a/src/provisioningserver/drivers/pod/lxd.py b/src/provisioningserver/drivers/pod/lxd.py
index 5e06104..bd47a07 100644
--- a/src/provisioningserver/drivers/pod/lxd.py
+++ b/src/provisioningserver/drivers/pod/lxd.py
@@ -93,6 +93,7 @@ class LXDPodDriver(PodDriver):
 
     name = "lxd"
     chassis = True
+    can_probe = False
     description = "LXD (virtual systems)"
     settings = [
         make_setting_field("power_address", "LXD address", required=True),
diff --git a/src/provisioningserver/drivers/pod/rsd.py b/src/provisioningserver/drivers/pod/rsd.py
index 91aceef..25401b3 100644
--- a/src/provisioningserver/drivers/pod/rsd.py
+++ b/src/provisioningserver/drivers/pod/rsd.py
@@ -68,6 +68,7 @@ RSD_NODE_POWER_STATE = {"PoweredOn": "on", "PoweredOff": "off"}
 class RSDPodDriver(RedfishPowerDriverBase, PodDriverBase):
 
     chassis = True  # Pods are always a chassis
+    can_probe = False
 
     # RSDPodDriver inherits from RedfishPowerDriver.
     # Power parameters will need to be changed to reflect this.
diff --git a/src/provisioningserver/drivers/pod/tests/test_base.py b/src/provisioningserver/drivers/pod/tests/test_base.py
index 829761a..df60ddc 100644
--- a/src/provisioningserver/drivers/pod/tests/test_base.py
+++ b/src/provisioningserver/drivers/pod/tests/test_base.py
@@ -874,6 +874,7 @@ class FakePodDriverBase(PodDriverBase):
 
     name = ""
     chassis = True
+    can_probe = True
     description = ""
     settings = []
     ip_extractor = None
@@ -1020,6 +1021,7 @@ class TestPodDriverBase(MAASTestCase):
                 "queryable": fake_driver.queryable,
                 "missing_packages": [],
                 "chassis": True,
+                "can_probe": True,
             },
             fake_driver.get_schema(),
         )
diff --git a/src/provisioningserver/drivers/pod/tests/test_registry.py b/src/provisioningserver/drivers/pod/tests/test_registry.py
index 1e1c2e5..34e790b 100644
--- a/src/provisioningserver/drivers/pod/tests/test_registry.py
+++ b/src/provisioningserver/drivers/pod/tests/test_registry.py
@@ -41,6 +41,7 @@ class TestPodDriverRegistry(MAASTestCase):
                     "queryable": fake_driver_one.queryable,
                     "missing_packages": fake_driver_one.detect_missing_packages(),
                     "chassis": True,
+                    "can_probe": True,
                 },
                 {
                     "driver_type": "pod",
@@ -50,6 +51,7 @@ class TestPodDriverRegistry(MAASTestCase):
                     "queryable": fake_driver_two.queryable,
                     "missing_packages": fake_driver_two.detect_missing_packages(),
                     "chassis": True,
+                    "can_probe": True,
                 },
             ],
             PodDriverRegistry.get_schema(),
diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index 50a8b97..690e015 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -1292,6 +1292,7 @@ class VirshPodDriver(PodDriver):
 
     name = "virsh"
     description = "Virsh (virtual systems)"
+    can_probe = True
     settings = [
         make_setting_field("power_address", "Address", required=True),
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/__init__.py b/src/provisioningserver/drivers/power/__init__.py
index c9534f1..b6e68af 100644
--- a/src/provisioningserver/drivers/power/__init__.py
+++ b/src/provisioningserver/drivers/power/__init__.py
@@ -49,6 +49,7 @@ JSON_POWER_DRIVER_SCHEMA = {
         "driver_type": {"type": "string"},
         "name": {"type": "string"},
         "chassis": {"type": "boolean"},
+        "can_probe": {"type": "boolean"},
         "description": {"type": "string"},
         "fields": {"type": "array", "items": SETTING_PARAMETER_FIELD_SCHEMA},
         "ip_extractor": IP_EXTRACTOR_SCHEMA,
@@ -168,6 +169,10 @@ class PowerDriverBase(metaclass=ABCMeta):
     def chassis(self):
         """Return True if the power driver is for a chassis."""
 
+    @abstractproperty
+    def can_probe(self):
+        """Return True if the power driver can be used with add_chassis."""
+
     @abstractmethod
     def detect_missing_packages(self):
         """Implement this method for the actual implementation
@@ -220,6 +225,7 @@ class PowerDriverBase(metaclass=ABCMeta):
             name=self.name,
             description=self.description,
             chassis=self.chassis,
+            can_probe=self.can_probe,
             fields=self.settings,
             queryable=self.queryable,
             missing_packages=(
diff --git a/src/provisioningserver/drivers/power/amt.py b/src/provisioningserver/drivers/power/amt.py
index 7410383..14288a0 100644
--- a/src/provisioningserver/drivers/power/amt.py
+++ b/src/provisioningserver/drivers/power/amt.py
@@ -47,6 +47,7 @@ class AMTPowerDriver(PowerDriver):
 
     name = "amt"
     chassis = False
+    can_probe = False
     description = "Intel AMT"
     settings = [
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/apc.py b/src/provisioningserver/drivers/power/apc.py
index 680175c..1fe8505 100644
--- a/src/provisioningserver/drivers/power/apc.py
+++ b/src/provisioningserver/drivers/power/apc.py
@@ -29,6 +29,7 @@ class APCPowerDriver(PowerDriver):
 
     name = "apc"
     chassis = True
+    can_probe = False
     description = "American Power Conversion (APC) PDU"
     settings = [
         make_setting_field("power_address", "IP for APC PDU", required=True),
diff --git a/src/provisioningserver/drivers/power/dli.py b/src/provisioningserver/drivers/power/dli.py
index d389d20..f27bdf3 100644
--- a/src/provisioningserver/drivers/power/dli.py
+++ b/src/provisioningserver/drivers/power/dli.py
@@ -29,6 +29,7 @@ from provisioningserver.utils.shell import (
 class DLIPowerDriver(PowerDriver):
     name = "dli"
     chassis = True
+    can_probe = False
     description = "Digital Loggers, Inc. PDU"
     settings = [
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/hmc.py b/src/provisioningserver/drivers/power/hmc.py
index b12ea76..1679d7e 100644
--- a/src/provisioningserver/drivers/power/hmc.py
+++ b/src/provisioningserver/drivers/power/hmc.py
@@ -35,6 +35,7 @@ class HMCPowerDriver(PowerDriver):
 
     name = "hmc"
     chassis = True
+    can_probe = False
     description = "IBM Hardware Management Console (HMC)"
     settings = [
         make_setting_field("power_address", "IP for HMC", required=True),
diff --git a/src/provisioningserver/drivers/power/ipmi.py b/src/provisioningserver/drivers/power/ipmi.py
index 02d49a0..877fff9 100644
--- a/src/provisioningserver/drivers/power/ipmi.py
+++ b/src/provisioningserver/drivers/power/ipmi.py
@@ -203,6 +203,7 @@ class IPMIPowerDriver(PowerDriver):
 
     name = "ipmi"
     chassis = False
+    can_probe = False
     description = "IPMI"
     settings = [
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/manual.py b/src/provisioningserver/drivers/power/manual.py
index daaf5ed..44edd69 100644
--- a/src/provisioningserver/drivers/power/manual.py
+++ b/src/provisioningserver/drivers/power/manual.py
@@ -17,6 +17,7 @@ class ManualPowerDriver(PowerDriver):
 
     name = "manual"
     chassis = False
+    can_probe = False
     description = "Manual"
     settings = []
     ip_extractor = None
diff --git a/src/provisioningserver/drivers/power/moonshot.py b/src/provisioningserver/drivers/power/moonshot.py
index c8f2bf5..9608528 100644
--- a/src/provisioningserver/drivers/power/moonshot.py
+++ b/src/provisioningserver/drivers/power/moonshot.py
@@ -26,6 +26,7 @@ class MoonshotIPMIPowerDriver(PowerDriver):
 
     name = "moonshot"
     chassis = True
+    can_probe = False
     description = "HP Moonshot - iLO4 (IPMI)"
     settings = [
         make_setting_field("power_address", "Power address", required=True),
diff --git a/src/provisioningserver/drivers/power/mscm.py b/src/provisioningserver/drivers/power/mscm.py
index 02f21a6..3db65f8 100644
--- a/src/provisioningserver/drivers/power/mscm.py
+++ b/src/provisioningserver/drivers/power/mscm.py
@@ -56,6 +56,7 @@ class MSCMPowerDriver(PowerDriver):
 
     name = "mscm"
     chassis = True
+    can_probe = True
     description = "HP Moonshot - iLO Chassis Manager"
     settings = [
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/msftocs.py b/src/provisioningserver/drivers/power/msftocs.py
index 5b09f96..a549a76 100644
--- a/src/provisioningserver/drivers/power/msftocs.py
+++ b/src/provisioningserver/drivers/power/msftocs.py
@@ -37,6 +37,7 @@ class MicrosoftOCSPowerDriver(PowerDriver):
 
     name = "msftocs"
     chassis = True
+    can_probe = True
     description = "Microsoft OCS - Chassis Manager"
     settings = [
         make_setting_field("power_address", "Power address", required=True),
diff --git a/src/provisioningserver/drivers/power/nova.py b/src/provisioningserver/drivers/power/nova.py
index 392ae4b..607515c 100644
--- a/src/provisioningserver/drivers/power/nova.py
+++ b/src/provisioningserver/drivers/power/nova.py
@@ -39,6 +39,7 @@ class NovaPowerDriver(PowerDriver):
 
     name = "nova"
     chassis = True
+    can_probe = False
     description = "OpenStack Nova"
     settings = [
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/openbmc.py b/src/provisioningserver/drivers/power/openbmc.py
index 24c7c21..3c0a461 100644
--- a/src/provisioningserver/drivers/power/openbmc.py
+++ b/src/provisioningserver/drivers/power/openbmc.py
@@ -39,6 +39,7 @@ REG_MODE = {"data": "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular"}
 class OpenBMCPowerDriver(PowerDriver):
 
     chassis = False
+    can_probe = False
 
     name = "openbmc"
     description = "OpenBMC Power Driver"
diff --git a/src/provisioningserver/drivers/power/recs.py b/src/provisioningserver/drivers/power/recs.py
index 4f45beb..3d1b948 100644
--- a/src/provisioningserver/drivers/power/recs.py
+++ b/src/provisioningserver/drivers/power/recs.py
@@ -206,6 +206,7 @@ class RECSPowerDriver(PowerDriver):
 
     name = "recs_box"
     chassis = True
+    can_probe = True
     description = "Christmann RECS|Box Power Driver"
     settings = [
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/redfish.py b/src/provisioningserver/drivers/power/redfish.py
index 27f6354..bd388a6 100644
--- a/src/provisioningserver/drivers/power/redfish.py
+++ b/src/provisioningserver/drivers/power/redfish.py
@@ -134,6 +134,7 @@ class RedfishPowerDriverBase(PowerDriver):
 class RedfishPowerDriver(RedfishPowerDriverBase):
 
     chassis = True  # Redfish API endpoints can be probed and enlisted.
+    can_probe = False
 
     name = "redfish"
     description = "Redfish"
diff --git a/src/provisioningserver/drivers/power/seamicro.py b/src/provisioningserver/drivers/power/seamicro.py
index 7b5134d..aee9b4c 100644
--- a/src/provisioningserver/drivers/power/seamicro.py
+++ b/src/provisioningserver/drivers/power/seamicro.py
@@ -40,6 +40,7 @@ class SeaMicroPowerDriver(PowerDriver):
 
     name = "sm15k"
     chassis = True
+    can_probe = True
     description = "SeaMicro 15000"
     settings = [
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/tests/test_base.py b/src/provisioningserver/drivers/power/tests/test_base.py
index 0e6039e..8c56180 100644
--- a/src/provisioningserver/drivers/power/tests/test_base.py
+++ b/src/provisioningserver/drivers/power/tests/test_base.py
@@ -43,6 +43,7 @@ class FakePowerDriverBase(PowerDriverBase):
 
     name = ""
     chassis = False
+    can_probe = False
     description = ""
     settings = []
     ip_extractor = None
@@ -183,6 +184,7 @@ class TestPowerDriverBase(MAASTestCase):
                 "name": fake_name,
                 "description": fake_description,
                 "chassis": fake_chassis,
+                "can_probe": False,
                 "fields": fake_settings,
                 "queryable": fake_driver.queryable,
                 "missing_packages": fake_driver.detect_missing_packages(),
@@ -251,6 +253,7 @@ class FakePowerDriver(PowerDriver):
 
     name = ""
     chassis = False
+    can_probe = False
     description = ""
     settings = []
     ip_extractor = None
@@ -264,7 +267,7 @@ class FakePowerDriver(PowerDriver):
         self.settings = settings
         if wait_time is not None:
             self.wait_time = wait_time
-        super(FakePowerDriver, self).__init__(clock)
+        super().__init__(clock)
 
     def detect_missing_packages(self):
         return []
diff --git a/src/provisioningserver/drivers/power/tests/test_registry.py b/src/provisioningserver/drivers/power/tests/test_registry.py
index 9ee55eb..0e9c392 100644
--- a/src/provisioningserver/drivers/power/tests/test_registry.py
+++ b/src/provisioningserver/drivers/power/tests/test_registry.py
@@ -18,7 +18,7 @@ from provisioningserver.utils.testing import RegistryFixture
 
 class TestPowerDriverRegistry(MAASTestCase):
     def setUp(self):
-        super(TestPowerDriverRegistry, self).setUp()
+        super().setUp()
         # Ensure the global registry is empty for each test run.
         self.useFixture(RegistryFixture())
 
@@ -49,6 +49,7 @@ class TestPowerDriverRegistry(MAASTestCase):
                     "name": fake_driver_one.name,
                     "description": fake_driver_one.description,
                     "chassis": fake_driver_one.chassis,
+                    "can_probe": fake_driver_one.can_probe,
                     "fields": [],
                     "queryable": fake_driver_one.queryable,
                     "missing_packages": fake_driver_one.detect_missing_packages(),
@@ -58,6 +59,7 @@ class TestPowerDriverRegistry(MAASTestCase):
                     "name": fake_driver_two.name,
                     "description": fake_driver_two.description,
                     "chassis": fake_driver_two.chassis,
+                    "can_probe": fake_driver_two.can_probe,
                     "fields": [],
                     "queryable": fake_driver_two.queryable,
                     "missing_packages": fake_driver_two.detect_missing_packages(),
@@ -67,6 +69,7 @@ class TestPowerDriverRegistry(MAASTestCase):
                     "name": fake_pod_driver.name,
                     "description": fake_pod_driver.description,
                     "chassis": fake_pod_driver.chassis,
+                    "can_probe": fake_pod_driver.can_probe,
                     "fields": [],
                     "queryable": fake_pod_driver.queryable,
                     "missing_packages": fake_pod_driver.detect_missing_packages(),
diff --git a/src/provisioningserver/drivers/power/ucsm.py b/src/provisioningserver/drivers/power/ucsm.py
index bc9accb..6fdd9b1 100644
--- a/src/provisioningserver/drivers/power/ucsm.py
+++ b/src/provisioningserver/drivers/power/ucsm.py
@@ -30,6 +30,7 @@ class UCSMPowerDriver(PowerDriver):
 
     name = "ucsm"
     chassis = True
+    can_probe = True
     description = "Cisco UCS Manager"
     settings = [
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/vmware.py b/src/provisioningserver/drivers/power/vmware.py
index 86b7e2c..b222a24 100644
--- a/src/provisioningserver/drivers/power/vmware.py
+++ b/src/provisioningserver/drivers/power/vmware.py
@@ -38,6 +38,7 @@ class VMwarePowerDriver(PowerDriver):
 
     name = "vmware"
     chassis = True
+    can_probe = True
     description = "VMware"
     settings = [
         make_setting_field(
diff --git a/src/provisioningserver/drivers/power/wedge.py b/src/provisioningserver/drivers/power/wedge.py
index aee85df..6470b5d 100644
--- a/src/provisioningserver/drivers/power/wedge.py
+++ b/src/provisioningserver/drivers/power/wedge.py
@@ -27,6 +27,7 @@ class WedgePowerDriver(PowerDriver):
 
     name = "wedge"
     chassis = False
+    can_probe = False
     description = "Facebook's Wedge"
     settings = [
         make_setting_field("power_address", "IP address", required=True),
diff --git a/src/provisioningserver/tests/test_power_driver_command.py b/src/provisioningserver/tests/test_power_driver_command.py
index 2884951..12f505a 100644
--- a/src/provisioningserver/tests/test_power_driver_command.py
+++ b/src/provisioningserver/tests/test_power_driver_command.py
@@ -15,6 +15,27 @@ from provisioningserver import power_driver_command
 from provisioningserver.drivers.power import PowerDriver
 
 
+class FakeDriver(PowerDriver):
+    # These are required by the base class, but unused in this test.
+    chassis = False
+    can_probe = False
+    description = None
+    detect_missing_packages = None
+    ip_extractor = None
+    name = None
+    settings = []
+    _state = "off"
+
+    def power_on(self, *args, **kwargs):
+        self._state = "on"
+
+    def power_off(self, *args, **kwargs):
+        self._state = "off"
+
+    def power_query(self, *args, **kwargs):
+        return self._state
+
+
 class TestPowerDriverCommand(MAASTestCase):
 
     run_tests_with = MAASTwistedRunTest.make_factory(timeout=5000)
@@ -90,25 +111,6 @@ class TestPowerDriverCommand(MAASTestCase):
         args.command = "on"
         args.driver = "fake"
 
-        class FakeDriver(PowerDriver):
-            # These are required by the base class, but unused in this test.
-            chassis = None
-            description = None
-            detect_missing_packages = None
-            ip_extractor = None
-            name = None
-            settings = []
-            _state = "off"
-
-            def power_on(self, *args, **kwargs):
-                self._state = "on"
-
-            def power_off(self, *args, **kwargs):
-                self._state = "off"
-
-            def power_query(self, *args, **kwargs):
-                return self._state
-
         driver = FakeDriver()
         registry = {"fake": driver}