Skip to content

Commit 7ae5199

Browse files
Set FabricFiltered to True when reading Fabrics. (#35023)
Otherwise we get a fabric view on the list of fabrics which does not change over time. Co-authored-by: Andrei Litvin <andreilitvin@google.com>
1 parent 6adca64 commit 7ae5199

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/python_testing/TC_CCTRL_2_2.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ async def test_TC_CCTRL_2_2(self):
123123
self.is_ci = self.check_pics('PICS_SDK_CI_ONLY')
124124

125125
self.step(1)
126-
th_server_fabrics = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0)
126+
th_server_fabrics = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0, fabric_filtered=False)
127127
self.step(2)
128128
th_server_vid = await self.read_single_attribute_check_success(cluster=Clusters.BasicInformation, attribute=Clusters.BasicInformation.Attributes.VendorID, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0)
129129
self.step(3)
@@ -248,7 +248,7 @@ async def test_TC_CCTRL_2_2(self):
248248

249249
self.step(20)
250250
print(f'server node id {self.server_nodeid}')
251-
th_server_fabrics_new = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0)
251+
th_server_fabrics_new = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0, fabric_filtered=False)
252252
asserts.assert_equal(len(th_server_fabrics), len(th_server_fabrics_new), "Unexpected number of fabrics on TH_SERVER")
253253

254254
self.step(21)
@@ -294,7 +294,7 @@ async def test_TC_CCTRL_2_2(self):
294294
time.sleep(30)
295295

296296
self.step(28)
297-
th_server_fabrics_new = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0)
297+
th_server_fabrics_new = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0, fabric_filtered=False)
298298
# TODO: this should be mocked too.
299299
if not self.is_ci:
300300
asserts.assert_equal(len(th_server_fabrics) + 1, len(th_server_fabrics_new),

src/python_testing/TC_MCORE_FS_1_1.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ async def test_TC_MCORE_FS_1_1(self):
9393
self.step(1)
9494
self.step(2)
9595
self.step(3)
96-
th_fsa_server_fabrics = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0)
96+
th_fsa_server_fabrics = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0, fabric_filtered=False)
9797
th_fsa_server_vid = await self.read_single_attribute_check_success(cluster=Clusters.BasicInformation, attribute=Clusters.BasicInformation.Attributes.VendorID, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0)
9898
th_fsa_server_pid = await self.read_single_attribute_check_success(cluster=Clusters.BasicInformation, attribute=Clusters.BasicInformation.Attributes.ProductID, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0)
9999

@@ -138,7 +138,7 @@ async def test_TC_MCORE_FS_1_1(self):
138138
if not self.is_ci:
139139
time.sleep(30)
140140

141-
th_fsa_server_fabrics_new = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0)
141+
th_fsa_server_fabrics_new = await self.read_single_attribute_check_success(cluster=Clusters.OperationalCredentials, attribute=Clusters.OperationalCredentials.Attributes.Fabrics, dev_ctrl=self.TH_server_controller, node_id=self.server_nodeid, endpoint=0, fabric_filtered=False)
142142
# TODO: this should be mocked too.
143143
if not self.is_ci:
144144
asserts.assert_equal(len(th_fsa_server_fabrics) + 1, len(th_fsa_server_fabrics_new),

0 commit comments

Comments
 (0)