@@ -164,44 +164,35 @@ def __init__(self):
164164 # 3. Identical output with log showing verification
165165 # 4. Remove BIB
166166 #
167- # Bundle Primary EIDs:
168- # src dest
169- # 1. [5.1, 6.1]
170- # 2. [2.1, 5.1]
171- # 3. [3.1, 5.1]
172- # 4. [4.1, 5.1]
173- #
174- # Can use ONE policy config and "filters"
175- # (e.g. source role, BIB policyrule filter should be role src for src_eid=2.1, role ver for 3.1, etc.)
176167 self .cases ["BSL_14a" ] = (_TestCase (
177168 input_data = [
178- [7 , 0 , 0 , [2 , [6 , 1 ]], [2 , [5 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
169+ [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
179170 [11 , 2 , 0 , 0 , bytes .fromhex ('810001018202820201828201078203008181820158405d9bdd1e2f043cf971588111f2fe1b847666cfacb7fb403c2468ef92a8ec93df80b41620df5bc639d0c355e1cce6217e17d3b8c5560edc14aba3d005196b046e' )],
180171 [1 , 1 , 0 , 0 , bytes .fromhex ('526561647920746F2067656E657261746520612033322D62797465207061796C6F6164' )]
181172 ],
182173 #
183174 expected_output = [
184- [7 , 0 , 0 , [2 , [6 , 1 ]], [2 , [5 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
175+ [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
185176 [11 , 2 , 0 , 0 , bytes .fromhex ('810001018202820201828201078203008181820158405d9bdd1e2f043cf971588111f2fe1b847666cfacb7fb403c2468ef92a8ec93df80b41620df5bc639d0c355e1cce6217e17d3b8c5560edc14aba3d005196b046e' )],
186177 [1 , 1 , 0 , 0 , bytes .fromhex ('526561647920746F2067656E657261746520612033322D62797465207061796C6F6164' )]
187178 ],
188179 #
189- policy_config = '0x82 ' ,
180+ policy_config = '0x280 ' ,
190181 is_implemented = True ,
191- is_working = False ,
182+ is_working = True ,
192183 expect_success = True ,
193184 input_data_format = DataFormat .BUNDLEARRAY ,
194185 expected_output_format = DataFormat .BUNDLEARRAY
195186 ))
196187 self .cases ["BSL_14b" ] = (_TestCase (
197188 input_data = [
198- [7 , 0 , 0 , [2 , [5 , 1 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
189+ [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
199190 [11 , 2 , 0 , 0 , bytes .fromhex ('810001018202820201828201078203008181820158405d9bdd1e2f043cf971588111f2fe1b847666cfacb7fb403c2468ef92a8ec93df80b41620df5bc639d0c355e1cce6217e17d3b8c5560edc14aba3d005196b046e' )],
200191 [1 , 1 , 0 , 0 , bytes .fromhex ('526561647920746F2067656E657261746520612033322D62797465207061796C6F6164' )]
201192 ],
202193 #
203194 expected_output = [
204- [7 , 0 , 0 , [2 , [5 , 1 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
195+ [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
205196 [11 , 2 , 0 , 0 , bytes .fromhex ('810001018202820201828201078203008181820158405d9bdd1e2f043cf971588111f2fe1b847666cfacb7fb403c2468ef92a8ec93df80b41620df5bc639d0c355e1cce6217e17d3b8c5560edc14aba3d005196b046e' )],
206197 [11 , 3 , 0 , 0 , bytes .fromhex ('810101018202820201828201078203008181820158403bdc69b3a34a2b5d3a8554368bd1e808f606219d2a10a846eae3886ae4ecc83c4ee550fdfb1cc636b904e2f1a73e303dcd4b6ccece003e95e8164dcc89a156e1' )],
207198 [1 , 1 , 0 , 0 , bytes .fromhex ('526561647920746F2067656E657261746520612033322D62797465207061796C6F6164' )]
@@ -217,19 +208,19 @@ def __init__(self):
217208 # 14c) need logs to show verification
218209 self .cases ["BSL_14c" ] = (_TestCase (
219210 input_data = [
220- [7 , 0 , 0 , [2 , [5 , 1 ]], [2 , [3 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
211+ [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
221212 [11 , 2 , 0 , 0 , bytes .fromhex ('810001018202820201828201078203008181820158405d9bdd1e2f043cf971588111f2fe1b847666cfacb7fb403c2468ef92a8ec93df80b41620df5bc639d0c355e1cce6217e17d3b8c5560edc14aba3d005196b046e' )],
222213 [1 , 1 , 0 , 0 , bytes .fromhex ('526561647920746F2067656E657261746520612033322D62797465207061796C6F6164' )]
223214 ],
224215 #
225216 expected_output = [
226- [7 , 0 , 0 , [2 , [5 , 1 ]], [2 , [3 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
217+ [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
227218 [11 , 2 , 0 , 0 , bytes .fromhex ('810001018202820201828201078203008181820158405d9bdd1e2f043cf971588111f2fe1b847666cfacb7fb403c2468ef92a8ec93df80b41620df5bc639d0c355e1cce6217e17d3b8c5560edc14aba3d005196b046e' )],
228219 [1 , 1 , 0 , 0 , bytes .fromhex ('526561647920746F2067656E657261746520612033322D62797465207061796C6F6164' )]
229220 ],
230221 #
231222 # policy_config = BIB_VERIFIER,
232- policy_config = '0x42 ' ,
223+ policy_config = '0x62 ' ,
233224 is_implemented = True ,
234225 is_working = True ,
235226 expect_success = True ,
@@ -238,17 +229,17 @@ def __init__(self):
238229 ))
239230 self .cases ["BSL_14d" ] = (_TestCase (
240231 input_data = [
241- [7 , 0 , 0 , [2 , [5 , 1 ]], [2 , [4 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
232+ [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
242233 [11 , 2 , 0 , 0 , bytes .fromhex ('810001018202820201828201078203008181820158405d9bdd1e2f043cf971588111f2fe1b847666cfacb7fb403c2468ef92a8ec93df80b41620df5bc639d0c355e1cce6217e17d3b8c5560edc14aba3d005196b046e' )],
243234 [1 , 1 , 0 , 0 , bytes .fromhex ('526561647920746F2067656E657261746520612033322D62797465207061796C6F6164' )]
244235 ],
245236 #
246237 expected_output = [
247- [7 , 0 , 0 , [2 , [5 , 1 ]], [2 , [4 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
238+ [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
248239 [1 , 1 , 0 , 0 , bytes .fromhex ('526561647920746F2067656E657261746520612033322D62797465207061796C6F6164' )]
249240 ],
250241 #
251- policy_config = '0x82 ' ,
242+ policy_config = '0xA2 ' ,
252243 is_implemented = True ,
253244 is_working = True ,
254245 expect_success = True ,
@@ -280,7 +271,7 @@ def __init__(self):
280271 ],
281272 policy_config = '0x5E' ,
282273 is_implemented = True ,
283- is_working = False ,
274+ is_working = True ,
284275 expect_success = True ,
285276 input_data_format = DataFormat .BUNDLEARRAY ,
286277 expected_output_format = DataFormat .BUNDLEARRAY
@@ -420,12 +411,12 @@ def __init__(self):
420411 ],
421412 expected_output = [
422413 [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
423- [12 , 2 , 1 , 0 , bytes .fromhex ('810101018202820201828201078203008181820158403bdc69b3a34a2b5d3a8554368bd1e808f606219d2a10a846eae3886ae4ecc83c4ee550fdfb1cc636b904e2f1a73e303dcd4b6ccece003e95e8164dcc89a156e1 ' )],
414+ [12 , 2 , 1 , 0 , bytes .fromhex ('8101020182028202018482014c5477656c76653132313231328202018203581869c411276fecddc4780df42c8a2af89296fabf34d7fae7008204008181820150efa4b5ac0108e3816c5606479801bc04 ' )],
424415 [1 , 1 , 0 , 0 , bytes .fromhex ('3a09c1e63fe23a7f66a59c7303837241e070b02619fc59c5214a22f08cd70795e73e9a' )]
425416 ],
426- policy_config = '0x05 ' ,
417+ policy_config = '0x105 ' ,
427418 is_implemented = True ,
428- is_working = False ,
419+ is_working = True ,
429420 expect_success = True ,
430421 input_data_format = DataFormat .BUNDLEARRAY ,
431422 expected_output_format = DataFormat .BUNDLEARRAY
@@ -444,12 +435,12 @@ def __init__(self):
444435 ],
445436 expected_output = [
446437 [7 , 0 , 0 , [2 , [1 , 2 ]], [2 , [2 , 1 ]], [2 , [2 , 1 ]], [0 , 40 ], 1000000 ],
447- [12 , 2 , 1 , 0 , bytes .fromhex ('810101018202820201828201078203008181820158403bdc69b3a34a2b5d3a8554368bd1e808f606219d2a10a846eae3886ae4ecc83c4ee550fdfb1cc636b904e2f1a73e303dcd4b6ccece003e95e8164dcc89a156e1 ' )],
438+ [12 , 2 , 1 , 0 , bytes .fromhex ('8101020182028202018482014c5477656c76653132313231328202018203581869c411276fecddc4780df42c8a2af89296fabf34d7fae7008204008181820150efa4b5ac0108e3816c5606479801bc04 ' )],
448439 [1 , 1 , 0 , 0 , bytes .fromhex ('3a09c1e63fe23a7f66a59c7303837241e070b02619fc59c5214a22f08cd70795e73e9a' )]
449440 ],
450- policy_config = '0x05 ' ,
441+ policy_config = '0x105 ' ,
451442 is_implemented = True ,
452- is_working = False ,
443+ is_working = True ,
453444 expect_success = True ,
454445 input_data_format = DataFormat .BUNDLEARRAY ,
455446 expected_output_format = DataFormat .BUNDLEARRAY
@@ -684,7 +675,7 @@ def __init__(self):
684675 #
685676 policy_config = '0x105' ,
686677 is_implemented = True ,
687- is_working = False ,
678+ is_working = True ,
688679 expect_success = True ,
689680 input_data_format = DataFormat .BUNDLEARRAY ,
690681 expected_output_format = DataFormat .BUNDLEARRAY
0 commit comments