Remove Deleted ConcentrationMeasurement Clusters (#28053)

* Remove unused clusters from XML

* Regenerating codegen

* Removing duplicate PICS

* Removing generated files that are no longer generated

* Remove clusters from ZAP's list

* Updated controller zap file

* Removed deleted clusters from import list

* Restyled by autopep8

* Restyled by isort

* Fixing formatting on python multi-line list

* Restyled by isort

* Fixing formatting on python multi-line list

---------

Co-authored-by: Restyled.io <[email protected]>

.vscode/settings.json

@@ -169,5 +169,9 @@
     "C_Cpp.default.cppStandard": "gnu++14",
     "C_Cpp.default.cStandard": "gnu11",
     "cmake.configureOnOpen": false,
-    "search.followSymlinks": false
+    "search.followSymlinks": false,
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.autopep8"
+    },
+    "python.formatting.provider": "none"
 }

src/app/tests/suites/certification/PICS.yaml

@@ -8071,102 +8071,6 @@ PICS:
     # server / attributes
     #
 
-    - label: "Does the DUT(server) implement the MeasuredValue attribute?"
-      id: CMOCONC.S.A0000
-
-    - label: "Does the DUT(server) implement the MinMeasuredValue attribute?"
-      id: CMOCONC.S.A0001
-
-    - label: "Does the DUT(server) implement the MaxMeasuredValue attribute?"
-      id: CMOCONC.S.A0002
-
-    - label: "Does the DUT(server) implement the PeakMeasuredValue attribute?"
-      id: CMOCONC.S.A0003
-
-    - label:
-          "Does the DUT(server) implement the PeakMeasuredValueWindow attribute?"
-      id: CMOCONC.S.A0004
-
-    - label:
-          "Does the DUT(server) implement the AverageMeasuredValue attribute?"
-      id: CMOCONC.S.A0005
-
-    - label:
-          "Does the DUT(server) implement the AverageMeasuredValueWindow
-          attribute?"
-      id: CMOCONC.S.A0006
-
-    - label: "Does the DUT(server) implement the Uncertainty attribute?"
-      id: CMOCONC.S.A0007
-
-    - label: "Does the DUT(server) implement the MeasurementUnit attribute?"
-      id: CMOCONC.S.A0008
-
-    - label: "Does the DUT(server) implement the MeasurementMedium attribute?"
-      id: CMOCONC.S.A0009
-
-    - label: "Does the DUT(server) implement the LevelValue attribute?"
-      id: CMOCONC.S.A000a
-
-    - label:
-          "Does the device implement the (0xFFF8) GeneratedCommandList
-          attribute?"
-      id: CMOCONC.S.Afff8
-
-    - label:
-          "Does the device implement the (0xFFF9) AcceptedCommandList attribute?"
-      id: CMOCONC.S.Afff9
-
-    - label: "Does the device implement the (0xFFFA) EventList attribute ?"
-      id: CMOCONC.S.Afffa
-
-    - label: "Does the device implement the (0xFFFB) AttributeList attribute ?"
-      id: CMOCONC.S.Afffb
-
-    - label: "Does the device implement the (0xFFFC) FeatureMap attribute ?"
-      id: CMOCONC.S.Afffc
-
-    - label:
-          "Does the device implement the (0xFFFD) ClusterRevision attribute ?"
-      id: CMOCONC.S.Afffd
-
-    # Carbon Monoxide Concentration Measurement Cluster Test Plan
-    - label:
-          "Does the device implement the Carbon Monoxide Concentration
-          Measurement Cluster as a server?"
-      id: CMOCONC.S
-
-    - label:
-          "Does the device implement the Carbon Monoxide Concentration
-          Measurement Cluster as a client?"
-      id: CMOCONC.C
-
-    #
-    # server / features
-    #
-
-    - label: "Does the DUT(server) support the Numeric Measurement feature?"
-      id: CMOCONC.S.F00
-
-    - label: "Does the DUT(server) support the Level Indication feature?"
-      id: CMOCONC.S.F01
-
-    - label: "Does the DUT(server) support the Medium Level feature?"
-      id: CMOCONC.S.F02
-
-    - label: "Does the DUT(server) support the Critical Level feature?"
-      id: CMOCONC.S.F03
-
-    - label: "Does the DUT(server) support the Peak Measurement feature?"
-      id: CMOCONC.S.F04
-
-    - label: "Does the DUT(server) support the Average Measurement feature?"
-      id: CMOCONC.S.F05
-
-    #
-    # server / attributes
-    #
-
     - label: "Does the DUT(server) implement the MeasuredValue attribute?"
       id: CMOCONC.S.A0000
 

src/app/tests/suites/certification/ci-pics-values

@@ -2253,32 +2253,6 @@ CMOCONC.S.Afffb=1
 CMOCONC.S.Afffc=1
 CMOCONC.S.Afffd=1
 
-CMOCONC.C=0
-CMOCONC.S=1
-CMOCONC.S.F00=1
-CMOCONC.S.F01=1
-CMOCONC.S.F02=1
-CMOCONC.S.F03=1
-CMOCONC.S.F04=1
-CMOCONC.S.F05=1
-CMOCONC.S.A0000=1
-CMOCONC.S.A0001=1
-CMOCONC.S.A0002=1
-CMOCONC.S.A0003=1
-CMOCONC.S.A0004=1
-CMOCONC.S.A0005=1
-CMOCONC.S.A0006=1
-CMOCONC.S.A0007=1
-CMOCONC.S.A0008=1
-CMOCONC.S.A0009=1
-CMOCONC.S.A000a=1
-CMOCONC.S.Afff8=1
-CMOCONC.S.Afff9=1
-CMOCONC.S.Afffa=1
-CMOCONC.S.Afffb=1
-CMOCONC.S.Afffc=1
-CMOCONC.S.Afffd=1
-
 NDOCONC.C=0
 NDOCONC.S=1
 NDOCONC.S.F00=1

src/app/zap_cluster_list.json

@@ -17,63 +17,44 @@
         "BINDING_CLUSTER": [],
         "BOOLEAN_STATE_CLUSTER": [],
         "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
-        "BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "CHANNEL_CLUSTER": [],
-        "CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "CLIENT_MONITORING_CLUSTER": [],
         "COLOR_CONTROL_CLUSTER": [],
         "COMMISSIONING_CLUSTER": [],
         "CONTENT_LAUNCHER_CLUSTER": [],
-        "COPPER_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "DESCRIPTOR_CLUSTER": [],
         "DEVICE_TEMP_CLUSTER": [],
         "DIAGNOSTIC_LOGS_CLUSTER": [],
         "DISHWASHER_ALARM_CLUSTER": [],
         "DISHWASHER_MODE_CLUSTER": [],
-        "DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "DOOR_LOCK_CLUSTER": [],
         "ELECTRICAL_MEASUREMENT_CLUSTER": [],
         "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [],
-        "ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "FAN_CONTROL_CLUSTER": [],
         "FAULT_INJECTION_CLUSTER": [],
-        "FECAL_COLIFORM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "FIXED_LABEL_CLUSTER": [],
         "FLOW_MEASUREMENT_CLUSTER": [],
-        "FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "GENERAL_COMMISSIONING_CLUSTER": [],
         "GENERAL_DIAGNOSTICS_CLUSTER": [],
         "GROUP_KEY_MANAGEMENT_CLUSTER": [],
         "GROUPS_CLUSTER": [],
-        "HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "HEPA_FILTER_MONITORING_CLUSTER": [],
-        "HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "HYDROGEN_SULFIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "IAS_ZONE_CLUSTER": [],
         "ICD_MANAGEMENT_CLUSTER": [],
         "IDENTIFY_CLUSTER": [],
         "ILLUMINANCE_MEASUREMENT_CLUSTER": [],
         "KEYPAD_INPUT_CLUSTER": [],
         "LAUNDRY_WASHER_MODE_CLUSTER": [],
-        "LEAD_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "LEVEL_CONTROL_CLUSTER": [],
         "LOCALIZATION_CONFIGURATION_CLUSTER": [],
         "LOW_POWER_CLUSTER": [],
-        "MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "MEDIA_INPUT_CLUSTER": [],
         "MEDIA_PLAYBACK_CLUSTER": [],
         "MODE_SELECT_CLUSTER": [],
         "NETWORK_COMMISSIONING_CLUSTER": [],
-        "NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"],
         "ON_OFF_CLUSTER": [],
@@ -84,7 +65,6 @@
         "OTA_BOOTLOAD_CLUSTER": [],
         "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [],
         "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [],
-        "OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "PM10_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "PM1_CONCENTRATION_MEASUREMENT_CLUSTER": [],
@@ -110,10 +90,7 @@
         "RVC_RUN_MODE_CLUSTER": [],
         "SCENES_CLUSTER": [],
         "SMOKE_CO_ALARM_CLUSTER": [],
-        "SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "SOFTWARE_DIAGNOSTICS_CLUSTER": [],
-        "SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "SWITCH_CLUSTER": [],
         "TARGET_NAVIGATOR_CLUSTER": [],
         "TEMPERATURE_CONTROL_CLUSTER": [],
@@ -124,10 +101,7 @@
         "TIME_CLUSTER": [],
         "TIME_FORMAT_LOCALIZATION_CLUSTER": [],
         "TIME_SYNCHRONIZATION_CLUSTER": [],
-        "TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "TRUSTED_ROOT_CERTIFICATES_CLUSTER": [],
-        "TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "UNIT_LOCALIZATION_CLUSTER": [],
         "UNIT_TESTING_CLUSTER": [],
         "USER_LABEL_CLUSTER": [],
@@ -162,66 +136,47 @@
         "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
             "bridged-device-basic-information-server"
         ],
-        "BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "CHANNEL_CLUSTER": ["channel-server"],
-        "CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "COLOR_CONTROL_CLUSTER": ["color-control-server"],
         "COMMISSIONING_CLUSTER": [],
         "CONTENT_LAUNCHER_CLUSTER": ["content-launch-server"],
-        "COPPER_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "DESCRIPTOR_CLUSTER": ["descriptor"],
         "DEVICE_TEMP_CLUSTER": [],
         "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"],
         "DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"],
         "DISHWASHER_MODE_CLUSTER": ["mode-select-server"],
-        "DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "DOOR_LOCK_CLUSTER": ["door-lock-server"],
         "ELECTRICAL_MEASUREMENT_CLUSTER": [],
         "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [
             "ethernet-network-diagnostics-server"
         ],
-        "ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "FAN_CONTROL_CLUSTER": ["fan-control-server"],
         "FAULT_INJECTION_CLUSTER": ["fault-injection-server"],
-        "FECAL_COLIFORM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "FIXED_LABEL_CLUSTER": ["fixed-label-server"],
         "FLOW_MEASUREMENT_CLUSTER": [],
-        "FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "GENERAL_COMMISSIONING_CLUSTER": ["general-commissioning-server"],
         "GENERAL_DIAGNOSTICS_CLUSTER": ["general-diagnostics-server"],
         "GROUPS_CLUSTER": ["groups-server"],
-        "GROUP_KEY_MANAGEMENT_CLUSTER": ["group-key-mgmt-server"],
-        "HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "HEPA_FILTER_MONITORING_CLUSTER": ["resource-monitoring-server"],
-        "HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "HYDROGEN_SULFIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+        "GROUP_KEY_MANAGEMENT_CLUSTER": ["group-key-mgmt-server"],
         "IAS_ZONE_CLUSTER": [],
         "ICD_MANAGEMENT_CLUSTER": ["icd-management-server"],
         "IDENTIFY_CLUSTER": ["identify-server"],
         "ILLUMINANCE_MEASUREMENT_CLUSTER": [],
         "KEYPAD_INPUT_CLUSTER": ["keypad-input-server"],
         "LAUNDRY_WASHER_MODE_CLUSTER": ["mode-select-server"],
-        "LEAD_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "LEVEL_CONTROL_CLUSTER": ["level-control"],
         "LOCALIZATION_CONFIGURATION_CLUSTER": [
             "localization-configuration-server"
         ],
         "LOW_POWER_CLUSTER": ["low-power-server"],
-        "MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "MEDIA_INPUT_CLUSTER": ["media-input-server"],
         "MEDIA_PLAYBACK_CLUSTER": ["media-playback-server"],
         "MODE_SELECT_CLUSTER": ["mode-select-server"],
         "NETWORK_COMMISSIONING_CLUSTER": ["network-commissioning"],
-        "NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"],
         "ON_OFF_CLUSTER": ["on-off-server"],
@@ -231,7 +186,6 @@
         "OTA_BOOTLOAD_CLUSTER": [],
         "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": ["ota-provider"],
         "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": ["ota-requestor"],
-        "OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "PM10_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "PM1_CONCENTRATION_MEASUREMENT_CLUSTER": [],
@@ -261,10 +215,7 @@
         "RVC_RUN_MODE_CLUSTER": ["mode-select-server"],
         "SCENES_CLUSTER": ["scenes-server"],
         "SMOKE_CO_ALARM_CLUSTER": ["smoke-co-alarm-server"],
-        "SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "SOFTWARE_DIAGNOSTICS_CLUSTER": ["software-diagnostics-server"],
-        "SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "SWITCH_CLUSTER": ["switch-server"],
         "TARGET_NAVIGATOR_CLUSTER": ["target-navigator-server"],
         "TEMPERATURE_CONTROL_CLUSTER": ["temperature-control-server"],
@@ -279,9 +230,6 @@
         "TIME_CLUSTER": [],
         "TIME_FORMAT_LOCALIZATION_CLUSTER": ["time-format-localization-server"],
         "TIME_SYNCHRONIZATION_CLUSTER": ["time-synchronization-server"],
-        "TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER": [],
-        "TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "UNIT_LOCALIZATION_CLUSTER": [],
         "UNIT_TESTING_CLUSTER": ["test-cluster-server"],