Skip to content

Commit 34e26ab

Browse files
committed
Updating TC_CADMIN_1_5 test module:
- Updated to using updated pake verifier for each test step 9-12 as needed for each step
1 parent 23a081d commit 34e26ab

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/python_testing/TC_CADMIN_1_5.py

+11-7
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ async def test_TC_CADMIN_1_5(self):
130130
sleep(190)
131131

132132
self.step(4)
133-
await self.SnakeCase(setup_code=params.commissioningParameters.setupPinCode, discriminator=params.randomDiscriminator)
133+
await self.commission_on_network(setup_code=params.commissioningParameters.setupPinCode, discriminator=params.randomDiscriminator)
134134

135135
self.step(5)
136136
params2 = await self.open_commissioning_window(dev_ctrl=self.th1, timeout=180, node_id=self.dut_node_id)
@@ -141,7 +141,7 @@ async def test_TC_CADMIN_1_5(self):
141141
sleep(1)
142142

143143
self.step(7)
144-
await self.SnakeCase(setup_code=params2.commissioningParameters.setupPinCode, discriminator=params2.randomDiscriminator, expected_error=0x00000032)
144+
await self.commission_on_network(setup_code=params2.commissioningParameters.setupPinCode, discriminator=params2.randomDiscriminator, expected_error=0x00000032)
145145

146146
self.step(8)
147147
try:
@@ -152,37 +152,41 @@ async def test_TC_CADMIN_1_5(self):
152152
"Cluster status must be 4 to pass this step as window should be reported as not open")
153153

154154
self.step(9)
155-
EcmPakeVerifier = b"hex:d0e8a02db8629e9d172dfd40719c89204ff395651a6a2612839a71469880ec2404687d05cf0642b91242c712b5405b6905070c2a4bd80bdc8437ae5a2aded0cf3de91318d16f0ce9450d1c802cc01f39b8761de87cc7eeeb7f52b51308353da49a"
155+
#EcmPakeVerifier = b"hex:uWFwqugDNGiEck/po7KHwwMwwqZgN10XuyBajPGuyzUEV/iree4lOrao5GuwnlQ65CJzbeUB49s31EH+NEkg0JVI5MGCQGMMT/SRPFNRODm3wH/MBiehuFc6FJ/NH6Rmzw=="
156+
iter999 = b"hex:/q9Xque1iokBVf/SGwjfzJWY0vgmFapUoIcgR+4rXdEEHBELKQ2VYwF9XjZiIrfYztJo2adB8O9MtQ/LWlfJMqMUt8jYcuQtYTc2NQIOZWFiKXbT5K7ipt4svYVEs1rmLA=="
156157
try:
157158
cmd = Clusters.AdministratorCommissioning.Commands.OpenCommissioningWindow(
158-
iterations=999, discriminator=3045, PAKEPasscodeVerifier=EcmPakeVerifier, commissioningTimeout=180, salt=b"SPAKE2P_Key_Salt")
159+
iterations=999, discriminator=3045, PAKEPasscodeVerifier=iter999, commissioningTimeout=180, salt=b"SPAKE2P_Key_Salt")
159160
await self.th1.SendCommand(nodeid=self.dut_node_id, endpoint=0, payload=cmd, timedRequestTimeoutMs=2000000)
160161
except IME as e:
161162
asserts.assert_equal(e.clusterStatus, Clusters.AdministratorCommissioning.Enums.StatusCode.kPAKEParameterError,
162163
f'Failed to open commissioning window due to an unexpected error code of {e.clusterStatus}')
163164

164165
self.step(10)
166+
iter100001 = b"hex:CUhS9rS2NKjXGYwK0CCG80d6XkC1QSCAfs8++IcOCRcEwM4DlA/wxlm/B7w4G/7tZJmLycmdRLJGlYF2+HDsYdGmoxj0ENNuXTmXsoOhkZUmmTXThAak3U9vGFWbKUHXCQ=="
165167
try:
166168
cmd = Clusters.AdministratorCommissioning.Commands.OpenCommissioningWindow(
167-
iterations=100001, discriminator=3045, PAKEPasscodeVerifier=EcmPakeVerifier, commissioningTimeout=180, salt=b"SPAKE2P_Key_Salt")
169+
iterations=100001, discriminator=3045, PAKEPasscodeVerifier=iter100001, commissioningTimeout=180, salt=b"SPAKE2P_Key_Salt")
168170
await self.th1.SendCommand(nodeid=self.dut_node_id, endpoint=0, payload=cmd, timedRequestTimeoutMs=2000000)
169171
except IME as e:
170172
asserts.assert_equal(e.clusterStatus, Clusters.AdministratorCommissioning.Enums.StatusCode.kPAKEParameterError,
171173
f'Failed to open commissioning window due to an unexpected error code of {e.clusterStatus}')
172174

173175
self.step(11)
176+
short_salt = b"hex:c8StVjueM851ZnKA+/0m83PHeVIhfhhWvGVCGcAnDD8EbCiPuKb1Z18I7l3TvxTbVkvzS2KPjKPOCZt1GW80ZoVDP48NAewqEXfl6lY7nmDG9ZzMIhfa8f1EIiBY0/7eJA=="
174177
try:
175178
cmd = Clusters.AdministratorCommissioning.Commands.OpenCommissioningWindow(
176-
iterations=10000, discriminator=3045, PAKEPasscodeVerifier=EcmPakeVerifier, commissioningTimeout=180, salt=b"too_short")
179+
iterations=10000, discriminator=3045, PAKEPasscodeVerifier=short_salt, commissioningTimeout=180, salt=b"too_short")
177180
await self.th1.SendCommand(nodeid=self.dut_node_id, endpoint=0, payload=cmd, timedRequestTimeoutMs=2000000)
178181
except IME as e:
179182
asserts.assert_equal(e.clusterStatus, Clusters.AdministratorCommissioning.Enums.StatusCode.kPAKEParameterError,
180183
f'Failed to open commissioning window due to an unexpected error code of {e.clusterStatus}')
181184

182185
self.step(12)
186+
long_salt = b"hex:nwkb2VD3OTPflW2sAChSwpfkaajErERg/XrhvWPPJL4EM6cSCY/h9lz5SgKy7WB5s1nn1u75amcumZrxnVCXbI0vRrM74BV20p0VyOhpOMBaoHpT2Tvev8pc0JDYCjn6wg=="
183187
try:
184188
cmd = Clusters.AdministratorCommissioning.Commands.OpenCommissioningWindow(
185-
iterations=10000, discriminator=3045, PAKEPasscodeVerifier=EcmPakeVerifier, commissioningTimeout=180, salt=b"'this pake salt very very very long'")
189+
iterations=10000, discriminator=3045, PAKEPasscodeVerifier=long_salt, commissioningTimeout=180, salt=b"'this pake salt very very very long'")
186190
await self.th1.SendCommand(nodeid=self.dut_node_id, endpoint=0, payload=cmd, timedRequestTimeoutMs=2000000)
187191
except IME as e:
188192
asserts.assert_equal(e.clusterStatus, Clusters.AdministratorCommissioning.Enums.StatusCode.kPAKEParameterError,

0 commit comments

Comments
 (0)