Python framework: Remove default from get_endpoint (#41711)
* Python framework: Remove default from get_endpoint
In order to do test selection we need to know the endpoint
before the test. if the default is set by the test explicitly
outside of the test function call, we know.
Ideally, all tests would be explicit about asking the tester
to set the endpoint to avoid accidentally testing the wrong
thing. However, the intent of this PR is not to change that
policy, but rather to make the information available before
the test function itself is run, either through the user
command line parameter or through the static default.
The functions inside tests were adjusted according to the following
rules
- get_endpoint calls in test_ functions with @run_if_endpoint_matches
decorators just have the defaults removed. Those decorators
already enforce that the endpoint parameter is given on the
command line so the default would never be used.
- get_endpoint calls in utility functions have the defaults
removed since these should use the endpoint of the caller
in the first place
- get_endpoint calls with a default in functions decorated with
the async_test_body decorator have an explicit default_endpoint
property function defined to match the given default if the
default is not 0
* Fix type annotation
* A couple more
* Fix doorlock
* fix webrtcp-2.9
* fix a couple more
* Fix two additional tests added after this PR was raised
* missed one more
* add default endpoints to door lock
* I liked the function so much I thought...why not two?
diff --git a/src/python_testing/TC_AVSMTestBase.py b/src/python_testing/TC_AVSMTestBase.py
index fc51cc7..e824561 100644
--- a/src/python_testing/TC_AVSMTestBase.py
+++ b/src/python_testing/TC_AVSMTestBase.py
@@ -49,7 +49,7 @@
class AVSMTestBase:
async def precondition_one_allocated_snapshot_stream(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
@@ -100,7 +100,7 @@
pass
async def precondition_one_allocated_audio_stream(self, streamUsage: Globals.Enums.StreamUsageEnum = None):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
@@ -154,7 +154,7 @@
pass
async def precondition_one_allocated_video_stream(self, streamUsage: Globals.Enums.StreamUsageEnum = None):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_1.py b/src/python_testing/TC_AVSM_2_1.py
index f5196c4..cec1e3e 100644
--- a/src/python_testing/TC_AVSM_2_1.py
+++ b/src/python_testing/TC_AVSM_2_1.py
@@ -150,9 +150,13 @@
),
]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_AVSM_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
diff --git a/src/python_testing/TC_AVSM_2_10.py b/src/python_testing/TC_AVSM_2_10.py
index bd2538e..1815291 100644
--- a/src/python_testing/TC_AVSM_2_10.py
+++ b/src/python_testing/TC_AVSM_2_10.py
@@ -114,7 +114,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kSnapshot)
)
async def test_TC_AVSM_2_10(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_11.py b/src/python_testing/TC_AVSM_2_11.py
index 432d551..13a65e5 100644
--- a/src/python_testing/TC_AVSM_2_11.py
+++ b/src/python_testing/TC_AVSM_2_11.py
@@ -116,7 +116,7 @@
and has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kVideo)
)
async def test_TC_AVSM_2_11(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_12.py b/src/python_testing/TC_AVSM_2_12.py
index 1c5d2ff..6ac1d94 100644
--- a/src/python_testing/TC_AVSM_2_12.py
+++ b/src/python_testing/TC_AVSM_2_12.py
@@ -160,7 +160,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.CameraAvStreamManagement))
async def test_TC_AVSM_2_12(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
diff --git a/src/python_testing/TC_AVSM_2_13.py b/src/python_testing/TC_AVSM_2_13.py
index aa99fa1..0e85282 100644
--- a/src/python_testing/TC_AVSM_2_13.py
+++ b/src/python_testing/TC_AVSM_2_13.py
@@ -117,7 +117,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kVideo)
)
async def test_TC_AVSM_2_13(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_14.py b/src/python_testing/TC_AVSM_2_14.py
index 891f7b2..24e1cbb 100644
--- a/src/python_testing/TC_AVSM_2_14.py
+++ b/src/python_testing/TC_AVSM_2_14.py
@@ -102,7 +102,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kAudio)
)
async def test_TC_AVSM_2_14(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_15.py b/src/python_testing/TC_AVSM_2_15.py
index 6022d01..2cbdafc 100644
--- a/src/python_testing/TC_AVSM_2_15.py
+++ b/src/python_testing/TC_AVSM_2_15.py
@@ -97,7 +97,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kSnapshot)
)
async def test_TC_AVSM_2_15(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_16.py b/src/python_testing/TC_AVSM_2_16.py
index 9267f01..42d55f2 100644
--- a/src/python_testing/TC_AVSM_2_16.py
+++ b/src/python_testing/TC_AVSM_2_16.py
@@ -144,7 +144,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kVideo) and
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kAudio))
async def test_TC_AVSM_2_16(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_17.py b/src/python_testing/TC_AVSM_2_17.py
index 86bce98..e100362 100644
--- a/src/python_testing/TC_AVSM_2_17.py
+++ b/src/python_testing/TC_AVSM_2_17.py
@@ -173,7 +173,7 @@
and has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kPrivacy)
)
async def test_TC_AVSM_2_17(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_2.py b/src/python_testing/TC_AVSM_2_2.py
index 4d4ae19..713f3eb 100644
--- a/src/python_testing/TC_AVSM_2_2.py
+++ b/src/python_testing/TC_AVSM_2_2.py
@@ -126,7 +126,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kSnapshot)
)
async def test_TC_AVSM_2_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_3.py b/src/python_testing/TC_AVSM_2_3.py
index e239b41..de33de3 100644
--- a/src/python_testing/TC_AVSM_2_3.py
+++ b/src/python_testing/TC_AVSM_2_3.py
@@ -108,7 +108,7 @@
)
)
async def test_TC_AVSM_2_3(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_4.py b/src/python_testing/TC_AVSM_2_4.py
index 6787893..298e30c 100644
--- a/src/python_testing/TC_AVSM_2_4.py
+++ b/src/python_testing/TC_AVSM_2_4.py
@@ -84,7 +84,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kSnapshot)
)
async def test_TC_AVSM_2_4(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_5.py b/src/python_testing/TC_AVSM_2_5.py
index 4eef303..1e201df 100644
--- a/src/python_testing/TC_AVSM_2_5.py
+++ b/src/python_testing/TC_AVSM_2_5.py
@@ -139,7 +139,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kAudio)
)
async def test_TC_AVSM_2_5(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_6.py b/src/python_testing/TC_AVSM_2_6.py
index 841d83d..943c3c6 100644
--- a/src/python_testing/TC_AVSM_2_6.py
+++ b/src/python_testing/TC_AVSM_2_6.py
@@ -84,7 +84,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kAudio)
)
async def test_TC_AVSM_2_6(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_7.py b/src/python_testing/TC_AVSM_2_7.py
index 5931e0e..1b0031c 100644
--- a/src/python_testing/TC_AVSM_2_7.py
+++ b/src/python_testing/TC_AVSM_2_7.py
@@ -191,7 +191,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kVideo)
)
async def test_TC_AVSM_2_7(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_8.py b/src/python_testing/TC_AVSM_2_8.py
index 2f55df9..7cf1b6f 100644
--- a/src/python_testing/TC_AVSM_2_8.py
+++ b/src/python_testing/TC_AVSM_2_8.py
@@ -106,7 +106,7 @@
)
)
async def test_TC_AVSM_2_8(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_2_9.py b/src/python_testing/TC_AVSM_2_9.py
index d0bffdb..315b8a0 100644
--- a/src/python_testing/TC_AVSM_2_9.py
+++ b/src/python_testing/TC_AVSM_2_9.py
@@ -88,7 +88,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kVideo)
)
async def test_TC_AVSM_2_9(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_StreamReuseRangeParams.py b/src/python_testing/TC_AVSM_StreamReuseRangeParams.py
index 4f1448c..8679a08 100644
--- a/src/python_testing/TC_AVSM_StreamReuseRangeParams.py
+++ b/src/python_testing/TC_AVSM_StreamReuseRangeParams.py
@@ -95,7 +95,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kSnapshot)
)
async def test_TC_AVSM_StreamReuseRangeParams(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSM_VideoStreamsPersistence.py b/src/python_testing/TC_AVSM_VideoStreamsPersistence.py
index 2dc929a..a86a46f 100644
--- a/src/python_testing/TC_AVSM_VideoStreamsPersistence.py
+++ b/src/python_testing/TC_AVSM_VideoStreamsPersistence.py
@@ -130,7 +130,7 @@
has_feature(Clusters.CameraAvStreamManagement, Clusters.CameraAvStreamManagement.Bitmaps.Feature.kVideo)
)
async def test_TC_AVSM_VideoStreamsPersistence(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
diff --git a/src/python_testing/TC_AVSUM_2_1.py b/src/python_testing/TC_AVSUM_2_1.py
index 698aab7..0a72ba3 100644
--- a/src/python_testing/TC_AVSUM_2_1.py
+++ b/src/python_testing/TC_AVSUM_2_1.py
@@ -78,7 +78,7 @@
async def test_TC_AVSUM_2_1(self):
cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
tilt_min_dut = tilt_max_dut = pan_min_dut = pan_max_dut = zoom_max_dut = None
diff --git a/src/python_testing/TC_AVSUM_2_2.py b/src/python_testing/TC_AVSUM_2_2.py
index d3a55d8..b618ccb 100644
--- a/src/python_testing/TC_AVSUM_2_2.py
+++ b/src/python_testing/TC_AVSUM_2_2.py
@@ -100,7 +100,7 @@
async def test_TC_AVSUM_2_2(self):
cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# Allow some user input steps to be skipped if running under CI
self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
diff --git a/src/python_testing/TC_AVSUM_2_3.py b/src/python_testing/TC_AVSUM_2_3.py
index 321a667..ae1313c 100644
--- a/src/python_testing/TC_AVSUM_2_3.py
+++ b/src/python_testing/TC_AVSUM_2_3.py
@@ -97,7 +97,7 @@
async def test_TC_AVSUM_2_3(self):
cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1) # Already done, immediately go to step 2
diff --git a/src/python_testing/TC_AVSUM_2_4.py b/src/python_testing/TC_AVSUM_2_4.py
index 2f3d5df..aa7c113 100644
--- a/src/python_testing/TC_AVSUM_2_4.py
+++ b/src/python_testing/TC_AVSUM_2_4.py
@@ -95,7 +95,7 @@
async def test_TC_AVSUM_2_4(self):
cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# PIXIT check
canbemadebusy = self.user_params.get("PIXIT.CANBEMADEBUSY", False)
diff --git a/src/python_testing/TC_AVSUM_2_5.py b/src/python_testing/TC_AVSUM_2_5.py
index 208cf49..9ac4d73 100644
--- a/src/python_testing/TC_AVSUM_2_5.py
+++ b/src/python_testing/TC_AVSUM_2_5.py
@@ -81,7 +81,7 @@
async def test_TC_AVSUM_2_5(self):
cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1) # Already done, immediately go to step 2
diff --git a/src/python_testing/TC_AVSUM_2_6.py b/src/python_testing/TC_AVSUM_2_6.py
index 3c8d5d3..ec9f783 100644
--- a/src/python_testing/TC_AVSUM_2_6.py
+++ b/src/python_testing/TC_AVSUM_2_6.py
@@ -76,7 +76,7 @@
async def test_TC_AVSUM_2_6(self):
cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1) # Already done, immediately go to step 2
attribute_list = await self.read_avsum_attribute_expect_success(endpoint, attributes.AttributeList)
diff --git a/src/python_testing/TC_AVSUM_2_7.py b/src/python_testing/TC_AVSUM_2_7.py
index f8406ee..9f69dda 100644
--- a/src/python_testing/TC_AVSUM_2_7.py
+++ b/src/python_testing/TC_AVSUM_2_7.py
@@ -83,7 +83,7 @@
async def test_TC_AVSUM_2_7(self):
clusterAVSTR = Clusters.Objects.CameraAvStreamManagement
attributesAVSTR = clusterAVSTR.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1) # Already done, immediately go to step 2
diff --git a/src/python_testing/TC_AVSUM_2_8.py b/src/python_testing/TC_AVSUM_2_8.py
index 8a9498c..a53bbec 100644
--- a/src/python_testing/TC_AVSUM_2_8.py
+++ b/src/python_testing/TC_AVSUM_2_8.py
@@ -84,7 +84,7 @@
attributes = cluster.Attributes
clusterAVSTR = Clusters.Objects.CameraAvStreamManagement
attributesAVSTR = clusterAVSTR.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1) # Already done, immediately go to step 2
diff --git a/src/python_testing/TC_BINFO_3_2.py b/src/python_testing/TC_BINFO_3_2.py
index 117008a..03d4699 100644
--- a/src/python_testing/TC_BINFO_3_2.py
+++ b/src/python_testing/TC_BINFO_3_2.py
@@ -71,7 +71,7 @@
async def test_TC_BINFO_3_2(self):
self.step(0)
- endpoint = self.get_endpoint(default=0)
+ endpoint = self.get_endpoint()
attributes = Clusters.BasicInformation.Attributes
self.step(1)
diff --git a/src/python_testing/TC_BOOLCFG_2_1.py b/src/python_testing/TC_BOOLCFG_2_1.py
index 38bdb37..1999c4f 100644
--- a/src/python_testing/TC_BOOLCFG_2_1.py
+++ b/src/python_testing/TC_BOOLCFG_2_1.py
@@ -70,10 +70,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_BOOLCFG_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
all_alarm_mode_bitmap_bits = functools.reduce(
ior, [b.value for b in Clusters.BooleanStateConfiguration.Bitmaps.AlarmModeBitmap])
all_sensor_fault_bitmap_bits = functools.reduce(
diff --git a/src/python_testing/TC_BOOLCFG_3_1.py b/src/python_testing/TC_BOOLCFG_3_1.py
index 5f058b8..95d3e00 100644
--- a/src/python_testing/TC_BOOLCFG_3_1.py
+++ b/src/python_testing/TC_BOOLCFG_3_1.py
@@ -73,10 +73,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_BOOLCFG_3_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.BooleanStateConfiguration.Attributes
diff --git a/src/python_testing/TC_BOOLCFG_4_1.py b/src/python_testing/TC_BOOLCFG_4_1.py
index f5ef9c0..b327828 100644
--- a/src/python_testing/TC_BOOLCFG_4_1.py
+++ b/src/python_testing/TC_BOOLCFG_4_1.py
@@ -65,10 +65,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_BOOLCFG_4_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.BooleanStateConfiguration.Attributes
diff --git a/src/python_testing/TC_BOOLCFG_4_2.py b/src/python_testing/TC_BOOLCFG_4_2.py
index 0e083dd..e418a80 100644
--- a/src/python_testing/TC_BOOLCFG_4_2.py
+++ b/src/python_testing/TC_BOOLCFG_4_2.py
@@ -82,6 +82,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_BOOLCFG_4_2(self):
@@ -90,7 +94,7 @@
"the --hex-arg flag as PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:<key>, "
"e.g. --hex-arg PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:000102030405060708090a0b0c0d0e0f")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
enableKey = self.matter_test_config.global_test_params['PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY']
self.step(1)
diff --git a/src/python_testing/TC_BOOLCFG_4_3.py b/src/python_testing/TC_BOOLCFG_4_3.py
index 6d9469c..9c01cfc 100644
--- a/src/python_testing/TC_BOOLCFG_4_3.py
+++ b/src/python_testing/TC_BOOLCFG_4_3.py
@@ -94,6 +94,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_BOOLCFG_4_3(self):
@@ -102,7 +106,7 @@
"the --hex-arg flag as PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:<key>, "
"e.g. --hex-arg PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:000102030405060708090a0b0c0d0e0f")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
enableKey = self.matter_test_config.global_test_params['PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY']
self.step(1)
diff --git a/src/python_testing/TC_BOOLCFG_4_4.py b/src/python_testing/TC_BOOLCFG_4_4.py
index 6c11b6f..5ce82e3 100644
--- a/src/python_testing/TC_BOOLCFG_4_4.py
+++ b/src/python_testing/TC_BOOLCFG_4_4.py
@@ -86,6 +86,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_BOOLCFG_4_4(self):
@@ -94,7 +98,7 @@
"the --hex-arg flag as PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:<key>, "
"e.g. --hex-arg PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:000102030405060708090a0b0c0d0e0f")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
enableKey = self.matter_test_config.global_test_params['PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY']
self.step(1)
diff --git a/src/python_testing/TC_BOOLCFG_5_1.py b/src/python_testing/TC_BOOLCFG_5_1.py
index f8aad49..75ed382 100644
--- a/src/python_testing/TC_BOOLCFG_5_1.py
+++ b/src/python_testing/TC_BOOLCFG_5_1.py
@@ -81,6 +81,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_BOOLCFG_5_1(self):
@@ -89,7 +93,7 @@
"the --hex-arg flag as PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:<key>, "
"e.g. --hex-arg PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:000102030405060708090a0b0c0d0e0f")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
enableKey = self.matter_test_config.global_test_params['PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY']
self.step(1)
diff --git a/src/python_testing/TC_BOOLCFG_5_2.py b/src/python_testing/TC_BOOLCFG_5_2.py
index c786613..7373d2b 100644
--- a/src/python_testing/TC_BOOLCFG_5_2.py
+++ b/src/python_testing/TC_BOOLCFG_5_2.py
@@ -80,6 +80,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_BOOLCFG_5_2(self):
@@ -88,7 +92,7 @@
"the --hex-arg flag as PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:<key>, "
"e.g. --hex-arg PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY:000102030405060708090a0b0c0d0e0f")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
enableKey = self.matter_test_config.global_test_params['PIXIT.BOOLCFG.TEST_EVENT_TRIGGER_KEY']
self.step(1)
diff --git a/src/python_testing/TC_BRBINFO_3_2.py b/src/python_testing/TC_BRBINFO_3_2.py
index 19ab24f..4cc5048 100644
--- a/src/python_testing/TC_BRBINFO_3_2.py
+++ b/src/python_testing/TC_BRBINFO_3_2.py
@@ -68,10 +68,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 3
+
@async_test_body
async def test_TC_BRBINFO_3_2(self):
self.step(0)
- endpoint = self.get_endpoint(default=3)
+ endpoint = self.get_endpoint()
attributes = Clusters.BridgedDeviceBasicInformation.Attributes
diff --git a/src/python_testing/TC_CC_2_1.py b/src/python_testing/TC_CC_2_1.py
index ef402e4..0baafc3 100644
--- a/src/python_testing/TC_CC_2_1.py
+++ b/src/python_testing/TC_CC_2_1.py
@@ -241,10 +241,14 @@
logger.info(f"Num b : {bin(tmp_b)}")
asserts.assert_equal(tmp_a, tmp_b, "Lower 4 bits of values are not equal")
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CC_2_1(self):
self.cluster = Clusters.ColorControl
- self.endpoint = self.get_endpoint(1)
+ self.endpoint = self.get_endpoint()
self.attributes = Clusters.ColorControl.Attributes
self.step(1)
diff --git a/src/python_testing/TC_CHIME_2_1.py b/src/python_testing/TC_CHIME_2_1.py
index c430cef..9515944 100644
--- a/src/python_testing/TC_CHIME_2_1.py
+++ b/src/python_testing/TC_CHIME_2_1.py
@@ -68,7 +68,7 @@
async def test_TC_CHIME_2_1(self):
cluster = Clusters.Objects.Chime
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1) # Already done, immediately go to step 2
diff --git a/src/python_testing/TC_CHIME_2_2.py b/src/python_testing/TC_CHIME_2_2.py
index 4e1b942..5cb47a1 100644
--- a/src/python_testing/TC_CHIME_2_2.py
+++ b/src/python_testing/TC_CHIME_2_2.py
@@ -66,7 +66,7 @@
async def test_TC_CHIME_2_2(self):
cluster = Clusters.Objects.Chime
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1) # Already done, immediately go to step 2
diff --git a/src/python_testing/TC_CHIME_2_3.py b/src/python_testing/TC_CHIME_2_3.py
index 49df06f..014f27a 100644
--- a/src/python_testing/TC_CHIME_2_3.py
+++ b/src/python_testing/TC_CHIME_2_3.py
@@ -72,7 +72,7 @@
async def test_TC_CHIME_2_3(self):
cluster = Clusters.Objects.Chime
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1) # Already done, immediately go to step 2
diff --git a/src/python_testing/TC_CHIME_2_4.py b/src/python_testing/TC_CHIME_2_4.py
index 7b2ba5a..3638311 100644
--- a/src/python_testing/TC_CHIME_2_4.py
+++ b/src/python_testing/TC_CHIME_2_4.py
@@ -76,7 +76,7 @@
async def test_TC_CHIME_2_4(self):
cluster = Clusters.Objects.Chime
attributes = cluster.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
self.step(1) # Already done, immediately go to step 2
diff --git a/src/python_testing/TC_CLCTRL_2_1.py b/src/python_testing/TC_CLCTRL_2_1.py
index 8414757..f47c579 100644
--- a/src/python_testing/TC_CLCTRL_2_1.py
+++ b/src/python_testing/TC_CLCTRL_2_1.py
@@ -76,10 +76,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLCTRL_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# STEP 1: Commission DUT to TH (can be skipped if done in a preceding test)
self.step(1)
diff --git a/src/python_testing/TC_CLCTRL_3_1.py b/src/python_testing/TC_CLCTRL_3_1.py
index 9760c7e..4b2cfe2 100644
--- a/src/python_testing/TC_CLCTRL_3_1.py
+++ b/src/python_testing/TC_CLCTRL_3_1.py
@@ -119,9 +119,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLCTRL_3_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
dev_controller = self.default_controller
attributes = Clusters.ClosureControl.Attributes
timeout = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout
diff --git a/src/python_testing/TC_CLCTRL_4_1.py b/src/python_testing/TC_CLCTRL_4_1.py
index 0a6557b..e2e81a2 100644
--- a/src/python_testing/TC_CLCTRL_4_1.py
+++ b/src/python_testing/TC_CLCTRL_4_1.py
@@ -199,9 +199,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLCTRL_4_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
dev_controller = self.default_controller
attributes = Clusters.ClosureControl.Attributes
timeout = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout
diff --git a/src/python_testing/TC_CLCTRL_4_2.py b/src/python_testing/TC_CLCTRL_4_2.py
index 3d922e2..66a862b 100644
--- a/src/python_testing/TC_CLCTRL_4_2.py
+++ b/src/python_testing/TC_CLCTRL_4_2.py
@@ -160,10 +160,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLCTRL_4_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
timeout: uint = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout # default_timeout = 90 seconds
self.step(1)
diff --git a/src/python_testing/TC_CLCTRL_4_3.py b/src/python_testing/TC_CLCTRL_4_3.py
index 1330b4d..929d88d 100644
--- a/src/python_testing/TC_CLCTRL_4_3.py
+++ b/src/python_testing/TC_CLCTRL_4_3.py
@@ -204,10 +204,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLCTRL_4_3(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
timeout: uint = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout # default_timeout = 90 seconds
self.step(1)
diff --git a/src/python_testing/TC_CLCTRL_4_4.py b/src/python_testing/TC_CLCTRL_4_4.py
index ee3d6e7..00c677c 100644
--- a/src/python_testing/TC_CLCTRL_4_4.py
+++ b/src/python_testing/TC_CLCTRL_4_4.py
@@ -136,11 +136,15 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLCTRL_4_4(self):
countdown_time_max: uint = 259200
- endpoint: int = self.get_endpoint(default=1)
+ endpoint: int = self.get_endpoint()
timeout: uint = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else countdown_time_max
self.step(1)
diff --git a/src/python_testing/TC_CLCTRL_5_1.py b/src/python_testing/TC_CLCTRL_5_1.py
index 5e59659..7bd0b56 100644
--- a/src/python_testing/TC_CLCTRL_5_1.py
+++ b/src/python_testing/TC_CLCTRL_5_1.py
@@ -153,9 +153,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLCTRL_5_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
dev_controller = self.default_controller
attributes = Clusters.ClosureControl.Attributes
timeout = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout
diff --git a/src/python_testing/TC_CLCTRL_6_1.py b/src/python_testing/TC_CLCTRL_6_1.py
index cc2d832..b0ac52b 100644
--- a/src/python_testing/TC_CLCTRL_6_1.py
+++ b/src/python_testing/TC_CLCTRL_6_1.py
@@ -150,9 +150,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLCTRL_6_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
dev_controller = self.default_controller
attributes = Clusters.ClosureControl.Attributes
timeout = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout
diff --git a/src/python_testing/TC_CLDIM_2_1.py b/src/python_testing/TC_CLDIM_2_1.py
index f50c173..87bf948 100644
--- a/src/python_testing/TC_CLDIM_2_1.py
+++ b/src/python_testing/TC_CLDIM_2_1.py
@@ -75,9 +75,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLDIM_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# STEP 1: Commission DUT to TH (can be skipped if done in a preceding test)
self.step(1)
diff --git a/src/python_testing/TC_CLDIM_3_1.py b/src/python_testing/TC_CLDIM_3_1.py
index ff5f083..e6e8f05 100644
--- a/src/python_testing/TC_CLDIM_3_1.py
+++ b/src/python_testing/TC_CLDIM_3_1.py
@@ -138,9 +138,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLDIM_3_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
timeout = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout
# STEP 1: Commission DUT to TH (can be skipped if done in a preceding test)
diff --git a/src/python_testing/TC_CLDIM_3_2.py b/src/python_testing/TC_CLDIM_3_2.py
index 026bdad..1f52eb7 100644
--- a/src/python_testing/TC_CLDIM_3_2.py
+++ b/src/python_testing/TC_CLDIM_3_2.py
@@ -103,9 +103,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLDIM_3_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
timeout = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout
# STEP 1: Commission DUT to TH (can be skipped if done in a preceding test)
diff --git a/src/python_testing/TC_CLDIM_3_3.py b/src/python_testing/TC_CLDIM_3_3.py
index 76e32be..15a2469 100644
--- a/src/python_testing/TC_CLDIM_3_3.py
+++ b/src/python_testing/TC_CLDIM_3_3.py
@@ -129,9 +129,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLDIM_3_3(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
timeout = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout
# STEP 1: Commission DUT to TH (can be skipped if done in a preceding test)
diff --git a/src/python_testing/TC_CLDIM_4_1.py b/src/python_testing/TC_CLDIM_4_1.py
index 9cf67ce..95b5fbd 100644
--- a/src/python_testing/TC_CLDIM_4_1.py
+++ b/src/python_testing/TC_CLDIM_4_1.py
@@ -136,9 +136,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLDIM_4_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
timeout = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout
# STEP 1: Commission DUT to TH (can be skipped if done in a preceding test)
diff --git a/src/python_testing/TC_CLDIM_4_2.py b/src/python_testing/TC_CLDIM_4_2.py
index 73c8c13..05cf51d 100644
--- a/src/python_testing/TC_CLDIM_4_2.py
+++ b/src/python_testing/TC_CLDIM_4_2.py
@@ -92,9 +92,13 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_CLDIM_4_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
timeout = self.matter_test_config.timeout if self.matter_test_config.timeout is not None else self.default_timeout
attributes = Clusters.ClosureDimension.Attributes
diff --git a/src/python_testing/TC_DEMM_1_2.py b/src/python_testing/TC_DEMM_1_2.py
index b7fbd83..23959d3 100644
--- a/src/python_testing/TC_DEMM_1_2.py
+++ b/src/python_testing/TC_DEMM_1_2.py
@@ -111,11 +111,15 @@
else:
logger.info('Extra Check: One or more modes failed No Optimization validation.')
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_DEMM_1_2(self):
# Setup common mode check
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
diff --git a/src/python_testing/TC_DEM_2_2.py b/src/python_testing/TC_DEM_2_2.py
index 880bf28..b3cc7c8 100644
--- a/src/python_testing/TC_DEM_2_2.py
+++ b/src/python_testing/TC_DEM_2_2.py
@@ -164,6 +164,10 @@
return steps
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_DEM_2_2(self):
# pylint: disable=too-many-locals, too-many-statements
@@ -182,7 +186,7 @@
events_callback = EventSubscriptionHandler(expected_cluster=Clusters.DeviceEnergyManagement)
await events_callback.start(self.default_controller,
self.dut_node_id,
- self.get_endpoint(default=1))
+ self.get_endpoint())
self.step("4")
await self.check_test_event_triggers_enabled()
diff --git a/src/python_testing/TC_DGSW_2_1.py b/src/python_testing/TC_DGSW_2_1.py
index 5ad168d..e2118a6 100644
--- a/src/python_testing/TC_DGSW_2_1.py
+++ b/src/python_testing/TC_DGSW_2_1.py
@@ -75,7 +75,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.SoftwareDiagnostics))
async def test_TC_DGSW_2_1(self):
- endpoint = self.get_endpoint(default=0)
+ endpoint = self.get_endpoint()
# STEP 1: Commission DUT (already done)
self.step(1)
diff --git a/src/python_testing/TC_DGSW_2_2.py b/src/python_testing/TC_DGSW_2_2.py
index e2604b9..6373fec 100644
--- a/src/python_testing/TC_DGSW_2_2.py
+++ b/src/python_testing/TC_DGSW_2_2.py
@@ -91,7 +91,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.SoftwareDiagnostics))
async def test_TC_DGSW_2_2(self):
- endpoint = self.get_endpoint(default=0)
+ endpoint = self.get_endpoint()
# STEP 1: Commission DUT (already done)
self.step(1)
diff --git a/src/python_testing/TC_DISHM_1_2.py b/src/python_testing/TC_DISHM_1_2.py
index 709f07c..af29b7c 100644
--- a/src/python_testing/TC_DISHM_1_2.py
+++ b/src/python_testing/TC_DISHM_1_2.py
@@ -68,11 +68,15 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_DISHM_1_2(self):
# Setup common mode check
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
diff --git a/src/python_testing/TC_DRLK_2_12.py b/src/python_testing/TC_DRLK_2_12.py
index b595384..a924874 100644
--- a/src/python_testing/TC_DRLK_2_12.py
+++ b/src/python_testing/TC_DRLK_2_12.py
@@ -65,6 +65,10 @@
def pics_TC_DRLK_2_12(self) -> list[str]:
return ["DRLK.S.F0c"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_DRLK_2_12(self):
await self.run_drlk_test_2_12()
diff --git a/src/python_testing/TC_DRLK_2_13.py b/src/python_testing/TC_DRLK_2_13.py
index 6a49f48..11e7fe5 100644
--- a/src/python_testing/TC_DRLK_2_13.py
+++ b/src/python_testing/TC_DRLK_2_13.py
@@ -359,6 +359,10 @@
def generate_unique_octbytes(self, length=65) -> bytes:
return ''.join(random.choices('01234567', k=length)).encode()
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_DRLK_2_13(self):
self.max_aliro_keys_supported = None
@@ -369,7 +373,7 @@
self.groupIdentifier = bytes.fromhex("89d085fc302ca53e279bfcdecdf3c4ad")
self.groupResolvingKey = bytes.fromhex("89d0859bfcdecdf3c4adfc302ca53e27")
self.common_cluster_endpoint = 0
- self.app_cluster_endpoint = self.get_endpoint(default=1)
+ self.app_cluster_endpoint = self.get_endpoint()
self.alirouser = "AliroUser"
self.alirocredentialissuerkey = bytes.fromhex(
"047a4c882d753924cdf3779a3c84fec2debaa6f0b3084450878acc7ddcce7856ae57b1ebbe2561015103dd7474c2a183675378ec55f1e465ac3436bf3dd5ca54d4")
diff --git a/src/python_testing/TC_DRLK_2_2.py b/src/python_testing/TC_DRLK_2_2.py
index feda42e..f1b3cff 100644
--- a/src/python_testing/TC_DRLK_2_2.py
+++ b/src/python_testing/TC_DRLK_2_2.py
@@ -62,6 +62,10 @@
def setup_class(self):
return super().setup_class()
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
def pics_TC_DRLK_2_2(self) -> list[str]:
return ["DRLK.S"]
diff --git a/src/python_testing/TC_DRLK_2_3.py b/src/python_testing/TC_DRLK_2_3.py
index b5f26ef..146e1ec 100644
--- a/src/python_testing/TC_DRLK_2_3.py
+++ b/src/python_testing/TC_DRLK_2_3.py
@@ -65,6 +65,10 @@
def pics_TC_DRLK_2_3(self) -> list[str]:
return ["DRLK.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_DRLK_2_3(self):
await self.run_drlk_test_2_3()
diff --git a/src/python_testing/TC_DRLK_2_5.py b/src/python_testing/TC_DRLK_2_5.py
index bddb003..8a9f709 100644
--- a/src/python_testing/TC_DRLK_2_5.py
+++ b/src/python_testing/TC_DRLK_2_5.py
@@ -49,6 +49,10 @@
class TC_DRLK_2_5(MatterBaseTest):
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
def steps_TC_DRLK_2_5(self) -> list[TestStep]:
steps = [
TestStep("precondition", "Commissioning already done.", is_commissioning=True),
diff --git a/src/python_testing/TC_DRLK_2_9.py b/src/python_testing/TC_DRLK_2_9.py
index f7a9610..e8b510c 100644
--- a/src/python_testing/TC_DRLK_2_9.py
+++ b/src/python_testing/TC_DRLK_2_9.py
@@ -353,6 +353,10 @@
logging.exception(f"Got exception when performing SetAliroReaderConfig {e}")
asserts.assert_equal(e.status, expected_status, f"Unexpected error returned: {e}")
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_DRLK_2_9(self):
@@ -381,7 +385,7 @@
self.maxrfidcodelength = None
self.minrfidcodelength = None
- self.endpoint = self.get_endpoint(default=1)
+ self.endpoint = self.get_endpoint()
print("endpoint", self.endpoint)
# Aliro Keys for setting Aliro configuration and credential
diff --git a/src/python_testing/TC_EEVSEM_1_2.py b/src/python_testing/TC_EEVSEM_1_2.py
index cba346f..76a275e 100644
--- a/src/python_testing/TC_EEVSEM_1_2.py
+++ b/src/python_testing/TC_EEVSEM_1_2.py
@@ -68,11 +68,15 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_EEVSEM_1_2(self):
# Setup common mode check
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
diff --git a/src/python_testing/TC_EPREF_2_1.py b/src/python_testing/TC_EPREF_2_1.py
index 1e79906..c70febd 100644
--- a/src/python_testing/TC_EPREF_2_1.py
+++ b/src/python_testing/TC_EPREF_2_1.py
@@ -105,10 +105,14 @@
result = await self.default_controller.WriteAttribute(self.dut_node_id, [(endpoint, Clusters.EnergyPreference.Attributes.CurrentLowPowerModeSensitivity(current_low_power_mode_sensitivity))])
return result[0].Status
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_EPREF_2_1(self):
- endpoint = self.user_params.get("endpoint", 1)
+ endpoint = self.get_endpoint()
self.step("1")
self.print_step(1, "Commissioning, already done")
diff --git a/src/python_testing/TC_FAN_2_1.py b/src/python_testing/TC_FAN_2_1.py
index dcd8311..89c1cc5 100644
--- a/src/python_testing/TC_FAN_2_1.py
+++ b/src/python_testing/TC_FAN_2_1.py
@@ -116,10 +116,14 @@
def pics_TC_FAN_2_1(self) -> list[str]:
return ["FAN.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_FAN_2_1(self):
# Setup
- self.endpoint = self.get_endpoint(default=1)
+ self.endpoint = self.get_endpoint()
cluster = Clusters.FanControl
attribute = cluster.Attributes
feature = cluster.Bitmaps.Feature
diff --git a/src/python_testing/TC_FAN_2_3.py b/src/python_testing/TC_FAN_2_3.py
index 932ab04..875a0f1 100644
--- a/src/python_testing/TC_FAN_2_3.py
+++ b/src/python_testing/TC_FAN_2_3.py
@@ -105,7 +105,7 @@
@run_if_endpoint_matches(has_feature(Clusters.FanControl, Clusters.FanControl.Bitmaps.Feature.kRocking))
async def test_TC_FAN_2_3(self):
# Setup
- self.endpoint = self.get_endpoint(default=1)
+ self.endpoint = self.get_endpoint()
cluster = Clusters.FanControl
attr = cluster.Attributes
valid_rock_support_range = range(1, 8)
diff --git a/src/python_testing/TC_FAN_2_4.py b/src/python_testing/TC_FAN_2_4.py
index 62bfc19..84fd515 100644
--- a/src/python_testing/TC_FAN_2_4.py
+++ b/src/python_testing/TC_FAN_2_4.py
@@ -105,7 +105,7 @@
@run_if_endpoint_matches(has_feature(Clusters.FanControl, Clusters.FanControl.Bitmaps.Feature.kWind))
async def test_TC_FAN_2_4(self):
# Setup
- self.endpoint = self.get_endpoint(default=1)
+ self.endpoint = self.get_endpoint()
cluster = Clusters.FanControl
attr = cluster.Attributes
valid_wind_support_range = range(1, 4)
diff --git a/src/python_testing/TC_FAN_3_1.py b/src/python_testing/TC_FAN_3_1.py
index cc2f62e..7fcd847 100644
--- a/src/python_testing/TC_FAN_3_1.py
+++ b/src/python_testing/TC_FAN_3_1.py
@@ -250,10 +250,14 @@
def pics_TC_FAN_3_1(self) -> list[str]:
return ["FAN.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_FAN_3_1(self):
# Setup
- self.endpoint = self.get_endpoint(default=1)
+ self.endpoint = self.get_endpoint()
cluster = Clusters.FanControl
attr = cluster.Attributes
diff --git a/src/python_testing/TC_FAN_3_2.py b/src/python_testing/TC_FAN_3_2.py
index 12bc41e..2425131 100644
--- a/src/python_testing/TC_FAN_3_2.py
+++ b/src/python_testing/TC_FAN_3_2.py
@@ -252,7 +252,7 @@
@run_if_endpoint_matches(has_feature(Clusters.FanControl, Clusters.FanControl.Bitmaps.Feature.kMultiSpeed))
async def test_TC_FAN_3_2(self):
# Setup
- self.endpoint = self.get_endpoint(default=1)
+ self.endpoint = self.get_endpoint()
cluster = Clusters.FanControl
attr = cluster.Attributes
diff --git a/src/python_testing/TC_FAN_3_3.py b/src/python_testing/TC_FAN_3_3.py
index f50c91c..9afb42b 100644
--- a/src/python_testing/TC_FAN_3_3.py
+++ b/src/python_testing/TC_FAN_3_3.py
@@ -88,6 +88,10 @@
def pics_TC_FAN_3_3(self) -> list[str]:
return ["FAN.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_FAN_3_3(self):
if not self.check_pics("FAN.S.F02"):
@@ -95,7 +99,7 @@
self.mark_all_remaining_steps_skipped(1)
return
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
diff --git a/src/python_testing/TC_FAN_3_4.py b/src/python_testing/TC_FAN_3_4.py
index 5a69e9d..8effb6e 100644
--- a/src/python_testing/TC_FAN_3_4.py
+++ b/src/python_testing/TC_FAN_3_4.py
@@ -88,6 +88,10 @@
def pics_TC_FAN_3_4(self) -> list[str]:
return ["FAN.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_FAN_3_4(self):
if not self.check_pics("FAN.S.F03"):
@@ -95,7 +99,7 @@
logger.info("Test skipped because PICS FAN.S.F03 is not set")
return
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
diff --git a/src/python_testing/TC_FAN_3_5.py b/src/python_testing/TC_FAN_3_5.py
index ed04436..e61aa6b 100644
--- a/src/python_testing/TC_FAN_3_5.py
+++ b/src/python_testing/TC_FAN_3_5.py
@@ -81,13 +81,17 @@
def pics_TC_FAN_3_5(self) -> list[str]:
return ["FAN.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_FAN_3_5(self):
if not self.check_pics("FAN.S.F04"):
logger.info("Test skipped because PICS FAN.S.F04 is not set")
return
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# Part 1
diff --git a/src/python_testing/TC_I_2_4.py b/src/python_testing/TC_I_2_4.py
index 3b4e927..687797a 100644
--- a/src/python_testing/TC_I_2_4.py
+++ b/src/python_testing/TC_I_2_4.py
@@ -116,7 +116,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.Identify))
async def test_TC_I_2_4(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# Commissioning - already done
self.step(1)
diff --git a/src/python_testing/TC_LCFG_2_1.py b/src/python_testing/TC_LCFG_2_1.py
index bf2a1e7..dfa030d 100644
--- a/src/python_testing/TC_LCFG_2_1.py
+++ b/src/python_testing/TC_LCFG_2_1.py
@@ -70,7 +70,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.LocalizationConfiguration))
async def test_TC_LCFG_2_1(self):
- endpoint = self.get_endpoint(default=0)
+ endpoint = self.get_endpoint()
value_not_present_in_supported_locales = "fw-GB"
max_lenght_string = 35
max_length_list = 32
diff --git a/src/python_testing/TC_LTIME_3_1.py b/src/python_testing/TC_LTIME_3_1.py
index 13c5b24..b51ac11 100644
--- a/src/python_testing/TC_LTIME_3_1.py
+++ b/src/python_testing/TC_LTIME_3_1.py
@@ -88,7 +88,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.TimeFormatLocalization))
async def test_TC_LTIME_3_1(self):
- self.endpoint = self.get_endpoint(default=0)
+ self.endpoint = self.get_endpoint()
self.cluster = Clusters.TimeFormatLocalization
hour_format_values = [0, 1, 255]
diff --git a/src/python_testing/TC_LUNIT_3_1.py b/src/python_testing/TC_LUNIT_3_1.py
index fdfa701..46229db 100644
--- a/src/python_testing/TC_LUNIT_3_1.py
+++ b/src/python_testing/TC_LUNIT_3_1.py
@@ -87,7 +87,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.UnitLocalization) and has_attribute(Clusters.UnitLocalization.Attributes.TemperatureUnit))
async def test_TC_LUNIT_3_1(self):
- endpoint = self.get_endpoint(default=0)
+ endpoint = self.get_endpoint()
attributes = Clusters.UnitLocalization.Attributes
features = await self.read_lunit_attribute_expect_success(endpoint=endpoint, attribute=attributes.FeatureMap)
self.supports_TEMP = bool(features & Clusters.UnitLocalization.Bitmaps.Feature.kTemperatureUnit)
diff --git a/src/python_testing/TC_LWM_1_2.py b/src/python_testing/TC_LWM_1_2.py
index 811959b..02727c0 100644
--- a/src/python_testing/TC_LWM_1_2.py
+++ b/src/python_testing/TC_LWM_1_2.py
@@ -68,11 +68,15 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_LWM_1_2(self):
# Setup common mode check
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
diff --git a/src/python_testing/TC_MOD_1_2.py b/src/python_testing/TC_MOD_1_2.py
index 622ef49..a925588 100644
--- a/src/python_testing/TC_MOD_1_2.py
+++ b/src/python_testing/TC_MOD_1_2.py
@@ -100,10 +100,14 @@
def _log_attribute(self, name, value):
logger.info(f"{name} attribute with value: {value} with type: {type(value)}")
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_MOD_1_2(self):
self.cluster = Clusters.ModeSelect
- self.endpoint = self.get_endpoint(1)
+ self.endpoint = self.get_endpoint()
# Commision device
# In the test plan step 1 is defined as a precondition.
diff --git a/src/python_testing/TC_MWOCTRL_2_1.py b/src/python_testing/TC_MWOCTRL_2_1.py
index 1bc0695..66c89ad 100644
--- a/src/python_testing/TC_MWOCTRL_2_1.py
+++ b/src/python_testing/TC_MWOCTRL_2_1.py
@@ -105,10 +105,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_MWOCTRL_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.MicrowaveOvenControl.Attributes
diff --git a/src/python_testing/TC_MWOCTRL_2_2.py b/src/python_testing/TC_MWOCTRL_2_2.py
index 354590f..b1931a4 100644
--- a/src/python_testing/TC_MWOCTRL_2_2.py
+++ b/src/python_testing/TC_MWOCTRL_2_2.py
@@ -104,10 +104,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_MWOCTRL_2_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.MicrowaveOvenControl.Attributes
diff --git a/src/python_testing/TC_MWOCTRL_2_4.py b/src/python_testing/TC_MWOCTRL_2_4.py
index 2ed7654..8e4da4a 100644
--- a/src/python_testing/TC_MWOCTRL_2_4.py
+++ b/src/python_testing/TC_MWOCTRL_2_4.py
@@ -73,10 +73,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_MWOCTRL_2_4(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.MicrowaveOvenControl.Attributes
diff --git a/src/python_testing/TC_MWOM_1_2.py b/src/python_testing/TC_MWOM_1_2.py
index 2cbca40..d476715 100644
--- a/src/python_testing/TC_MWOM_1_2.py
+++ b/src/python_testing/TC_MWOM_1_2.py
@@ -65,10 +65,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_MWOM_1_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
attributes = Clusters.MicrowaveOvenMode.Attributes
diff --git a/src/python_testing/TC_OPSTATE_2_1.py b/src/python_testing/TC_OPSTATE_2_1.py
index 269e564..55fddc9 100644
--- a/src/python_testing/TC_OPSTATE_2_1.py
+++ b/src/python_testing/TC_OPSTATE_2_1.py
@@ -60,9 +60,13 @@
def pics_TC_OPSTATE_2_1(self) -> list[str]:
return ["OPSTATE.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OPSTATE_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_1(endpoint)
diff --git a/src/python_testing/TC_OPSTATE_2_2.py b/src/python_testing/TC_OPSTATE_2_2.py
index ac0d669..50ae43b 100644
--- a/src/python_testing/TC_OPSTATE_2_2.py
+++ b/src/python_testing/TC_OPSTATE_2_2.py
@@ -62,9 +62,13 @@
def pics_TC_OPSTATE_2_2(self) -> list[str]:
return ["OPSTATE.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OPSTATE_2_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_2(endpoint=endpoint)
diff --git a/src/python_testing/TC_OPSTATE_2_3.py b/src/python_testing/TC_OPSTATE_2_3.py
index 130d6b9..f93401a 100644
--- a/src/python_testing/TC_OPSTATE_2_3.py
+++ b/src/python_testing/TC_OPSTATE_2_3.py
@@ -62,9 +62,13 @@
def pics_TC_OPSTATE_2_3(self) -> list[str]:
return ["OPSTATE.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OPSTATE_2_3(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_3(endpoint=endpoint)
diff --git a/src/python_testing/TC_OPSTATE_2_4.py b/src/python_testing/TC_OPSTATE_2_4.py
index 603b26d..328b8e8 100644
--- a/src/python_testing/TC_OPSTATE_2_4.py
+++ b/src/python_testing/TC_OPSTATE_2_4.py
@@ -62,9 +62,13 @@
def pics_TC_OPSTATE_2_4(self) -> list[str]:
return ["OPSTATE.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OPSTATE_2_4(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_4(endpoint=endpoint)
diff --git a/src/python_testing/TC_OPSTATE_2_5.py b/src/python_testing/TC_OPSTATE_2_5.py
index 6525ab1..af0eba1 100644
--- a/src/python_testing/TC_OPSTATE_2_5.py
+++ b/src/python_testing/TC_OPSTATE_2_5.py
@@ -62,9 +62,13 @@
def pics_TC_OPSTATE_2_5(self) -> list[str]:
return ["OPSTATE.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OPSTATE_2_5(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_5(endpoint=endpoint)
diff --git a/src/python_testing/TC_OPSTATE_2_6.py b/src/python_testing/TC_OPSTATE_2_6.py
index a3a0f8b..d521ccb 100644
--- a/src/python_testing/TC_OPSTATE_2_6.py
+++ b/src/python_testing/TC_OPSTATE_2_6.py
@@ -62,9 +62,13 @@
def pics_TC_OPSTATE_2_6(self) -> list[str]:
return ["OPSTATE.S", "OPSTATE.S.A0002"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OPSTATE_2_6(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_6(endpoint=endpoint)
diff --git a/src/python_testing/TC_OTCCM_1_2.py b/src/python_testing/TC_OTCCM_1_2.py
index 78aa6c2..c562f4f 100644
--- a/src/python_testing/TC_OTCCM_1_2.py
+++ b/src/python_testing/TC_OTCCM_1_2.py
@@ -68,11 +68,15 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OTCCM_1_2(self):
# Setup common mode check
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
diff --git a/src/python_testing/TC_OVENOPSTATE_2_1.py b/src/python_testing/TC_OVENOPSTATE_2_1.py
index 81142f2..846a9d6 100644
--- a/src/python_testing/TC_OVENOPSTATE_2_1.py
+++ b/src/python_testing/TC_OVENOPSTATE_2_1.py
@@ -61,9 +61,13 @@
def pics_TC_OVENOPSTATE_2_1(self) -> list[str]:
return ["OVENOPSTATE.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OVENOPSTATE_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_1(endpoint)
diff --git a/src/python_testing/TC_OVENOPSTATE_2_2.py b/src/python_testing/TC_OVENOPSTATE_2_2.py
index 0b180d5..080001d 100644
--- a/src/python_testing/TC_OVENOPSTATE_2_2.py
+++ b/src/python_testing/TC_OVENOPSTATE_2_2.py
@@ -62,9 +62,13 @@
def pics_TC_OVENOPSTATE_2_2(self) -> list[str]:
return ["OVENOPSTATE.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OVENOPSTATE_2_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_2(endpoint=endpoint)
diff --git a/src/python_testing/TC_OVENOPSTATE_2_4.py b/src/python_testing/TC_OVENOPSTATE_2_4.py
index d260a09..e52b4ba 100644
--- a/src/python_testing/TC_OVENOPSTATE_2_4.py
+++ b/src/python_testing/TC_OVENOPSTATE_2_4.py
@@ -61,9 +61,13 @@
def pics_TC_OVENOPSTATE_2_4(self) -> list[str]:
return ["OVENOPSTATE.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OVENOPSTATE_2_4(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_4(endpoint=endpoint)
diff --git a/src/python_testing/TC_OVENOPSTATE_2_5.py b/src/python_testing/TC_OVENOPSTATE_2_5.py
index 4b407e0..2bd6c3c1 100644
--- a/src/python_testing/TC_OVENOPSTATE_2_5.py
+++ b/src/python_testing/TC_OVENOPSTATE_2_5.py
@@ -62,9 +62,13 @@
def pics_TC_OVENOPSTATE_2_5(self) -> list[str]:
return ["OVENOPSTATE.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_OVENOPSTATE_2_5(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
await self.TEST_TC_OPSTATE_BASE_2_5(endpoint=endpoint)
diff --git a/src/python_testing/TC_PAVSTI_1_1.py b/src/python_testing/TC_PAVSTI_1_1.py
index 9a5b1ee..a49cc0e 100644
--- a/src/python_testing/TC_PAVSTI_1_1.py
+++ b/src/python_testing/TC_PAVSTI_1_1.py
@@ -198,10 +198,14 @@
),
]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_PAVSTI_1_1(self):
PICS_PRIVACY = "AVSM.S.F03"
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
pushavCluster = Clusters.PushAvStreamTransport
avsmCluster = Clusters.CameraAvStreamManagement
pushavAttr = Clusters.PushAvStreamTransport.Attributes
@@ -309,7 +313,7 @@
event_callback = EventSubscriptionHandler(expected_cluster=pushavCluster)
await event_callback.start(self.default_controller,
self.dut_node_id,
- self.get_endpoint(1))
+ self.get_endpoint())
self.step(7)
aConnectionID = (
diff --git a/src/python_testing/TC_PAVSTI_1_2.py b/src/python_testing/TC_PAVSTI_1_2.py
index 15042c8..18d36c1 100644
--- a/src/python_testing/TC_PAVSTI_1_2.py
+++ b/src/python_testing/TC_PAVSTI_1_2.py
@@ -152,10 +152,14 @@
),
]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_PAVSTI_1_2(self):
PICS_PRIVACY = "AVSM.S.F03"
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
pushavCluster = Clusters.PushAvStreamTransport
avsmCluster = Clusters.CameraAvStreamManagement
pushavAttr = Clusters.PushAvStreamTransport.Attributes
diff --git a/src/python_testing/TC_PAVSTTestBase.py b/src/python_testing/TC_PAVSTTestBase.py
index 3b8c79f..88a5fd0 100644
--- a/src/python_testing/TC_PAVSTTestBase.py
+++ b/src/python_testing/TC_PAVSTTestBase.py
@@ -36,7 +36,7 @@
return await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=attribute)
async def allocate_one_audio_stream(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
@@ -87,7 +87,7 @@
pass
async def allocate_one_video_stream(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
@@ -162,7 +162,7 @@
pass
async def validate_allocated_video_stream(self, videoStreamID):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
@@ -175,7 +175,7 @@
asserts.fail(f"Video Stream with ID {videoStreamID} not found as expected")
async def validate_allocated_audio_stream(self, audioStreamID):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
@@ -191,7 +191,7 @@
trigger_Options=None, ingestMethod=Clusters.PushAvStreamTransport.Enums.IngestMethodsEnum.kCMAFIngest,
url="https://localhost:1234/streams/1/", stream_Usage=None, container_Options=None,
videoStream_ID=None, audioStream_ID=None, expected_cluster_status=None, tlsEndPoint=1, expiryTime=DEFAULT_AV_TRANSPORT_EXPIRY_TIME_SEC):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.PushAvStreamTransport
# First verify that ADO is supported
@@ -301,7 +301,7 @@
return Status.Success
async def psvt_modify_push_transport(self, cmd, devCtrl=None):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
dev_ctrl = self.default_controller
if (devCtrl is not None):
dev_ctrl = devCtrl
@@ -319,7 +319,7 @@
pass
async def psvt_deallocate_push_transport(self, cmd, devCtrl=None):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
dev_ctrl = self.default_controller
if (devCtrl is not None):
dev_ctrl = devCtrl
@@ -337,7 +337,7 @@
pass
async def psvt_set_transport_status(self, cmd, expected_status=None, devCtrl=None):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
dev_ctrl = self.default_controller
if (devCtrl is not None):
dev_ctrl = devCtrl
@@ -353,7 +353,7 @@
pass
async def psvt_find_transport(self, cmd, expected_connectionID=None, devCtrl=None):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
dev_ctrl = self.default_controller
if (devCtrl is not None):
dev_ctrl = devCtrl
@@ -371,7 +371,7 @@
pass
async def psvt_manually_trigger_transport(self, cmd, expected_cluster_status=None, expected_status=None, devCtrl=None):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
dev_ctrl = self.default_controller
if (devCtrl is not None):
dev_ctrl = devCtrl
diff --git a/src/python_testing/TC_PAVST_2_1.py b/src/python_testing/TC_PAVST_2_1.py
index dcc3949..fd3f146 100644
--- a/src/python_testing/TC_PAVST_2_1.py
+++ b/src/python_testing/TC_PAVST_2_1.py
@@ -63,7 +63,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.PushAvStreamTransport))
async def test_TC_PAVST_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.PushAvStreamTransport
attr = Clusters.PushAvStreamTransport.Attributes
diff --git a/src/python_testing/TC_PAVST_2_10.py b/src/python_testing/TC_PAVST_2_10.py
index 29147bc..d45bd75 100644
--- a/src/python_testing/TC_PAVST_2_10.py
+++ b/src/python_testing/TC_PAVST_2_10.py
@@ -98,7 +98,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.PushAvStreamTransport))
async def test_TC_PAVST_2_10(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.endpoint = endpoint
self.node_id = self.dut_node_id
pvcluster = Clusters.PushAvStreamTransport
diff --git a/src/python_testing/TC_PAVST_2_2.py b/src/python_testing/TC_PAVST_2_2.py
index 266aaac..9ea069c 100644
--- a/src/python_testing/TC_PAVST_2_2.py
+++ b/src/python_testing/TC_PAVST_2_2.py
@@ -94,7 +94,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.PushAvStreamTransport))
async def test_TC_PAVST_2_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.endpoint = endpoint
self.node_id = self.dut_node_id
pvcluster = Clusters.PushAvStreamTransport
diff --git a/src/python_testing/TC_PAVST_2_3.py b/src/python_testing/TC_PAVST_2_3.py
index 93353ba..5db7de0 100644
--- a/src/python_testing/TC_PAVST_2_3.py
+++ b/src/python_testing/TC_PAVST_2_3.py
@@ -147,9 +147,13 @@
"DUT responds with InvalidStreamUsage."),
]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_PAVST_2_3(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.endpoint = endpoint
self.node_id = self.dut_node_id
pvcluster = Clusters.PushAvStreamTransport
diff --git a/src/python_testing/TC_PAVST_2_4.py b/src/python_testing/TC_PAVST_2_4.py
index 1c80e7e..3ced759 100644
--- a/src/python_testing/TC_PAVST_2_4.py
+++ b/src/python_testing/TC_PAVST_2_4.py
@@ -110,7 +110,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.PushAvStreamTransport))
async def test_TC_PAVST_2_4(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.endpoint = endpoint
self.node_id = self.dut_node_id
pvcluster = Clusters.PushAvStreamTransport
diff --git a/src/python_testing/TC_PAVST_2_5.py b/src/python_testing/TC_PAVST_2_5.py
index 150ecf7..dee414c 100644
--- a/src/python_testing/TC_PAVST_2_5.py
+++ b/src/python_testing/TC_PAVST_2_5.py
@@ -110,7 +110,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.PushAvStreamTransport))
async def test_TC_PAVST_2_5(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.endpoint = endpoint
self.node_id = self.dut_node_id
pvcluster = Clusters.PushAvStreamTransport
diff --git a/src/python_testing/TC_PAVST_2_6.py b/src/python_testing/TC_PAVST_2_6.py
index 1c6e684..ec4587c 100644
--- a/src/python_testing/TC_PAVST_2_6.py
+++ b/src/python_testing/TC_PAVST_2_6.py
@@ -147,7 +147,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.PushAvStreamTransport))
async def test_TC_PAVST_2_6(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.endpoint = endpoint
self.node_id = self.dut_node_id
pvcluster = Clusters.PushAvStreamTransport
@@ -249,7 +249,7 @@
event_callback = EventSubscriptionHandler(expected_cluster=pvcluster)
await event_callback.start(self.default_controller,
self.dut_node_id,
- self.get_endpoint(1))
+ self.get_endpoint())
cmd = pvcluster.Commands.SetTransportStatus(
connectionID=aConnectionID,
transportStatus=not aTransportStatus
diff --git a/src/python_testing/TC_PAVST_2_7.py b/src/python_testing/TC_PAVST_2_7.py
index 9fb2a41..fc732d8 100644
--- a/src/python_testing/TC_PAVST_2_7.py
+++ b/src/python_testing/TC_PAVST_2_7.py
@@ -151,7 +151,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.PushAvStreamTransport))
async def test_TC_PAVST_2_7(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.endpoint = endpoint
self.node_id = self.dut_node_id
pvcluster = Clusters.PushAvStreamTransport
diff --git a/src/python_testing/TC_PAVST_2_8.py b/src/python_testing/TC_PAVST_2_8.py
index ca4f465..cc314d5 100644
--- a/src/python_testing/TC_PAVST_2_8.py
+++ b/src/python_testing/TC_PAVST_2_8.py
@@ -111,7 +111,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.PushAvStreamTransport))
async def test_TC_PAVST_2_8(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.endpoint = endpoint
self.node_id = self.dut_node_id
pvcluster = Clusters.PushAvStreamTransport
diff --git a/src/python_testing/TC_PAVST_2_9.py b/src/python_testing/TC_PAVST_2_9.py
index 86d31f0..8a1df25 100644
--- a/src/python_testing/TC_PAVST_2_9.py
+++ b/src/python_testing/TC_PAVST_2_9.py
@@ -95,7 +95,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.PushAvStreamTransport))
async def test_TC_PAVST_2_9(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.endpoint = endpoint
self.node_id = self.dut_node_id
pvcluster = Clusters.PushAvStreamTransport
diff --git a/src/python_testing/TC_PWRTL_2_1.py b/src/python_testing/TC_PWRTL_2_1.py
index 4f1871f6..4377a0e 100644
--- a/src/python_testing/TC_PWRTL_2_1.py
+++ b/src/python_testing/TC_PWRTL_2_1.py
@@ -47,12 +47,16 @@
def pics_TC_PWRTL_2_1(self) -> list[str]:
return ["PWRTL.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_PWRTL_2_1(self):
attributes = Clusters.PowerTopology.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
powertop_attr_list = Clusters.Objects.PowerTopology.Attributes.AttributeList
powertop_cluster = Clusters.Objects.PowerTopology
diff --git a/src/python_testing/TC_REFALM_2_2.py b/src/python_testing/TC_REFALM_2_2.py
index 07deda9..e65356d 100644
--- a/src/python_testing/TC_REFALM_2_2.py
+++ b/src/python_testing/TC_REFALM_2_2.py
@@ -182,10 +182,14 @@
command_dict = {"Name": "SetRefrigeratorDoorStatus", "EndpointId": self.endpoint, "DoorOpen": 0}
self.write_to_app_pipe(command_dict)
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_REFALM_2_2(self):
"""Run the test steps."""
- self.endpoint = self.get_endpoint(default=1)
+ self.endpoint = self.get_endpoint()
cluster = Clusters.RefrigeratorAlarm
logger.info(f"Default endpoint {self.endpoint}")
# Commision the device.
@@ -247,7 +251,7 @@
event_callback = EventSubscriptionHandler(expected_cluster=Clusters.RefrigeratorAlarm)
await event_callback.start(self.default_controller,
self.dut_node_id,
- self.get_endpoint(1))
+ self.get_endpoint())
self.step(12)
# repeat step 4 and 5
diff --git a/src/python_testing/TC_RVCOPSTATE_2_5.py b/src/python_testing/TC_RVCOPSTATE_2_5.py
index 2662b8f..c12e74d 100644
--- a/src/python_testing/TC_RVCOPSTATE_2_5.py
+++ b/src/python_testing/TC_RVCOPSTATE_2_5.py
@@ -161,10 +161,14 @@
asserts.assert_equal(ret.commandResponseState.errorStateID, expected_error,
f"errorStateID({ret.commandResponseState.errorStateID}) should be {error_enum_to_text(expected_error)}")
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_RVCOPSTATE_2_5(self):
- self.endpoint = self.get_endpoint(default=1)
+ self.endpoint = self.get_endpoint()
# Allow some user input steps to be skipped if running under CI
self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
diff --git a/src/python_testing/TC_SEAR_1_2.py b/src/python_testing/TC_SEAR_1_2.py
index 23d14ed..4f99a1d 100644
--- a/src/python_testing/TC_SEAR_1_2.py
+++ b/src/python_testing/TC_SEAR_1_2.py
@@ -203,9 +203,13 @@
def TC_SEAR_1_2(self) -> list[str]:
return ["SEAR.S"]
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_SEAR_1_2(self):
- self.endpoint = self.get_endpoint(default=1)
+ self.endpoint = self.get_endpoint()
asserts.assert_false(self.endpoint is None, "--endpoint <endpoint> must be included on the command line in.")
self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
self.print_step(1, "Commissioning, already done")
diff --git a/src/python_testing/TC_SOIL_2_1.py b/src/python_testing/TC_SOIL_2_1.py
index fe755bb..e260733 100644
--- a/src/python_testing/TC_SOIL_2_1.py
+++ b/src/python_testing/TC_SOIL_2_1.py
@@ -72,7 +72,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.SoilMeasurement))
async def test_TC_SOIL_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.SoilMeasurement.Attributes
diff --git a/src/python_testing/TC_SOIL_2_2.py b/src/python_testing/TC_SOIL_2_2.py
index cd2decf..496c586 100644
--- a/src/python_testing/TC_SOIL_2_2.py
+++ b/src/python_testing/TC_SOIL_2_2.py
@@ -74,7 +74,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.SoilMeasurement))
async def test_TC_SOIL_2_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
cluster = Clusters.SoilMeasurement
diff --git a/src/python_testing/TC_TCCM_1_2.py b/src/python_testing/TC_TCCM_1_2.py
index 836ecf8..9195924 100644
--- a/src/python_testing/TC_TCCM_1_2.py
+++ b/src/python_testing/TC_TCCM_1_2.py
@@ -72,7 +72,7 @@
async def test_TC_TCCM_1_2(self):
# Setup common mode check
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
diff --git a/src/python_testing/TC_TLSCERT.py b/src/python_testing/TC_TLSCERT.py
index bbc5e32..5c84525 100644
--- a/src/python_testing/TC_TLSCERT.py
+++ b/src/python_testing/TC_TLSCERT.py
@@ -76,7 +76,7 @@
async def common_setup(self, step_prefix: string = "1") -> TLSUtils:
self.step(f'{step_prefix}.1')
attributes = Clusters.TlsCertificateManagement.Attributes
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# Establishing CR1 controller
cr1_cmd = TLSUtils(self, endpoint=endpoint)
@@ -107,7 +107,7 @@
async def common_two_fabric_setup(self, step_prefix: string = "1") -> TwoFabricData:
cr1_cmd = await self.common_setup(f'{step_prefix}.1')
cr1 = self.default_controller
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(f'{step_prefix}.2')
# Establishing CR2 controller
diff --git a/src/python_testing/TC_TLSCLIENT.py b/src/python_testing/TC_TLSCLIENT.py
index e1763ef..1439686 100644
--- a/src/python_testing/TC_TLSCLIENT.py
+++ b/src/python_testing/TC_TLSCLIENT.py
@@ -62,7 +62,7 @@
async def common_setup(self):
self.step(1)
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cr1_cmd = TLSUtils(self, endpoint=endpoint)
cr1 = self.default_controller
@@ -107,7 +107,7 @@
async def test_TC_TLSCLIENT_2_1(self):
self.step(1)
attributes = Clusters.TlsClientManagement.Attributes
- cr1_cmd = TLSUtils(self, endpoint=self.get_endpoint(default=1))
+ cr1_cmd = TLSUtils(self, endpoint=self.get_endpoint())
self.step(2)
max_provisioned = await cr1_cmd.read_tls_client_attribute(attributes.MaxProvisioned)
diff --git a/src/python_testing/TC_VALCC_2_1.py b/src/python_testing/TC_VALCC_2_1.py
index b1a9a53..aa7a38c 100644
--- a/src/python_testing/TC_VALCC_2_1.py
+++ b/src/python_testing/TC_VALCC_2_1.py
@@ -73,10 +73,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.ValveConfigurationAndControl.Attributes
diff --git a/src/python_testing/TC_VALCC_3_1.py b/src/python_testing/TC_VALCC_3_1.py
index 0bcad13..488ad13 100644
--- a/src/python_testing/TC_VALCC_3_1.py
+++ b/src/python_testing/TC_VALCC_3_1.py
@@ -70,10 +70,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_3_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1) # commissioning - already done
diff --git a/src/python_testing/TC_VALCC_3_2.py b/src/python_testing/TC_VALCC_3_2.py
index e1a22fe..c6ec571 100644
--- a/src/python_testing/TC_VALCC_3_2.py
+++ b/src/python_testing/TC_VALCC_3_2.py
@@ -75,10 +75,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_3_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
asserts.assert_is_not_none(
endpoint, "Endpoint is required for this tests. The test endpoint is set using the --endpoint flag")
diff --git a/src/python_testing/TC_VALCC_3_3.py b/src/python_testing/TC_VALCC_3_3.py
index bb247b8..a1f9288 100644
--- a/src/python_testing/TC_VALCC_3_3.py
+++ b/src/python_testing/TC_VALCC_3_3.py
@@ -76,10 +76,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_3_3(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.ValveConfigurationAndControl.Attributes
diff --git a/src/python_testing/TC_VALCC_3_4.py b/src/python_testing/TC_VALCC_3_4.py
index 55d6268..6da6276 100644
--- a/src/python_testing/TC_VALCC_3_4.py
+++ b/src/python_testing/TC_VALCC_3_4.py
@@ -66,10 +66,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_3_4(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.ValveConfigurationAndControl.Attributes
diff --git a/src/python_testing/TC_VALCC_4_1.py b/src/python_testing/TC_VALCC_4_1.py
index 90e1f3f..290888d 100644
--- a/src/python_testing/TC_VALCC_4_1.py
+++ b/src/python_testing/TC_VALCC_4_1.py
@@ -70,10 +70,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_4_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.ValveConfigurationAndControl.Attributes
diff --git a/src/python_testing/TC_VALCC_4_2.py b/src/python_testing/TC_VALCC_4_2.py
index 4e0f4ac..a74c6e0 100644
--- a/src/python_testing/TC_VALCC_4_2.py
+++ b/src/python_testing/TC_VALCC_4_2.py
@@ -73,10 +73,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_4_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.ValveConfigurationAndControl.Attributes
diff --git a/src/python_testing/TC_VALCC_4_3.py b/src/python_testing/TC_VALCC_4_3.py
index 641534c..972d378 100644
--- a/src/python_testing/TC_VALCC_4_3.py
+++ b/src/python_testing/TC_VALCC_4_3.py
@@ -70,10 +70,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_4_3(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.ValveConfigurationAndControl.Attributes
diff --git a/src/python_testing/TC_VALCC_4_4.py b/src/python_testing/TC_VALCC_4_4.py
index cab5203..28e0dad 100644
--- a/src/python_testing/TC_VALCC_4_4.py
+++ b/src/python_testing/TC_VALCC_4_4.py
@@ -79,10 +79,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_4_4(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.ValveConfigurationAndControl.Attributes
diff --git a/src/python_testing/TC_VALCC_4_5.py b/src/python_testing/TC_VALCC_4_5.py
index f11a094..30515be 100644
--- a/src/python_testing/TC_VALCC_4_5.py
+++ b/src/python_testing/TC_VALCC_4_5.py
@@ -70,10 +70,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_VALCC_4_5(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
attributes = Clusters.ValveConfigurationAndControl.Attributes
diff --git a/src/python_testing/TC_WASHERCTRL_2_1.py b/src/python_testing/TC_WASHERCTRL_2_1.py
index 6a5c8ee..554b64a 100644
--- a/src/python_testing/TC_WASHERCTRL_2_1.py
+++ b/src/python_testing/TC_WASHERCTRL_2_1.py
@@ -85,7 +85,7 @@
Clusters.LaundryWasherControls.Bitmaps.Feature.kSpin))
async def test_TC_WASHERCTRL_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
diff --git a/src/python_testing/TC_WEBRTCPTestBase.py b/src/python_testing/TC_WEBRTCPTestBase.py
index 4c0589a..2f56518 100644
--- a/src/python_testing/TC_WEBRTCPTestBase.py
+++ b/src/python_testing/TC_WEBRTCPTestBase.py
@@ -28,7 +28,7 @@
class WEBRTCPTestBase:
async def allocate_one_audio_stream(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
@@ -82,7 +82,7 @@
pass
async def allocate_one_video_stream(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
commands = Clusters.CameraAvStreamManagement.Commands
@@ -162,7 +162,7 @@
pass
async def validate_allocated_video_stream(self, videoStreamID):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
@@ -175,7 +175,7 @@
asserts.fail(f"Video Stream with ID {videoStreamID} not found as expected")
async def validate_allocated_audio_stream(self, audioStreamID):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.CameraAvStreamManagement
attr = Clusters.CameraAvStreamManagement.Attributes
diff --git a/src/python_testing/TC_WEBRTCP_2_1.py b/src/python_testing/TC_WEBRTCP_2_1.py
index c9dcbd3..6261d7f 100644
--- a/src/python_testing/TC_WEBRTCP_2_1.py
+++ b/src/python_testing/TC_WEBRTCP_2_1.py
@@ -83,6 +83,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WebRTCP_2_1(self):
"""
@@ -97,7 +101,7 @@
await self.validate_allocated_audio_stream(audioStreamID)
await self.validate_allocated_video_stream(videoStreamID)
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.WebRTCTransportProvider
# Check if privacy feature is supported before testing privacy mode
diff --git a/src/python_testing/TC_WEBRTCP_2_10.py b/src/python_testing/TC_WEBRTCP_2_10.py
index fcb942b..02a1800 100644
--- a/src/python_testing/TC_WEBRTCP_2_10.py
+++ b/src/python_testing/TC_WEBRTCP_2_10.py
@@ -72,6 +72,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_10(self):
"""
@@ -80,7 +84,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.user_params.get("endpoint", 1)
+ endpoint = self.get_endpoint()
# Use a specific originating endpoint ID to test storage
originating_endpoint_id = 5
diff --git a/src/python_testing/TC_WEBRTCP_2_11.py b/src/python_testing/TC_WEBRTCP_2_11.py
index 38159d8..ff371f4 100644
--- a/src/python_testing/TC_WEBRTCP_2_11.py
+++ b/src/python_testing/TC_WEBRTCP_2_11.py
@@ -90,11 +90,15 @@
def default_timeout(self) -> int:
return 2 * 60 # 2 minutes
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_11(self):
self.step("precondition-1")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
webrtc_manager = WebRTCManager(event_loop=self.event_loop)
webrtc_peer: LibdatachannelPeerConnection = webrtc_manager.create_peer(
node_id=self.dut_node_id, fabric_index=self.default_controller.GetFabricIndexInternal(), endpoint=endpoint
diff --git a/src/python_testing/TC_WEBRTCP_2_12.py b/src/python_testing/TC_WEBRTCP_2_12.py
index 9485c5e..8cdea08 100644
--- a/src/python_testing/TC_WEBRTCP_2_12.py
+++ b/src/python_testing/TC_WEBRTCP_2_12.py
@@ -79,6 +79,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_12(self):
"""
@@ -87,7 +91,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_13.py b/src/python_testing/TC_WEBRTCP_2_13.py
index 4e8901c..204ccbb 100644
--- a/src/python_testing/TC_WEBRTCP_2_13.py
+++ b/src/python_testing/TC_WEBRTCP_2_13.py
@@ -87,6 +87,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_13(self):
"""
@@ -95,7 +99,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate both Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_14.py b/src/python_testing/TC_WEBRTCP_2_14.py
index e110bf7..c99df94 100644
--- a/src/python_testing/TC_WEBRTCP_2_14.py
+++ b/src/python_testing/TC_WEBRTCP_2_14.py
@@ -83,6 +83,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_14(self):
"""
@@ -91,7 +95,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate both Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_15.py b/src/python_testing/TC_WEBRTCP_2_15.py
index 1fdb5f1..5d1ac0a 100644
--- a/src/python_testing/TC_WEBRTCP_2_15.py
+++ b/src/python_testing/TC_WEBRTCP_2_15.py
@@ -79,6 +79,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_15(self):
"""
@@ -87,7 +91,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# Use a specific originating endpoint ID for testing (different from default)
originating_endpoint = 2
diff --git a/src/python_testing/TC_WEBRTCP_2_16.py b/src/python_testing/TC_WEBRTCP_2_16.py
index 9b40ac0..44fc2d0 100644
--- a/src/python_testing/TC_WEBRTCP_2_16.py
+++ b/src/python_testing/TC_WEBRTCP_2_16.py
@@ -78,6 +78,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_16(self):
"""
@@ -86,7 +90,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_17.py b/src/python_testing/TC_WEBRTCP_2_17.py
index cbc906a..6a0d28a 100644
--- a/src/python_testing/TC_WEBRTCP_2_17.py
+++ b/src/python_testing/TC_WEBRTCP_2_17.py
@@ -86,6 +86,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_17(self):
"""
@@ -94,7 +98,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_18.py b/src/python_testing/TC_WEBRTCP_2_18.py
index 4001121..10083a5 100644
--- a/src/python_testing/TC_WEBRTCP_2_18.py
+++ b/src/python_testing/TC_WEBRTCP_2_18.py
@@ -85,6 +85,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_18(self):
"""
@@ -93,7 +97,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_19.py b/src/python_testing/TC_WEBRTCP_2_19.py
index f4e322f..f6466c8 100644
--- a/src/python_testing/TC_WEBRTCP_2_19.py
+++ b/src/python_testing/TC_WEBRTCP_2_19.py
@@ -86,6 +86,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_19(self):
"""
@@ -94,7 +98,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_2.py b/src/python_testing/TC_WEBRTCP_2_2.py
index 3094c56..f72ebd4 100644
--- a/src/python_testing/TC_WEBRTCP_2_2.py
+++ b/src/python_testing/TC_WEBRTCP_2_2.py
@@ -83,6 +83,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WebRTCP_2_2(self):
"""
@@ -97,7 +101,7 @@
await self.validate_allocated_audio_stream(audioStreamID)
await self.validate_allocated_video_stream(videoStreamID)
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.WebRTCTransportProvider
self.step(1)
diff --git a/src/python_testing/TC_WEBRTCP_2_20.py b/src/python_testing/TC_WEBRTCP_2_20.py
index 05c8bce..c9ef0a3 100644
--- a/src/python_testing/TC_WEBRTCP_2_20.py
+++ b/src/python_testing/TC_WEBRTCP_2_20.py
@@ -85,6 +85,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_20(self):
"""
@@ -93,7 +97,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_21.py b/src/python_testing/TC_WEBRTCP_2_21.py
index 95d454b..9eb94d0 100644
--- a/src/python_testing/TC_WEBRTCP_2_21.py
+++ b/src/python_testing/TC_WEBRTCP_2_21.py
@@ -87,6 +87,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_21(self):
"""
@@ -95,7 +99,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_22.py b/src/python_testing/TC_WEBRTCP_2_22.py
index 64be1e1..83c9e4b 100644
--- a/src/python_testing/TC_WEBRTCP_2_22.py
+++ b/src/python_testing/TC_WEBRTCP_2_22.py
@@ -83,6 +83,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_22(self):
"""
@@ -91,7 +95,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_23.py b/src/python_testing/TC_WEBRTCP_2_23.py
index 196f1a0..072bffd 100644
--- a/src/python_testing/TC_WEBRTCP_2_23.py
+++ b/src/python_testing/TC_WEBRTCP_2_23.py
@@ -112,6 +112,10 @@
asserts.fail(f'Could not find stream {stream_id}')
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_23(self):
"""
@@ -120,7 +124,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_24.py b/src/python_testing/TC_WEBRTCP_2_24.py
index 2ee8a2a..b08292f 100644
--- a/src/python_testing/TC_WEBRTCP_2_24.py
+++ b/src/python_testing/TC_WEBRTCP_2_24.py
@@ -84,6 +84,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_24(self):
"""
@@ -92,7 +96,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# SFrame cipher suite constants (from SFrame RFC)
CIPHER_SUITE_AES_128_GCM = 0x0001
diff --git a/src/python_testing/TC_WEBRTCP_2_25.py b/src/python_testing/TC_WEBRTCP_2_25.py
index d8d010f..40d612c 100644
--- a/src/python_testing/TC_WEBRTCP_2_25.py
+++ b/src/python_testing/TC_WEBRTCP_2_25.py
@@ -85,6 +85,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_25(self):
"""
@@ -93,7 +97,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
# SFrame cipher suite constants (from SFrame RFC)
CIPHER_SUITE_AES_128_GCM = 0x0001
diff --git a/src/python_testing/TC_WEBRTCP_2_3.py b/src/python_testing/TC_WEBRTCP_2_3.py
index a4898f6..f871219 100644
--- a/src/python_testing/TC_WEBRTCP_2_3.py
+++ b/src/python_testing/TC_WEBRTCP_2_3.py
@@ -84,13 +84,17 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WebRTCP_2_3(self):
"""
Executes the test steps for the WebRTC Provider cluster scenario.
"""
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.WebRTCTransportProvider
# Sample SDP for testing
diff --git a/src/python_testing/TC_WEBRTCP_2_4.py b/src/python_testing/TC_WEBRTCP_2_4.py
index fe792ab..3bc6ff4 100644
--- a/src/python_testing/TC_WEBRTCP_2_4.py
+++ b/src/python_testing/TC_WEBRTCP_2_4.py
@@ -82,13 +82,17 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WebRTCP_2_4(self):
"""
Executes the test steps for the WebRTC Provider cluster scenario.
"""
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.WebRTCTransportProvider
self.step(1)
diff --git a/src/python_testing/TC_WEBRTCP_2_5.py b/src/python_testing/TC_WEBRTCP_2_5.py
index 018d600..5a4f13d 100644
--- a/src/python_testing/TC_WEBRTCP_2_5.py
+++ b/src/python_testing/TC_WEBRTCP_2_5.py
@@ -92,6 +92,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WebRTCP_2_5(self):
"""
@@ -101,7 +105,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.WebRTCTransportProvider
self.step(1)
diff --git a/src/python_testing/TC_WEBRTCP_2_6.py b/src/python_testing/TC_WEBRTCP_2_6.py
index 01fc972..7b8bdd2 100644
--- a/src/python_testing/TC_WEBRTCP_2_6.py
+++ b/src/python_testing/TC_WEBRTCP_2_6.py
@@ -69,6 +69,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WebRTCP_2_6(self):
"""
@@ -77,7 +81,7 @@
self.step("precondition")
# Commission DUT - already done
- webrtc_endpoint = self.get_endpoint(default=1)
+ webrtc_endpoint = self.get_endpoint()
self.step(1)
# Read the descriptor cluster on the endpoint containing the WebRTC Transport Provider cluster
diff --git a/src/python_testing/TC_WEBRTCP_2_7.py b/src/python_testing/TC_WEBRTCP_2_7.py
index ca386b0..99a0f28 100644
--- a/src/python_testing/TC_WEBRTCP_2_7.py
+++ b/src/python_testing/TC_WEBRTCP_2_7.py
@@ -85,6 +85,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WebRTCP_2_7(self):
"""
@@ -93,7 +97,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate both Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_8.py b/src/python_testing/TC_WEBRTCP_2_8.py
index 513600f..5492e98 100644
--- a/src/python_testing/TC_WEBRTCP_2_8.py
+++ b/src/python_testing/TC_WEBRTCP_2_8.py
@@ -77,6 +77,10 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_8(self):
"""
@@ -85,7 +89,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.user_params.get("endpoint", 1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTCP_2_9.py b/src/python_testing/TC_WEBRTCP_2_9.py
index d90d4f2..f4e32a1 100644
--- a/src/python_testing/TC_WEBRTCP_2_9.py
+++ b/src/python_testing/TC_WEBRTCP_2_9.py
@@ -91,6 +91,10 @@
await self.send_single_cmd(cmd=end_session_cmd, endpoint=endpoint)
# EndSession command succeeds if no exception is thrown
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTCP_2_9(self):
"""
@@ -99,7 +103,7 @@
self.step("precondition")
# Commission DUT - already done
- endpoint = self.user_params.get("endpoint", 1)
+ endpoint = self.get_endpoint()
self.step(1)
# Allocate Audio and Video streams
diff --git a/src/python_testing/TC_WEBRTC_1_1.py b/src/python_testing/TC_WEBRTC_1_1.py
index 757441b..ec40cb7 100644
--- a/src/python_testing/TC_WEBRTC_1_1.py
+++ b/src/python_testing/TC_WEBRTC_1_1.py
@@ -90,11 +90,15 @@
def default_timeout(self) -> int:
return 4 * 60 # 4 minutes
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTC_1_1(self):
self.step("precondition-1")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
webrtc_manager = WebRTCManager(event_loop=self.event_loop)
webrtc_peer: LibdatachannelPeerConnection = webrtc_manager.create_peer(
node_id=self.dut_node_id, fabric_index=self.default_controller.GetFabricIndexInternal(), endpoint=endpoint
diff --git a/src/python_testing/TC_WEBRTC_1_2.py b/src/python_testing/TC_WEBRTC_1_2.py
index b0ed9ea..cf3c3fe 100644
--- a/src/python_testing/TC_WEBRTC_1_2.py
+++ b/src/python_testing/TC_WEBRTC_1_2.py
@@ -98,11 +98,15 @@
def default_timeout(self) -> int:
return 4 * 60 # 4 minutes
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTC_1_2(self):
self.step("precondition-1")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
webrtc_manager = WebRTCManager(event_loop=self.event_loop)
webrtc_peer: LibdatachannelPeerConnection = webrtc_manager.create_peer(
node_id=self.dut_node_id, fabric_index=self.default_controller.GetFabricIndexInternal(), endpoint=endpoint
diff --git a/src/python_testing/TC_WEBRTC_1_3.py b/src/python_testing/TC_WEBRTC_1_3.py
index 946d728..2ddd2eb 100644
--- a/src/python_testing/TC_WEBRTC_1_3.py
+++ b/src/python_testing/TC_WEBRTC_1_3.py
@@ -95,11 +95,15 @@
def default_timeout(self) -> int:
return 4 * 60 # 4 minutes
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTC_1_3(self):
self.step("precondition-1")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
webrtc_manager = WebRTCManager(event_loop=self.event_loop)
webrtc_peer: LibdatachannelPeerConnection = webrtc_manager.create_peer(
node_id=self.dut_node_id, fabric_index=self.default_controller.GetFabricIndexInternal(), endpoint=endpoint
diff --git a/src/python_testing/TC_WEBRTC_1_4.py b/src/python_testing/TC_WEBRTC_1_4.py
index a91964c..c2df7b7 100644
--- a/src/python_testing/TC_WEBRTC_1_4.py
+++ b/src/python_testing/TC_WEBRTC_1_4.py
@@ -97,11 +97,15 @@
def default_timeout(self) -> int:
return 4 * 60 # 4 minutes
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTC_1_4(self):
self.step("precondition-1")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
webrtc_manager = WebRTCManager(event_loop=self.event_loop)
webrtc_peer: LibdatachannelPeerConnection = webrtc_manager.create_peer(
node_id=self.dut_node_id, fabric_index=self.default_controller.GetFabricIndexInternal(), endpoint=endpoint
diff --git a/src/python_testing/TC_WEBRTC_1_5.py b/src/python_testing/TC_WEBRTC_1_5.py
index 392df89..7bcfdf4 100644
--- a/src/python_testing/TC_WEBRTC_1_5.py
+++ b/src/python_testing/TC_WEBRTC_1_5.py
@@ -89,10 +89,14 @@
def default_timeout(self) -> int:
return 4 * 60 # 4 minutes
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTC_1_5(self):
self.step("precondition-1")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
webrtc_manager = WebRTCManager(event_loop=self.event_loop)
webrtc_peer: LibdatachannelPeerConnection = webrtc_manager.create_peer(
node_id=self.dut_node_id, fabric_index=self.default_controller.GetFabricIndexInternal(), endpoint=endpoint
diff --git a/src/python_testing/TC_WEBRTC_1_6.py b/src/python_testing/TC_WEBRTC_1_6.py
index 697e27f..b5ea592 100644
--- a/src/python_testing/TC_WEBRTC_1_6.py
+++ b/src/python_testing/TC_WEBRTC_1_6.py
@@ -104,7 +104,7 @@
async def test_TC_WEBRTC_1_6(self):
self.step("precondition-1")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
webrtc_manager = WebRTCManager(event_loop=self.event_loop)
await webrtc_manager.ws_connect()
webrtc_peer = None
diff --git a/src/python_testing/TC_WEBRTC_1_7.py b/src/python_testing/TC_WEBRTC_1_7.py
index 64a96ef..afdfda3 100644
--- a/src/python_testing/TC_WEBRTC_1_7.py
+++ b/src/python_testing/TC_WEBRTC_1_7.py
@@ -106,11 +106,15 @@
def default_timeout(self) -> int:
return 4 * 60 # 4 minutes
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTC_1_7(self):
self.step("precondition-1")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
webrtc_manager = WebRTCManager(event_loop=self.event_loop)
webrtc_peer: LibdatachannelPeerConnection = webrtc_manager.create_peer(
node_id=self.dut_node_id, fabric_index=self.default_controller.GetFabricIndexInternal(), endpoint=endpoint
diff --git a/src/python_testing/TC_WEBRTC_1_8.py b/src/python_testing/TC_WEBRTC_1_8.py
index 93948d1..947b605 100644
--- a/src/python_testing/TC_WEBRTC_1_8.py
+++ b/src/python_testing/TC_WEBRTC_1_8.py
@@ -129,11 +129,15 @@
def default_timeout(self) -> int:
return 4 * 60 # 4 minutes
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WEBRTC_1_8(self):
self.step("precondition-1")
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
webrtc_manager = WebRTCManager(event_loop=self.event_loop)
self.step("precondition-2")
diff --git a/src/python_testing/TC_WHM_1_2.py b/src/python_testing/TC_WHM_1_2.py
index d96f8da..c65982a 100644
--- a/src/python_testing/TC_WHM_1_2.py
+++ b/src/python_testing/TC_WHM_1_2.py
@@ -69,10 +69,14 @@
]
return pics
+ @property
+ def default_endpoint(self) -> int:
+ return 1
+
@async_test_body
async def test_TC_WHM_1_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
attributes = Clusters.WaterHeaterMode.Attributes
diff --git a/src/python_testing/TC_ZONEMGMT_2_1.py b/src/python_testing/TC_ZONEMGMT_2_1.py
index ced2309..4161109 100644
--- a/src/python_testing/TC_ZONEMGMT_2_1.py
+++ b/src/python_testing/TC_ZONEMGMT_2_1.py
@@ -76,7 +76,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.ZoneManagement) and
has_cluster(Clusters.CameraAvStreamManagement))
async def test_TC_ZONEMGMT_2_1(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.ZoneManagement
attr = Clusters.ZoneManagement.Attributes
diff --git a/src/python_testing/TC_ZONEMGMT_2_2.py b/src/python_testing/TC_ZONEMGMT_2_2.py
index 7875f11..8497ca3 100644
--- a/src/python_testing/TC_ZONEMGMT_2_2.py
+++ b/src/python_testing/TC_ZONEMGMT_2_2.py
@@ -81,7 +81,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.ZoneManagement) and
has_cluster(Clusters.CameraAvStreamManagement))
async def test_TC_ZONEMGMT_2_2(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.ZoneManagement
attr = Clusters.ZoneManagement.Attributes
commands = Clusters.ZoneManagement.Commands
diff --git a/src/python_testing/TC_ZONEMGMT_2_3.py b/src/python_testing/TC_ZONEMGMT_2_3.py
index 08dafce..e31ae19 100644
--- a/src/python_testing/TC_ZONEMGMT_2_3.py
+++ b/src/python_testing/TC_ZONEMGMT_2_3.py
@@ -81,7 +81,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.ZoneManagement) and
has_cluster(Clusters.CameraAvStreamManagement))
async def test_TC_ZONEMGMT_2_3(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.ZoneManagement
attr = Clusters.ZoneManagement.Attributes
commands = Clusters.ZoneManagement.Commands
diff --git a/src/python_testing/TC_ZONEMGMT_2_4.py b/src/python_testing/TC_ZONEMGMT_2_4.py
index 8d7d30c..73f1bdb 100644
--- a/src/python_testing/TC_ZONEMGMT_2_4.py
+++ b/src/python_testing/TC_ZONEMGMT_2_4.py
@@ -121,7 +121,7 @@
@run_if_endpoint_matches(has_cluster(Clusters.ZoneManagement) and
has_cluster(Clusters.CameraAvStreamManagement))
async def test_TC_ZONEMGMT_2_4(self):
- endpoint = self.get_endpoint(default=1)
+ endpoint = self.get_endpoint()
cluster = Clusters.ZoneManagement
attr = Clusters.ZoneManagement.Attributes
commands = Clusters.ZoneManagement.Commands
diff --git a/src/python_testing/TC_pics_checker.py b/src/python_testing/TC_pics_checker.py
index 5ed8d59..cf7608b 100644
--- a/src/python_testing/TC_pics_checker.py
+++ b/src/python_testing/TC_pics_checker.py
@@ -101,8 +101,10 @@
def test_TC_IDM_10_4(self):
# wildcard read is done in setup_class
self.step(1)
- self.endpoint_id = self.get_endpoint(default=None)
- asserts.assert_not_equal(self.endpoint_id, None, "An explicit endpoint is required for this test, please use --endpoint")
+ asserts.assert_not_equal(self.matter_test_config.endpoint, None,
+ "An explicit endpoint is required for this test, please use --endpoint")
+ self.endpoint_id = self.get_endpoint()
+
self.endpoint = self.endpoints_tlv[self.endpoint_id]
self.success = True
diff --git a/src/python_testing/drlk_2_x_common.py b/src/python_testing/drlk_2_x_common.py
index bbc02a6..1d70600 100644
--- a/src/python_testing/drlk_2_x_common.py
+++ b/src/python_testing/drlk_2_x_common.py
@@ -126,7 +126,7 @@
# Allow for user overrides of these values
self.user_index = self.user_params.get("user_index", 1)
- self.endpoint = self.user_params.get("endpoint", 1)
+ self.endpoint = self.get_endpoint()
credentialIndex = self.user_params.get("credential_index", 1)
userCodeTemporaryDisableTime = self.user_params.get("user_code_temporary_disable_time", 15)
wrongCodeEntryLimit = self.user_params.get("wrong_code_entry_limit", 3)
diff --git a/src/python_testing/matter_testing_infrastructure/matter/testing/matter_testing.py b/src/python_testing/matter_testing_infrastructure/matter/testing/matter_testing.py
index 639c51f..2e7f4de 100644
--- a/src/python_testing/matter_testing_infrastructure/matter/testing/matter_testing.py
+++ b/src/python_testing/matter_testing_infrastructure/matter/testing/matter_testing.py
@@ -444,16 +444,20 @@
"""Checks if the 'PICS_SDK_CI_ONLY' PICS flag is enabled."""
return self.check_pics('PICS_SDK_CI_ONLY')
+ @property
+ def default_endpoint(self) -> int:
+ return 0
+
#
# Matter Test API - Parameter Getters
#
- def get_endpoint(self, default: Optional[int] = 0) -> int:
+ def get_endpoint(self) -> int:
"""Gets the target endpoint ID from config, with a fallback default."""
endpoint = self.matter_test_config.endpoint
if endpoint is not None:
return endpoint
- return 0 if default is None else default
+ return self.default_endpoint
def get_wifi_ssid(self, default: str = "") -> str:
''' Get WiFi SSID
