Merge branch 'master' into test-branch

abpoth · Jul 18, 2023 · 23a70bf · 23a70bf
2 parents f0ae6d8 + 44466c1
commit 23a70bf
Show file tree

Hide file tree

Showing 2 changed files with 141 additions and 1 deletion.
diff --git a/src/app/tests/suites/certification/Test_TC_RVCOPSTATE_1_1.yaml b/src/app/tests/suites/certification/Test_TC_RVCOPSTATE_1_1.yaml
@@ -0,0 +1,138 @@
+# Copyright (c) 2023 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: xx.1.1. [TC-RVCOPSTATE-1.1] Global attributes with server as DUT
+
+PICS:
+    - RVCOPSTATE.S
+
+config:
+    nodeId: 0x12344321
+    cluster: "Robotic Vacuum Operational State"
+    endpoint: 1
+
+tests:
+    - label: "Wait for the commissioned device to be retrieved"
+      cluster: "DelayCommands"
+      command: "WaitForCommissionee"
+      arguments:
+          values:
+              - name: "nodeId"
+                value: nodeId
+
+    - label: "TH reads the ClusterRevision attribute from the DUT"
+      PICS: RVCOPSTATE.S.Afffd
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          value: 1
+          constraints:
+              type: int16u
+
+    - label: "TH reads the FeatureMap attribute from the DUT"
+      PICS: RVCOPSTATE.S.Afffc
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          value: 0
+          constraints:
+              type: bitmap32
+
+    - label: "TH reads the AttributeList attribute from the DUT"
+      PICS: RVCOPSTATE.S.Afffb
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              type: list
+              contains:
+                  [0, 1, 3, 4, 5, 65528, 65529, 65530, 65531, 65532, 65533]
+
+    - label:
+          "TH reads from the DUT the optional attribute(CountdownTime) in the
+          AttributeList from the DUT"
+      PICS: RVCOPSTATE.S.A0002 && RVCOPSTATE.S.Afffb
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              type: list
+              contains: [2]
+
+    - label: "TH reads from the DUT the EventList attribute."
+      PICS: RVCOPSTATE.S.Afffa
+      command: "readAttribute"
+      attribute: "EventList"
+      response:
+          constraints:
+              type: list
+              contains: [0x00]
+
+    - label:
+          "TH reads from the DUT the optional event(OperationCompletion) in
+          EventList."
+      PICS: RVCOPSTATE.S.E01 && RVCOPSTATE.S.Afffa
+      command: "readAttribute"
+      attribute: "EventList"
+      response:
+          constraints:
+              type: list
+              contains: [0x01]
+
+    - label: "Read the optional command(Start) in AcceptedCommandList"
+      PICS: RVCOPSTATE.S.C02 && RVCOPSTATE.S.Afff9
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+              contains: [1, 2]
+
+    - label: "Read the optional command(Stop) in AcceptedCommandList"
+      PICS: RVCOPSTATE.S.C01 && RVCOPSTATE.S.Afff9
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+              contains: [1]
+
+    - label: "Read the optional command(Pause) in AcceptedCommandList"
+      PICS: RVCOPSTATE.S.C00 && RVCOPSTATE.S.Afff9
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+              contains: [0, 3]
+
+    - label: "Read the optional command(Resume) in AcceptedCommandList"
+      PICS: RVCOPSTATE.S.C03 && RVCOPSTATE.S.Afff9
+      command: "readAttribute"
+      attribute: "AcceptedCommandList"
+      response:
+          constraints:
+              type: list
+              contains: [0, 3]
+
+    - label: "Read the global attribute: GeneratedCommandList"
+      PICS:
+          RVCOPSTATE.S.Afff8 && (RVCOPSTATE.S.C00 || RVCOPSTATE.S.C01 ||
+          RVCOPSTATE.S.C02 || RVCOPSTATE.S.C03)
+      command: "readAttribute"
+      attribute: "GeneratedCommandList"
+      response:
+          constraints:
+              type: list
+              contains: [4]
diff --git a/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp b/src/platform/silabs/NetworkCommissioningWiFiDriver.cpp
@@ -179,7 +179,9 @@ void SlWiFiDriver::UpdateNetworkingStatus()
     ByteSpan networkId = ByteSpan((const unsigned char *) mStagingNetwork.ssid, mStagingNetwork.ssidLen);
     if (!wfx_is_sta_connected())
     {
-        mpStatusChangeCallback->OnNetworkingStatusChange(Status::kUnknownError, MakeOptional(networkId), NullOptional);
+        // TODO: https://github.com/project-chip/connectedhomeip/issues/26861
+        mpStatusChangeCallback->OnNetworkingStatusChange(Status::kUnknownError, MakeOptional(networkId),
+                                                         MakeOptional(static_cast<int32_t>(SL_STATUS_FAIL)));
         return;
     }
     mpStatusChangeCallback->OnNetworkingStatusChange(Status::kSuccess, MakeOptional(networkId), NullOptional);