@@ -251,15 +251,13 @@ def validate_traffic_demands(self, expected_count: int) -> None:
251251
252252 def validate_failure_policy (
253253 self ,
254- expected_name : Optional [str ],
255254 expected_rules : int ,
256255 expected_scopes : Optional [List [str ]] = None ,
257256 ) -> None :
258257 """
259258 Validate failure policy configuration.
260259
261260 Args:
262- expected_name: Expected failure policy name (None if no policy expected)
263261 expected_rules: Expected number of failure rules
264262 expected_scopes: Optional list of expected rule scopes (node/link)
265263
@@ -268,26 +266,19 @@ def validate_failure_policy(
268266 """
269267 policy = self .scenario .failure_policy_set .get_default_policy ()
270268
271- if expected_name is None :
272- assert policy is None , (
273- f"Expected no default failure policy, but found: { policy .attrs .get ('name' ) if policy else None } "
269+ if policy is None :
270+ # No policy exists - only valid if expecting zero rules
271+ assert expected_rules == 0 , (
272+ f"Expected a failure policy with { expected_rules } rules, but no default policy found"
274273 )
275274 return
276275
277- assert policy is not None , "Expected a default failure policy but none found"
278-
279- # Validate rule count
276+ # Policy exists - validate rule count
280277 actual_rules = len (policy .rules )
281278 assert actual_rules == expected_rules , (
282279 f"Failure policy rule count mismatch: expected { expected_rules } , found { actual_rules } "
283280 )
284281
285- # Validate policy name
286- actual_name = policy .attrs .get ("name" )
287- assert actual_name == expected_name , (
288- f"Failure policy name mismatch: expected '{ expected_name } ', found '{ actual_name } '"
289- )
290-
291282 # Validate rule scopes if specified
292283 if expected_scopes :
293284 actual_scopes = [rule .entity_scope for rule in policy .rules ]
@@ -763,7 +754,7 @@ def basic_failure_scenario() -> Scenario:
763754 .with_failure_policy (
764755 "single_link_failure" ,
765756 {
766- "attrs" : {"name" : "single_link" , " description" : "Single link failure" },
757+ "attrs" : {"description" : "Single link failure" },
767758 "rules" : [{"entity_scope" : "link" , "rule_type" : "choice" , "count" : 1 }],
768759 },
769760 )
0 commit comments