the rest, I think.

Author: cecille

src/python_testing/TC_CCTRL.py

@@ -188,13 +188,16 @@ async def test_TC_CCTRL_3_1(self):
 
         #self.step(15)
         cmd = Clusters.CommissionerControl.Commands.CommissionNode(requestId=good_request_id, responseTimeoutSeconds=30)
-        resp = await self.send_single_cmd(cmd)
+        resp: Clusters.CommissionerControl.Commands.ReverseOpenCommissioningWindow = await self.send_single_cmd(cmd)
         asserts.assert_equal(type(resp), Clusters.CommissionerControl.Commands.ReverseOpenCommissioningWindow, "Incorrect response type")
 
         #self.step(16)
-        #TODO: we do not have a direct line to OpenEnhancedCommissioningWindow. Need to add plumbing
-        # For now, open with anything so the below command is ok
-        await self.openCommissioningWindow(dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid)
+        # min commissioning timeout is 3*60 seconds, so use that even though the command said 30.
+        cmd = Clusters.AdministratorCommissioning.Commands.OpenCommissioningWindow(commissioningTimeout=3*60,
+                                                                                   PAKEPasscodeVerifier=resp.PAKEPasscodeVerifier,
+                                                                                   discriminator=resp.discriminator,
+                                                                                   iterations=resp.iterations, salt=resp.salt)
+        await self.send_single_cmd(cmd, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0, timedRequestTimeoutMs=5000)
 
         #self.step(17)
         logging.info("Test now waits for 30 seconds")
@@ -210,9 +213,10 @@ async def test_TC_CCTRL_3_1(self):
         await self.send_single_cmd(cmd, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, timedRequestTimeoutMs=5000, endpoint=0)
 
         #self.step(20)
+        print('step 20')
         good_request_id = 0x1234567812345678
         cmd = Clusters.CommissionerControl.Commands.RequestCommissioningApproval(requestId=good_request_id, vendorId=th_server_vid, productId=th_server_pid, label="Test Ecosystem")
-        self.send_single_cmd(cmd)
+        await self.send_single_cmd(cmd)
 
         #self.step(21)
         if not self.is_ci:
@@ -227,6 +231,28 @@ async def test_TC_CCTRL_3_1(self):
         asserts.assert_equal(new_event[0].Data.clientNodeId, self.matter_test_config.controller_node_id, "Unexpected client node id")
         asserts.assert_equal(new_event[0].Data.requestId, good_request_id, "Unexpected request ID")
 
+        #self.step(23)
+        cmd = Clusters.CommissionerControl.Commands.CommissionNode(requestId=good_request_id, responseTimeoutSeconds=30)
+        resp = await self.send_single_cmd(cmd)
+        asserts.assert_equal(type(resp), Clusters.CommissionerControl.Commands.ReverseOpenCommissioningWindow, "Incorrect response type")
+
+        #self.step(24)
+        # min commissioning timeout is 3*60 seconds, so use that even though the command said 30.
+        cmd = Clusters.AdministratorCommissioning.Commands.OpenCommissioningWindow(commissioningTimeout=3*60,
+                                                                                   PAKEPasscodeVerifier=resp.PAKEPasscodeVerifier,
+                                                                                   discriminator=resp.discriminator,
+                                                                                   iterations=resp.iterations, salt=resp.salt)
+        await self.send_single_cmd(cmd, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0, timedRequestTimeoutMs=5000)
+
+        #self.step(25)
+        if not self.is_ci:
+            time.sleep(30)
+
+        th_server_fabrics_new = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0)
+        #TODO: this should be mocked too.
+        if not self.is_ci:
+            asserts.assert_equal(len(th_server_fabrics) + 1, len(th_server_fabrics_new), "Unexpected number of fabrics on TH_SERVER")
+
 
 
 if __name__ == "__main__":

src/python_testing/test_testing/test_TC_CCNTL.py

@@ -18,6 +18,7 @@
 
 import os
 import sys
+import base64
 import pathlib
 import typing
 
@@ -42,22 +43,34 @@ def dynamic_invoke_return(*args, **argv):
     global invoke_call_count
     invoke_call_count += 1
 
-    if invoke_call_count == 1: # Commission node with no prior request, return failure
+    # passcode 20202024
+    reverse_open = Clusters.CommissionerControl.Commands.ReverseOpenCommissioningWindow(commissioningTimeout=30,
+                                                                                        PAKEPasscodeVerifier=b"+w1qZQR05Zn0bc2LDyNaDAhsrhDS5iRHPTN10+EmNx8E2OpIPC4SjWRDQVOgqcbnXdYMlpiZ168xLBqn1fx9659gGK/7f9Yc6GxpoJH8kwAUYAYyLGsYeEBt1kL6kpXjgA==",
+                                                                                        discriminator=2222, iterations=10000, salt=base64.b64encode(bytes('SaltyMcSalterson', 'utf-8')))
+
+    print(f'invoke call {invoke_call_count}')
+    if invoke_call_count == 1: # Commission node with no prior request, return failure - step 5
         raise InteractionModelError(status=Status.Failure)
-    elif invoke_call_count == 2: # Commission node over pase - return unsupported access
+    elif invoke_call_count == 2: # Commission node over pase - return unsupported access - step 6
         raise InteractionModelError(status=Status.UnsupportedAccess)
-    elif invoke_call_count == 3: # request commissioning approval over pase - return unsupported access
+    elif invoke_call_count == 3: # request commissioning approval over pase - return unsupported access - step 7
         raise InteractionModelError(status=Status.UnsupportedAccess)
-    elif invoke_call_count == 4: # good RequestCommissioningApproval over CASE with bad vid
+    elif invoke_call_count == 4: # good RequestCommissioningApproval over CASE with bad vid - step 9
         return None
-    elif invoke_call_count == 5: # CommissionNode with bad request id
+    elif invoke_call_count == 5: # CommissionNode with bad request id - step 12
         raise InteractionModelError(status=Status.Failure)
-    elif invoke_call_count == 6: # CommissionNode with bad timeout (low)
+    elif invoke_call_count == 6: # CommissionNode with bad timeout (low) - step 13
         raise InteractionModelError(status=Status.Failure)
-    elif invoke_call_count == 7: # CommissionNode with bad timeout (high)
+    elif invoke_call_count == 7: # CommissionNode with bad timeout (high) - step 14
         raise InteractionModelError(status=Status.Failure)
-    elif invoke_call_count == 8: #CommissionNode
-        return Clusters.CommissionerControl.Commands.ReverseOpenCommissioningWindow(commissioningTimeout=30, PAKEPasscodeVerifier=b'', discriminator=2222, iterations=10000, salt=bytes('SaltyMcSaltersons', 'utf-8'))
+    elif invoke_call_count == 8: # CommissionNode - step 15
+        # passcode 20202024
+        return reverse_open
+    elif invoke_call_count == 9: # RequestCommissioningApproval with good vid - step 20
+        return None
+    elif invoke_call_count == 10: # CommissionNode - step 23
+        # passcode 20202024
+        return reverse_open
     else:
         raise InteractionModelError(Status.Failure)
 
@@ -74,7 +87,7 @@ def dynamic_event_return(*args, **argv):
         data = Clusters.CommissionerControl.Events.CommissioningRequestResult(requestId=0x1234567887654321, clientNodeId=112233, statusCode=0)
         result = Attribute.EventReadResult(Header=header, Status=Status.Success, Data=data)
         return [result]
-    elif event_call_count == 4: # returmed event with new request id
+    elif event_call_count == 4: # returmed event with new request
         header = Attribute.EventHeader(EndpointId=0, ClusterId=Clusters.CommissionerControl.id, EventId=Clusters.CommissionerControl.Events.CommissioningRequestResult.event_id, EventNumber=1)
         data = Clusters.CommissionerControl.Events.CommissioningRequestResult(requestId=0x1234567812345678, clientNodeId=112233, statusCode=0)
         result = Attribute.EventReadResult(Header=header, Status=Status.Success, Data=data)