Merge commit '44f8ea7bbb0f7eae47c504ccd2a3f39d8f6ea74a' of https://gi…

…thub.com/project-chip/connectedhomeip into feature/device_attestation_complete
project-chip · Sep 10, 2021 · 38454ea · 38454ea
2 parents 99b1fa3 + 44f8ea7
commit 38454ea
Show file tree

Hide file tree

Showing 20 changed files with 490 additions and 1,155 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # Current reviewers-XXX teams, who review everything for approval.
-* @reviewers-amazon @reviewers-apple @reviewers-comcast @reviewers-google @reviewers-nordic @reviewers-samsung @reviewers-silabs
+* @reviewers-amazon @reviewers-apple @reviewers-comcast @reviewers-google @reviewers-lg @reviewers-nordic @reviewers-samsung @reviewers-silabs @reviewers-tcl
diff --git a/.pullapprove.yml b/.pullapprove.yml
@@ -99,6 +99,14 @@ groups:
             teams: [reviewers-google]
         reviews:
             request: 1
+    shared-reviewers-lg:
+        type: optional
+        conditions:
+            - files.include('*')
+        reviewers:
+            teams: [reviewers-lg]
+        reviews:
+            request: 1
     shared-reviewers-nordic:
         type: optional
         conditions:
@@ -123,6 +131,14 @@ groups:
             teams: [reviewers-silabs]
         reviews:
             request: 1
+    shared-reviewers-tcl:
+        type: optional
+        conditions:
+            - files.include('*')
+        reviewers:
+            teams: [reviewers-tcl]
+        reviews:
+            request: 1
 
     ############################################################
     #  Base Required Reviewers
@@ -142,236 +158,3 @@ groups:
             approved: "review - approved"
             pending: "review - pending"
             rejected: "review - changed requested"
-
-    ############################################################
-    #  Label Based Reviewers
-    ############################################################
-    codeowners-android:
-        type: optional
-        conditions:
-            - "'android' in labels"
-        reviewers:
-            teams:
-                - codeowners-android
-        reviews:
-            request: 1
-
-    codeowners-app:
-        type: optional
-        conditions:
-            - "'app' in labels"
-        reviewers:
-            teams:
-                - codeowners-app
-        reviews:
-            request: 1
-
-    codeowners-ble:
-        type: optional
-        conditions:
-            - "'ble' in labels"
-        reviewers:
-            teams:
-                - codeowners-ble
-        reviews:
-            request: 1
-
-    codeowners-controller:
-        type: optional
-        conditions:
-            - "'controller' in labels"
-        reviewers:
-            teams:
-                - codeowners-controller
-        reviews:
-            request: 1
-
-    codeowners-darwin:
-        type: optional
-        conditions:
-            - "'darwin' in labels"
-        reviewers:
-            teams:
-                - codeowners-darwin
-        reviews:
-            request: 1
-
-    codeowners-crypto:
-        type: optional
-        conditions:
-            - "'crypto' in labels"
-        reviewers:
-            teams:
-                - codeowners-crypto
-        reviews:
-            request: 1
-
-    codeowners-inet:
-        type: optional
-        conditions:
-            - "'inet' in labels"
-        reviewers:
-            teams:
-                - codeowners-inet
-        reviews:
-            request: 2
-
-    codeowners-core:
-        type: optional
-        conditions:
-            - "'core' in labels"
-        reviewers:
-            teams:
-                - codeowners-core
-        reviews:
-            request: 2
-
-    codeowners-protocols:
-        type: optional
-        conditions:
-            - "'protocols' in labels"
-        reviewers:
-            teams:
-                - codeowners-protocols
-        reviews:
-            request: 1
-
-    codeowners-shell:
-        type: optional
-        conditions:
-            - "'shell' in labels"
-        reviewers:
-            teams:
-                - codeowners-shell
-        reviews:
-            request: 1
-
-    codeowners-support:
-        type: optional
-        conditions:
-            - "'support' in labels"
-        reviewers:
-            teams:
-                - codeowners-support
-        reviews:
-            request: 1
-
-    codeowners-platform:
-        type: optional
-        conditions:
-            - "'platform' in labels"
-        reviewers:
-            teams:
-                - codeowners-platform
-        reviews:
-            request: 1
-
-    codeowners-qrcode:
-        type: optional
-        conditions:
-            - "'qrcode' in labels"
-        reviewers:
-            teams:
-                - codeowners-qrcode
-        reviews:
-            request: 1
-
-    codeowners-setup-payload:
-        type: optional
-        conditions:
-            - "'setup payload' in labels"
-        reviewers:
-            teams:
-                - codeowners-setup-payload
-        reviews:
-            request: 1
-
-    codeowners-system:
-        type: optional
-        conditions:
-            - "'system' in labels"
-        reviewers:
-            teams:
-                - codeowners-system
-        reviews:
-            request: 1
-
-    codeowners-test-driver:
-        type: optional
-        conditions:
-            - "'test driver' in labels"
-        reviewers:
-            teams:
-                - codeowners-test-driver
-        reviews:
-            request: 1
-
-    codeowners-github:
-        type: optional
-        conditions:
-            - "'github' in labels"
-        reviewers:
-            teams:
-                - codeowners-github
-        reviews:
-            request: 1
-
-    codeowners-vscode:
-        type: optional
-        conditions:
-            - "'vscode' in labels"
-        reviewers:
-            teams:
-                - codeowners-vscode
-        reviews:
-            request: 2
-
-    codeowners-integrations:
-        type: optional
-        conditions:
-            - "'integrations' in labels"
-        reviewers:
-            teams:
-                - codeowners-integrations
-        reviews:
-            request: 1
-
-    codeowners-transport:
-        type: optional
-        conditions:
-            - "'transport' in labels"
-        reviewers:
-            teams:
-                - codeowners-transport
-        reviews:
-            request: 1
-
-    codeowners-scripts:
-        type: optional
-        conditions:
-            - "'scripts' in labels"
-        reviewers:
-            teams:
-                - codeowners-scripts
-        reviews:
-            request: 1
-
-    codeowners-documentation:
-        type: optional
-        conditions:
-            - "'documentation' in labels"
-        reviewers:
-            teams:
-                - codeowners-documentation
-        reviews:
-            request: 1
-
-    codeowners-gn:
-        type: optional
-        conditions:
-            - "'gn' in labels"
-        reviewers:
-            teams:
-                - codeowners-gn
-        reviews:
-            request: 1
diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
@@ -330,14 +330,12 @@ class SetupListModel : public ListScreen::Model
 public:
     SetupListModel()
     {
-        std::string resetWiFi                      = "Reset WiFi";
-        std::string resetToFactory                 = "Reset to factory";
-        std::string forceWifiCommissioningBasic    = "Force WiFi commissioning (basic)";
-        std::string forceWifiCommissioningEnhanced = "Force WiFi commissioning (enhanced)";
+        std::string resetWiFi                   = "Reset WiFi";
+        std::string resetToFactory              = "Reset to factory";
+        std::string forceWifiCommissioningBasic = "Force WiFi commissioning (basic)";
         options.emplace_back(resetWiFi);
         options.emplace_back(resetToFactory);
         options.emplace_back(forceWifiCommissioningBasic);
-        options.emplace_back(forceWifiCommissioningEnhanced);
     }
     virtual std::string GetTitle() { return "Setup"; }
     virtual int GetItemCount() { return options.size(); }
@@ -359,11 +357,6 @@ class SetupListModel : public ListScreen::Model
             app::Mdns::AdvertiseCommissionableNode(app::Mdns::CommissioningMode::kEnabledBasic);
             OpenBasicCommissioningWindow(ResetFabrics::kYes, kNoCommissioningTimeout, PairingWindowAdvertisement::kMdns);
         }
-        else if (i == 3)
-        {
-            app::Mdns::AdvertiseCommissionableNode(app::Mdns::CommissioningMode::kEnabledEnhanced);
-            OpenBasicCommissioningWindow(ResetFabrics::kYes, kNoCommissioningTimeout, PairingWindowAdvertisement::kMdns);
-        }
     }
 
 private:

diff --git a/examples/chip-tool/templates/partials/test_cluster.zapt b/examples/chip-tool/templates/partials/test_cluster.zapt
@@ -197,6 +197,15 @@ class {{filename}}: public TestCommand
             return;
           }
         {{/if}}
+
+        {{#if expectedConstraints.notValue}}
+          if ({{asLowerCamelCase name}} == {{expectedConstraints.notValue}})
+          {
+            ChipLogError(chipTool, "Error: {{asLowerCamelCase name}} was not expected to be '{{expectedConstraints.notValue}}' due to notValue constraint");
+            runner->SetCommandExitStatus(CHIP_ERROR_INTERNAL);
+            return;
+          }
+        {{/if}}
         {{/if}}
         {{/chip_tests_item_response_parameters}}
 

diff --git a/examples/chip-tool/templates/tests-commands.zapt b/examples/chip-tool/templates/tests-commands.zapt
@@ -4,4 +4,4 @@
 
 #include <commands/tests/TestCommand.h>
 
-{{>test_cluster tests="TV_TargetNavigatorCluster, TV_AudioOutputCluster, TV_ApplicationLauncherCluster, TV_KeypadInputCluster, TV_AccountLoginCluster, TV_WakeOnLanCluster, TV_ApplicationBasicCluster, TV_MediaPlaybackCluster, TV_TvChannelCluster, TV_LowPowerCluster, TV_MediaInputCluster, TestCluster, TestDelayCommands, Test_TC_OO_1_1, Test_TC_OO_2_1, Test_TC_OO_2_2, Test_TC_DM_1_1, Test_TC_DM_3_1, Test_TC_CC_3_4, Test_TC_CC_5, Test_TC_CC_6, Test_TC_CC_7, Test_TC_CC_8, Test_TC_WNCV_1_1, Test_TC_WNCV_2_1, Test_TC_BI_1_1, Test_TC_FLW_1_1, Test_TC_TM_1_1, Test_TC_OCC_1_1, OperationalCredentialsCluster"}}
+{{>test_cluster tests="TV_TargetNavigatorCluster, TV_AudioOutputCluster, TV_ApplicationLauncherCluster, TV_KeypadInputCluster, TV_AccountLoginCluster, TV_WakeOnLanCluster, TV_ApplicationBasicCluster, TV_MediaPlaybackCluster, TV_TvChannelCluster, TV_LowPowerCluster, TV_MediaInputCluster, TestCluster, TestConstraints, TestDelayCommands, Test_TC_OO_1_1, Test_TC_OO_2_1, Test_TC_OO_2_2, Test_TC_DM_1_1, Test_TC_DM_3_1, Test_TC_CC_3_4, Test_TC_CC_5, Test_TC_CC_6, Test_TC_CC_7, Test_TC_CC_8, Test_TC_WNCV_1_1, Test_TC_WNCV_2_1, Test_TC_BI_1_1, Test_TC_FLW_1_1, Test_TC_TM_1_1, Test_TC_OCC_1_1, OperationalCredentialsCluster"}}
diff --git a/src/app/tests/suites/TestConstraints.yaml b/src/app/tests/suites/TestConstraints.yaml
@@ -0,0 +1,49 @@
+# 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: Test Cluster Constraints Tests
+
+config:
+    cluster: "Test Cluster"
+    endpoint: 1
+
+tests:
+    # Tests for UInt32 attribute
+
+    - label: "Write attribute INT32U Value"
+      command: "writeAttribute"
+      attribute: "int32u"
+      arguments:
+          value: 5
+
+    - label: "Read attribute INT32U Value MinValue Constraints"
+      command: "readAttribute"
+      attribute: "int32u"
+      response:
+          constraints:
+              minValue: 5
+
+    - label: "Read attribute INT32U Value MaxValue Constraints"
+      command: "readAttribute"
+      attribute: "int32u"
+      response:
+          constraints:
+              maxValue: 5
+
+    - label: "Read attribute INT32U Value NotValue Constraints"
+      command: "readAttribute"
+      attribute: "int32u"
+      response:
+          constraints:
+              notValue: 6