Fix incorrect GetClusterId() in cluster-objects. (#11019)

If the name of a cluster happens to overlap with the name of some
other construct (e.g. a command), we can get the wrong ids like so:

    static constexpr CommandId GetCommandId() { return Identify::Id; }
    static constexpr ClusterId GetClusterId() { return Identify::Id; }

The solution, for now, is to prefix with Cluster:: and Command:: as needed.

examples/chip-tool/templates/tests.js

@@ -132,6 +132,7 @@ function getTests()
     'TestLogCommands',
     'TestDescriptorCluster',
     'TestBasicInformation',
+    'TestIdentifyCluster',
     'TestOperationalCredentialsCluster',
   ];
 

src/app/tests/suites/TestIdentifyCluster.yaml

@@ -0,0 +1,27 @@
+# Copyright (c) 2021 Project CHIP Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: Identify Cluster Tests
+
+config:
+    cluster: "Identify"
+    endpoint: 0
+
+tests:
+    - label: "Send Identify command and expect success response"
+      command: "identify"
+      arguments:
+          values:
+              - name: "IdentifyTime"
+                value: 0

src/app/zap-templates/templates/app/cluster-objects.zapt

@@ -102,8 +102,8 @@ struct Type
 {
 public:
     // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand
-    static constexpr CommandId GetCommandId() { return {{asUpperCamelCase name}}::Id; }
-    static constexpr ClusterId GetClusterId() { return {{asUpperCamelCase parent.name}}::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::{{asUpperCamelCase name}}::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
 
     {{#zcl_command_arguments}}
     {{zapTypeToEncodableClusterObjectType type}} {{asLowerCamelCase label}};
@@ -114,8 +114,8 @@ public:
 
 struct DecodableType {
 public:
-    static constexpr CommandId GetCommandId() { return {{asUpperCamelCase name}}::Id; }
-    static constexpr ClusterId GetClusterId() { return {{asUpperCamelCase parent.name}}::Id; }
+    static constexpr CommandId GetCommandId() { return Commands::{{asUpperCamelCase name}}::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
 
     {{#zcl_command_arguments}}
     {{zapTypeToDecodableClusterObjectType type}} {{asLowerCamelCase label}};
@@ -171,7 +171,7 @@ struct Type
 public:
     static constexpr PriorityLevel priorityLevel = PriorityLevel::{{asUpperCamelCase priority}};
     static constexpr EventId eventId = {{asMEI manufacturerCode code}};
-    static constexpr ClusterId GetClusterId() { return {{asUpperCamelCase parent.name}}::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
 
     {{#zcl_event_fields}}
     {{zapTypeToEncodableClusterObjectType type}} {{asLowerCamelCase name}};
@@ -184,7 +184,7 @@ struct DecodableType {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
     static constexpr EventId GetEventId() { return kEventId; }
-    static constexpr ClusterId GetClusterId() { return {{asUpperCamelCase parent.name}}::Id; }
+    static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
 
     {{#zcl_event_fields}}
     {{zapTypeToDecodableClusterObjectType type}} {{asLowerCamelCase name}};

src/darwin/Framework/CHIP/templates/tests.js

@@ -116,6 +116,7 @@ function getTests()
     'TestDelayCommands',
     'TestDescriptorCluster',
     'TestBasicInformation',
+    'TestIdentifyCluster',
     'TestOperationalCredentialsCluster',
   ];