mirror of
https://github.com/hansjone/netx.git
synced 2026-10-17 12:03:17 +08:00
Optimize cutover compare/monitor per the 2026-10-12 plan.
Correctness (A): normalize port-map names with the template rules (snapshot v2, v1 replays unchanged); protect mappings/templates that are referenced; stop dropping edited mapping text; accept pulled-but-not-shutdown ports as migrated; validate baseline ownership on project create; one canonical key form; fix built-in template tolerances and upgrade old packaged values in place. Cross-vendor identity (B): single identity pipeline for every path, per-side and per-vendor interface rules, value maps, filters after normalization, mapping pre-flight for compare and cutover projects, SQL eligibility fixes. Data quality (V): no_data / suspect_parse / not_collected sheet states, command slice coverage, directional compare modes, value-sorted duplicate pairing, before-side raw names in results and CSV. Robustness (H): bounded auto-run history, background evaluate/finish with polling, manual route tables out of the acceptance gate, baseline row cache, scoped duplicate-key failures, merged HF tasks with a per-NE session cap, same-device cutover, explicit scope_by_port_map, read-only GETs, resolvable red tickets. Frontend: pre-flight report, mapping table view, template editor support for the new rules, data-state banners. Docs: canonical field contract. Not included: Huawei status parsers (no real samples), SQL-path route compare. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
fff7d63b9b
commit
315539e0fd
59 changed files with 6483 additions and 487 deletions
|
|
@ -95,7 +95,8 @@ class BizStateClaimTests(unittest.TestCase):
|
|||
self.assertEqual(r2.get("reason"), "already_collecting")
|
||||
|
||||
def test_claim_ne_mutex_skips_same_ne(self) -> None:
|
||||
with patch.object(claim_mod, "max_concurrent_tasks", return_value=10):
|
||||
# Session cap 1 reproduces the classic "one collection per NE" mutex.
|
||||
with patch.object(claim_mod, "max_concurrent_tasks", return_value=10), patch.object(claim_mod, "max_sessions_per_ne", return_value=1):
|
||||
ra = claim_mod.enqueue_collect("ta", manual=True)
|
||||
rb = claim_mod.enqueue_collect("tb", manual=True)
|
||||
rc = claim_mod.enqueue_collect("tc", manual=True)
|
||||
|
|
@ -111,6 +112,47 @@ class BizStateClaimTests(unittest.TestCase):
|
|||
self.assertEqual(self.db.get(BizStateBatch, rb["batch_id"]).status, "queued")
|
||||
self.assertEqual(self.db.get(BizStateBatch, rc["batch_id"]).status, "running")
|
||||
|
||||
def test_a_ne_runs_up_to_its_session_cap_and_no_more(self) -> None:
|
||||
self.db.add_all([BizStateTask(id=f"x{i}", source="managed", ne_id="ne-a", status="running") for i in range(3)])
|
||||
for i in range(3):
|
||||
self.db.add(BizStateTaskItem(id=uuid4().hex, task_id=f"x{i}", source_profile_id="zte.arp",
|
||||
kind="catalog", enabled=True))
|
||||
self.db.commit()
|
||||
with patch.object(claim_mod, "max_concurrent_tasks", return_value=10), patch.object(claim_mod, "max_sessions_per_ne", return_value=2):
|
||||
queued = [claim_mod.enqueue_collect(f"x{i}", manual=True)["batch_id"] for i in range(3)]
|
||||
first = claim_mod.claim_queued_batches(10)
|
||||
again = claim_mod.claim_queued_batches(10)
|
||||
self.assertEqual(len(first), 2) # three batches queued for ne-a, only two sessions allowed
|
||||
self.assertEqual(again, [])
|
||||
self.db.expire_all()
|
||||
states = sorted(self.db.get(BizStateBatch, b).status for b in queued)
|
||||
self.assertEqual(states, ["queued", "running", "running"])
|
||||
|
||||
def test_default_session_cap_is_two(self) -> None:
|
||||
self.assertEqual(claim_mod.max_sessions_per_ne(), 2)
|
||||
|
||||
def test_single_task_group_is_a_valid_round_for_a_same_device_cutover(self) -> None:
|
||||
task = self.db.get(BizStateTask, "ta")
|
||||
task.collect_group_id = "solo"
|
||||
self.db.commit()
|
||||
with patch.object(claim_mod, "max_concurrent_tasks", return_value=10):
|
||||
r = claim_mod.enqueue_collect("ta", manual=True)
|
||||
self.assertTrue(r["queued"], r)
|
||||
claimed = claim_mod.claim_queued_batches(10)
|
||||
self.assertEqual([c["task_id"] for c in claimed], ["ta"])
|
||||
|
||||
def test_a_pair_needs_both_sides_before_it_is_claimed(self) -> None:
|
||||
for tid, group in (("ta", "pair"), ("tc", "pair")):
|
||||
self.db.get(BizStateTask, tid).collect_group_id = group
|
||||
self.db.commit()
|
||||
with patch.object(claim_mod, "max_concurrent_tasks", return_value=10):
|
||||
r = claim_mod.enqueue_collect("ta", manual=True)
|
||||
self.assertTrue(r["queued"], r)
|
||||
self.db.expire_all()
|
||||
self.db.query(BizStateBatch).filter(BizStateBatch.task_id == "tc").delete()
|
||||
self.db.commit()
|
||||
self.assertEqual(claim_mod.claim_queued_batches(10), [])
|
||||
|
||||
def test_claim_respects_slot_ceiling(self) -> None:
|
||||
with patch.object(claim_mod, "max_concurrent_tasks", return_value=1):
|
||||
claim_mod.enqueue_collect("ta", manual=True)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue