diff --git a/backend/src/services/vrf-production-transition.ts b/backend/src/services/vrf-production-transition.ts index 9face017..eafa7479 100644 --- a/backend/src/services/vrf-production-transition.ts +++ b/backend/src/services/vrf-production-transition.ts @@ -394,10 +394,10 @@ export function classifyVrfProductionTransition(input: VrfProductionTransitionIn const successor = successors[0], oldRoute = route(before, source) if (!successor) { if (request.action === "delete" && source.ll) { - settling(() => changes.includes(source.member) && noMacGre(before, source.member) && noMacGre(after, source.member), () => withVrfTransitionSection("LL-comparison", () => deletedBridgeLinkLocal(before, after, old!, source, oldRoute, beforeSources, afterSources))) + settling(() => changes.includes(source.member), () => withVrfTransitionSection("LL-comparison", () => deletedBridgeLinkLocal(before, after, old!, source, oldRoute, beforeSources, afterSources))) explain(source.resource, source.row, undefined); explain(routeResource(source), oldRoute, undefined); continue } - settling(() => source.ll && noMacGre(before, source.member) && noMacGre(after, source.member), () => must(source.ll && transfer && current!.interfaces === source.member && oldContext.get(source.member) === "main", "address/route absence outside exact acquisition")) + settling(() => source.ll && changes.includes(source.member), () => must(source.ll && transfer && current!.interfaces === source.member && oldContext.get(source.member) === "main", "address/route absence outside exact acquisition")) absences.push({ address: structuredClone(source.row), route: structuredClone(oldRoute), member: source.member }); explain(source.resource, source.row, undefined); explain(routeResource(source), oldRoute, undefined); continue } usedAfter.add(successor) @@ -407,7 +407,7 @@ export function classifyVrfProductionTransition(input: VrfProductionTransitionIn withVrfTransitionSection("LL-comparison", () => same(source.resource, source.row, successor.row, moved && concreteNoMacGre ? [".id", "vrf"] : [".id"])) } else { must(source.row[".id"] === successor.row[".id"], "static address identity changed"); same(source.resource, source.row, successor.row, ["vrf"]) } - const newRoute = settling(() => moved && noMacGre(before, source.member) && noMacGre(after, source.member) && !after.catalogs[routeResource(successor)].some(row => routeFor(row, successor, after.catalogs.vrf)), () => route(after, successor)) + const newRoute = settling(() => moved && !after.catalogs[routeResource(successor)].some(row => routeFor(row, successor, after.catalogs.vrf)), () => route(after, successor)) must(Object.hasOwn(oldRoute, "local-address") === Object.hasOwn(newRoute, "local-address"), "connected route local-address shape changed") const ownedDelete = request.action === "delete" && oldContext.get(source.member) === old!.name withVrfTransitionSection("connected-route", () => same(routeResource(source), oldRoute, newRoute, moved ? [".id", "gateway", "immediate-gw", "routing-table", "local-address"] : transfer || ownedDelete ? [".id"] : [])) @@ -422,7 +422,7 @@ export function classifyVrfProductionTransition(input: VrfProductionTransitionIn same(routeResource(successor), missing[0].route, nextRoute, [".id", "gateway", "immediate-gw", "routing-table", "local-address"]) explain(successor.resource, undefined, successor.row); explain(routeResource(successor), undefined, nextRoute) } - for (const missing of history?.absentLl ?? []) if (!afterSources.some(source => source.member === missing.member && source.ll)) { settling(() => noMacGre(before, missing.member) && noMacGre(after, missing.member), () => must(request.action !== "delete", "DELETE missing expected LL revival")); absences.push(structuredClone(missing)) } + for (const missing of history?.absentLl ?? []) if (!afterSources.some(source => source.member === missing.member && source.ll)) { settling(() => changes.includes(missing.member), () => must(request.action !== "delete", "DELETE missing expected LL revival")); absences.push(structuredClone(missing)) } let active: Row | undefined, dormant: Row | undefined withVrfTransitionSection("virtual", () => { for (const resource of ["routing_table", "interface_inventory"]) {