Isolate the eve-energy subdriver to private cluster usage

drivers/SmartThings/matter-switch/src/sub_drivers/eve_energy/can_handle.lua

@@ -6,11 +6,12 @@ local fields = require "switch_utils.fields"
 local switch_utils = require "switch_utils.utils"
 
 return function(opts, driver, device)
-  local EVE_MANUFACTURER_ID = 0x130A
-  -- this sub driver does NOT support child devices, and ONLY supports Eve devices
-  -- that do NOT support the Electrical Sensor device type
+  local EVE_PRIVATE_CLUSTER_ID = 0x130AFC01
+  -- this sub driver loads for devices that:
+  -- 1. Contain the Eve Private Cluster (0x130AFC01)
+  -- 2. Do NOT have the Standard Electrical Sensor device type
   if device.network_type == device_lib.NETWORK_TYPE_MATTER and
-    device.manufacturer_info.vendor_id == EVE_MANUFACTURER_ID and
+    #device:get_endpoints(EVE_PRIVATE_CLUSTER_ID) > 0 and
     #switch_utils.get_endpoints_by_device_type(device, fields.DEVICE_TYPE_ID.ELECTRICAL_SENSOR) == 0 then
     return true, require("sub_drivers.eve_energy")
   end

drivers/SmartThings/matter-switch/src/test/test_eve_energy.lua

@@ -15,6 +15,28 @@ local PRIVATE_ATTR_ID_WATT = 0x130A000A
 local PRIVATE_ATTR_ID_WATT_ACCUMULATED = 0x130A000B
 local PRIVATE_ATTR_ID_ACCUMULATED_CONTROL_POINT = 0x130A000E
 
+-- Helper function to add get_endpoints method to mock devices
+local function add_get_endpoints_to_mock(device)
+  device.get_endpoints = function(self, cluster_id, opts)
+    opts = opts or {}
+    local eps = {}
+    for _, ep in ipairs(self.endpoints) do
+      for _, cluster in ipairs(ep.clusters or {}) do
+        if cluster.cluster_id == cluster_id then
+          -- Check feature_bitmap if specified
+          if opts.feature_bitmap == nil or
+             (cluster.feature_map and (cluster.feature_map & opts.feature_bitmap) == opts.feature_bitmap) then
+            table.insert(eps, ep.endpoint_id)
+            break
+          end
+        end
+      end
+    end
+    return eps
+  end
+  return device
+end
+
 local mock_device = test.mock_device.build_test_matter_device({
   profile = t_utils.get_profile_definition("power-energy-powerConsumption.yml"),
   manufacturer_info = {
@@ -53,6 +75,7 @@ local mock_device = test.mock_device.build_test_matter_device({
     }
   }
 })
+add_get_endpoints_to_mock(mock_device)
 
 local mock_eve_device_using_electrical_sensor = test.mock_device.build_test_matter_device({
   profile = t_utils.get_profile_definition("plug-energy-powerConsumption.yml"),
@@ -112,6 +135,42 @@ local mock_eve_device_using_electrical_sensor = test.mock_device.build_test_matt
     }
   }
 })
+add_get_endpoints_to_mock(mock_eve_device_using_electrical_sensor)
+
+-- Mock device without Eve Private Cluster (should not match eve_energy sub-driver)
+local mock_device_without_private_cluster = test.mock_device.build_test_matter_device({
+  profile = t_utils.get_profile_definition("plug-binary.yml"),
+  manufacturer_info = {
+    vendor_id = 0x130A,
+    product_id = 0x0051,
+  },
+  endpoints = {
+    {
+      endpoint_id = 0,
+      clusters = {
+        { cluster_id = clusters.Basic.ID, cluster_type = "SERVER" },
+      },
+      device_types = {
+        { device_type_id = 0x0016, device_type_revision = 1 } -- RootNode
+      }
+    },
+    {
+      endpoint_id = 1,
+      clusters = {
+        {
+          cluster_id = clusters.OnOff.ID,
+          cluster_type = "SERVER",
+          cluster_revision = 1,
+          feature_map = 0, --u32 bitmap
+        }
+      },
+      device_types = {
+        { device_type_id = 0x010A, device_type_revision = 1 } -- On/Off Plug
+      }
+    }
+  }
+})
+add_get_endpoints_to_mock(mock_device_without_private_cluster)
 
 local function test_init()
   local cluster_subscribe_list = {
@@ -129,6 +188,31 @@ local function test_init()
 end
 test.set_test_init_function(test_init)
 
+test.register_coroutine_test(
+  "Eve Energy sub-driver can_handle should return true for devices with Eve Private Cluster and no Electrical Sensor",
+  function()
+    local eve_energy_can_handle = require("sub_drivers.eve_energy.can_handle")
+    local result, sub_driver = eve_energy_can_handle(nil, nil, mock_device)
+    assert(result == true, "can_handle should return true for Eve device with private cluster and no electrical sensor")
+    assert(sub_driver ~= nil, "sub_driver should be returned")
+  end,
+  {
+    min_api_version = 17
+  }
+)
+
+test.register_coroutine_test(
+  "Eve Energy sub-driver can_handle should return false for devices without Eve Private Cluster",
+  function()
+    local eve_energy_can_handle = require("sub_drivers.eve_energy.can_handle")
+    local result = eve_energy_can_handle(nil, nil, mock_device_without_private_cluster)
+    assert(result == false, "can_handle should return false for device without Eve Private Cluster")
+  end,
+  {
+    min_api_version = 17
+  }
+)
+
 test.register_message_test(
   "On command should send the appropriate commands",
   {