Add bulk PNI ordering across networks and POPs
Add two actions to the NOC Traffic tab: - Order PNIs with one network at every shared POP. - Order PNIs with all eligible networks at every shared POP, including long-tail peers. Both actions offer a selectable port size and preview new connections, upgrades, total setup costs, additional monthly charges and blocked sites. Upgrade smaller PNIs while preserving larger connections, pending orders and existing LAG members. Reserve router capacity across the batch and account for pending speed and LAG augments to avoid overbooking ports. Require the full setup budget before placing any orders. Reuse normal peering policies, minimum port sizes and provisioning delays, then recompute and save once for the entire batch. Keep large global previews compact with collapsible network and blocked-connection lists. Translate the new UI into all five supported languages and add tests for single-network and global ordering, capacity, budgets, repeated clicks, save migration, and mobile keyboard interaction. Validation: - Build and translation checks pass. - 308 of 309 tests pass. The existing subsea reach test also fails on origin/main because the Windows locale uses a dot as the thousands separator where the assertion expects a comma. - Chromium desktop and phone checks pass with the supplied save. - Big-network benchmark against origin/main: dashboard tabs take 16.8 -> 17.6 ms on desktop and 77.1 -> 80.7 ms on a simulated phone (median of 15 runs). Routing results are identical, with no slowdowns beyond the benchmark's noise threshold.
This commit is contained in:
parent
ad94833ad1
commit
4932b3f93a
12 changed files with 442 additions and 7 deletions
155
tests/pni-all.test.js
Normal file
155
tests/pni-all.test.js
Normal file
|
|
@ -0,0 +1,155 @@
|
|||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const { load } = require('./harness');
|
||||
|
||||
function setup(ev, cities = []) {
|
||||
ev("ACT.start({});S.cash=1e8;for(const g of GOALS)S.done[g.id]=0");
|
||||
for (const city of cities) ev(`ACT.buildPop({city:'${city}'})`);
|
||||
ev('for(const p of Object.values(S.pops))p.rgen=RG.length-1;compute()');
|
||||
}
|
||||
|
||||
test('bulk PNIs add missing shared POPs and upgrade smaller ports once, preserving existing orders and LAGs', () => {
|
||||
const { dom, ev, errors } = load();
|
||||
setup(ev, ['ams', 'lon', 'par', 'nyc', 'sjc', 'sao']);
|
||||
ev(`S.pni.push(
|
||||
{id:'small',net:'drz',city:'fra',tier:0,n:2,site:'ab',pref:'high'},
|
||||
{id:'big',net:'drz',city:'ams',tier:2},
|
||||
{id:'equal',net:'drz',city:'lon',tier:1},
|
||||
{id:'pending',net:'drz',city:'par',tier:0,ready:S.day+20},
|
||||
{id:'augment',net:'drz',city:'nyc',tier:0,up:{tier:1,n:1,ready:S.day+20}});compute()`);
|
||||
const before = ev('JSON.stringify(S)');
|
||||
assert.deepEqual(JSON.parse(ev("JSON.stringify((b=>({shared:b.shared.length,orders:b.orders.length,kept:b.kept,cost:b.cost,mo:b.mo}))(pniBatch('drz',1)))")),
|
||||
{ shared: 6, orders: 2, kept: 4, cost: 6750, mo: 650 });
|
||||
assert.equal(ev('JSON.stringify(S)'), before, 'preview does not change the save');
|
||||
const cash = ev('S.cash');
|
||||
const existing = JSON.parse(ev("JSON.stringify(S.pni.filter(p=>p.id!=='small'))"));
|
||||
ev("const originalAfter=after;window.after=()=>{window.afterCount=(window.afterCount||0)+1;originalAfter()};ACT.pniAll({net:'drz',tier:1})");
|
||||
assert.equal(ev('window.afterCount'), 1, 'one recompute/render/save for the whole batch');
|
||||
assert.equal(ev('S.cash'), cash - 6750);
|
||||
assert.equal(ev('S.pni.length'), 6);
|
||||
assert.equal(ev("S.pni.filter(p=>p.city==='sao'||p.city==='tok').length"), 0, 'only shared owned POPs');
|
||||
assert.deepEqual(JSON.parse(ev("JSON.stringify(S.pni.filter(p=>['big','equal','pending','augment'].includes(p.id)))")), existing);
|
||||
assert.equal(ev("S.pni.find(p=>p.id==='small').up.n"), 2);
|
||||
assert.equal(ev("S.pni.find(p=>p.id==='small').site"), 'ab');
|
||||
assert.equal(ev("S.pni.find(p=>p.id==='small').pref"), 'high');
|
||||
assert.ok(ev("S.pni.find(p=>p.city==='sjc').ready>S.day"), 'new PNIs still take time');
|
||||
ev("ACT.pniAll({net:'drz',tier:1})");
|
||||
assert.equal(ev('S.cash'), cash - 6750, 'repeat clicks neither charge nor duplicate');
|
||||
assert.equal(ev('window.afterCount'), 1);
|
||||
ev('S=migrate(JSON.parse(JSON.stringify(packSave(S))));S.day=Math.max(...S.pni.map(p=>p.up?p.up.ready:p.ready||0));pniDay(S.day);compute()');
|
||||
assert.equal(ev("S.pni.find(p=>p.id==='small').tier"), 1, 'augment survives save migration and delivers');
|
||||
assert.equal(ev("S.pni.find(p=>p.city==='sjc').tier"), 1);
|
||||
assert.deepEqual(errors, []);
|
||||
dom.window.close();
|
||||
});
|
||||
|
||||
test('bulk PNIs skip router speed, port capacity and policy restrictions with city-specific reasons', () => {
|
||||
const { dom, ev, errors } = load();
|
||||
setup(ev, ['ams', 'lon', 'ash']);
|
||||
ev(`S.pops.fra.rgen=0;S.pops.ams.rgen=1;
|
||||
S.caches=Array.from({length:portsMax('ams')},()=>({id:uid(),city:'ams',net:'cfl'}));
|
||||
while(['ams','lon'].some(c=>snub('msf',c)?.all))S.asn++;
|
||||
compute();R.demTo.msf=1e4;ACT.pniAllOpen({net:'msf'});ACT.pniAllSize({v:'2'})`);
|
||||
assert.equal(ev("pniBatch('msf',2).orders.length"), 1);
|
||||
assert.equal(ev("pniBatch('msf',2).blocked.length"), 3);
|
||||
const text = dom.window.document.getElementById('modalCard').textContent;
|
||||
assert.match(text, /Frankfurt.*router can't take a 400G/s);
|
||||
assert.match(text, /Amsterdam.*No free router ports/s);
|
||||
assert.match(text, /Ashburn.*capacity|Ashburn.*sold out/s);
|
||||
const cash = ev('S.cash');
|
||||
ev("ACT.pniAll({net:'msf',tier:2})");
|
||||
assert.equal(ev('S.pni.length'), 1);
|
||||
assert.equal(ev('S.pni[0].city'), 'lon');
|
||||
assert.equal(ev('S.cash'), cash - 3500);
|
||||
assert.match(ev("S.log[0].t"), /blocked: 3/);
|
||||
assert.deepEqual(errors, []);
|
||||
dom.window.close();
|
||||
});
|
||||
|
||||
test('insufficient funds refuse the entire eligible batch and execution rechecks a stale preview', () => {
|
||||
const { dom, ev, errors } = load();
|
||||
setup(ev, ['ams']);
|
||||
ev("S.cash=pniBatch('drz',1).cost-1;ACT.pniAllOpen({net:'drz'})");
|
||||
assert.equal(dom.window.document.querySelector('#modalCard [data-act="pniAll"]').disabled, true);
|
||||
const cash = ev('S.cash');
|
||||
ev("ACT.pniAll({net:'drz',tier:1})");
|
||||
assert.equal(ev('S.cash'), cash);
|
||||
assert.equal(ev('S.pni.length'), 0);
|
||||
ev("S.cash=1e8;ACT.pniAllOpen({net:'drz'});delete S.pops.ams;S.pops.fra.rgen=0;ACT.pniAll({net:'drz',tier:2})");
|
||||
assert.equal(ev('S.cash'), 1e8);
|
||||
assert.equal(ev('S.pni.length'), 0, 'deleted POPs and unsupported speeds are rechecked on click');
|
||||
assert.deepEqual(errors, []);
|
||||
dom.window.close();
|
||||
});
|
||||
|
||||
test('bulk PNI actions reject invalid networks, sizes, minimum ports, traffic thresholds and non-shared locations', () => {
|
||||
const { dom, ev, errors } = load();
|
||||
setup(ev);
|
||||
ev('S.pops.fra.rgen=0');
|
||||
const cash = ev('S.cash');
|
||||
for (const net of ['missing', '__proto__', 'drz', 'nfx']) {
|
||||
for (const tier of [-2, -1, 0.5, 99, NaN, Infinity]) ev(`ACT.pniAll({net:'${net}',tier:${tier}})`);
|
||||
}
|
||||
ev("ACT.pniAll({net:'nfx',tier:0});R.demTo.nfx=0;ACT.pniAll({net:'nfx',tier:1})");
|
||||
assert.equal(ev('S.pni.length'), 0);
|
||||
assert.equal(ev('S.cash'), cash);
|
||||
ev("delete S.pops.fra;ACT.pniAllOpen({net:'drz'});ACT.pniAll({net:'drz',tier:1})");
|
||||
assert.match(dom.window.document.getElementById('modalCard').textContent, /no POPs in common/);
|
||||
assert.equal(dom.window.document.querySelector('#modalCard [data-act="pniAll"]').disabled, true);
|
||||
assert.deepEqual(errors, []);
|
||||
dom.window.close();
|
||||
});
|
||||
|
||||
test('Doitsche 1G bulk orders and 10G augments keep paid-peering fees and conference delivery rules', () => {
|
||||
const { dom, ev, errors } = load();
|
||||
setup(ev, ['ams']);
|
||||
ev("S.conf={until:S.day+10,reg:'EU'};Math.random=()=>0.5");
|
||||
const cash = ev('S.cash');
|
||||
assert.equal(ev("pniBatch('dtk',-1).cost"), 2400);
|
||||
assert.equal(ev("pniBatch('dtk',-1).mo"), ev('2*(PORT[0].pni/2+NET.dtk.paidFee)'));
|
||||
ev("ACT.pniAll({net:'dtk',tier:-1})");
|
||||
assert.equal(ev('S.cash'), cash - 2400);
|
||||
assert.equal(ev('S.stats.beerPni'), 1);
|
||||
assert.equal(ev('S.pni.every(p=>p.g1&&pniG(p)===1&&p.ready===S.day+15)'), true);
|
||||
ev('S.day+=15;pniDay(S.day);compute()');
|
||||
assert.equal(ev("pniBatch('dtk',0).mo"), 200, 'upgrades add port costs, without charging the peering fee twice');
|
||||
ev("ACT.pniAll({net:'dtk',tier:0});S.day=Math.max(...S.pni.map(p=>p.up.ready));pniDay(S.day)");
|
||||
assert.equal(ev('S.pni.every(p=>!p.g1&&pniG(p)===10)'), true);
|
||||
assert.deepEqual(errors, []);
|
||||
dom.window.close();
|
||||
});
|
||||
|
||||
test('Traffic row buttons and size selection work by DOM events on phones in every language', () => {
|
||||
for (const lang of ['en', 'it', 'pt', 'fr', 'es']) {
|
||||
const { dom, ev, errors } = load(lang === 'en' ? {} : { lang });
|
||||
setup(ev);
|
||||
dom.window.innerWidth = 360;
|
||||
ev("ACT.launchBB({city:'fra'});ACT.dash();ACT.dashTab({k:'traffic'})");
|
||||
const doc = dom.window.document;
|
||||
const buttons = [...doc.querySelectorAll('#dashCard [data-act="pniAllOpen"]')];
|
||||
assert.ok(buttons.length > 0, lang);
|
||||
assert.equal(buttons.some(b => JSON.parse(b.dataset.args).net === '_tail'), false);
|
||||
const cash = ev('S.cash');
|
||||
buttons.find(b => JSON.parse(b.dataset.args).net === 'cfl').click();
|
||||
assert.equal(doc.getElementById('modal').hidden, false, lang);
|
||||
let select = doc.querySelector('#modalCard select');
|
||||
assert.equal(select.closest('label').textContent.includes(ev("tr('pni_all.pni_size')")), true, lang);
|
||||
select.focus();
|
||||
select.value = '0';
|
||||
select.dispatchEvent(new dom.window.Event('change', { bubbles: true }));
|
||||
select = doc.querySelector('#modalCard select');
|
||||
assert.equal(select.value, '0', lang);
|
||||
assert.equal(doc.activeElement, select, 'size changes preserve keyboard focus');
|
||||
const submit = doc.querySelector('#modalCard [data-act="pniAll"]');
|
||||
assert.equal(JSON.parse(submit.dataset.args).tier, 0, lang);
|
||||
assert.equal(submit.disabled, false, lang);
|
||||
assert.equal(ev('S.cash'), cash, 'opening or changing the preview spends nothing');
|
||||
submit.click();
|
||||
assert.equal(doc.getElementById('modal').hidden, true, lang);
|
||||
assert.equal(ev("S.pni.some(p=>p.net==='cfl'&&p.city==='fra'&&p.tier===0)"), true, lang);
|
||||
assert.equal(ev('S.cash'), cash - 1750, lang);
|
||||
assert.doesNotMatch(doc.getElementById('modalCard').textContent, /pni_all\./, lang);
|
||||
assert.deepEqual(errors, [], lang);
|
||||
dom.window.close();
|
||||
}
|
||||
});
|
||||
135
tests/pni-global.test.js
Normal file
135
tests/pni-global.test.js
Normal file
|
|
@ -0,0 +1,135 @@
|
|||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const { load } = require('./harness');
|
||||
|
||||
function setup(ev) {
|
||||
ev("ACT.start({});S.cash=1e8;for(const g of GOALS)S.done[g.id]=0;S.pops.fra.rgen=RG.length-1;compute()");
|
||||
}
|
||||
|
||||
test('global PNIs cover every eligible network and shared POP, including the long tail, in one transaction', () => {
|
||||
const { dom, ev, errors } = load();
|
||||
setup(ev);
|
||||
ev(`ACT.buildPop({city:'ams'});S.pops.ams.rgen=RG.length-1;
|
||||
S.pni.push({id:'small',net:'cfl',city:'fra',tier:0,n:2,site:'ab',pref:'high'},
|
||||
{id:'big',net:'drz',city:'ams',tier:2},
|
||||
{id:'pending',net:'nfx',city:'fra',tier:1,ready:S.day+30});
|
||||
compute();for(const n of NETS)R.demTo[n.id]=1e4`);
|
||||
const before = ev('JSON.stringify(S)');
|
||||
const batch = JSON.parse(ev('JSON.stringify(pniBatch(null,1))'));
|
||||
assert.equal(ev('JSON.stringify(S)'), before, 'global preview changes no game state');
|
||||
assert.ok(batch.orders.some(q => q.net === 'cfl' && q.city === 'fra' && q.ex));
|
||||
assert.ok(batch.orders.some(q => q.net === 'cfl' && q.city === 'ams' && !q.ex));
|
||||
assert.ok(batch.orders.some(q => ev(`NET['${q.net}'].tail`)), 'small networks are included');
|
||||
assert.equal(batch.orders.some(q => q.net === 'drz' && q.city === 'ams'), false, 'no downgrade');
|
||||
assert.equal(batch.orders.some(q => q.net === 'nfx' && q.city === 'fra'), false, 'keep pending orders');
|
||||
const cash = ev('S.cash');
|
||||
ev("const originalAfter=after;window.after=()=>{window.afterCount=(window.afterCount||0)+1;originalAfter()};ACT.pniAll({net:null,tier:1})");
|
||||
assert.equal(ev('window.afterCount'), 1);
|
||||
assert.equal(ev('S.cash'), cash - batch.cost);
|
||||
assert.equal(ev('S.pni.length'), 3 + batch.orders.filter(q => !q.ex).length);
|
||||
assert.equal(ev('new Set(S.pni.map(p=>p.net+"@"+p.city)).size'), ev('S.pni.length'));
|
||||
assert.equal(ev("S.pni.every(p=>S.pops[p.city]&&NET[p.net].pops.includes(p.city))"), true);
|
||||
assert.equal(ev("S.pni.find(p=>p.id==='small').up.n"), 2, 'LAG members stay together');
|
||||
assert.equal(ev("S.pni.find(p=>p.id==='small').pref"), 'high');
|
||||
assert.equal(ev("S.pni.find(p=>p.id==='big').tier"), 2);
|
||||
assert.equal(ev('Object.keys(S.pops).every(c=>portsUsed(c)<=portsMax(c))'), true);
|
||||
ev('S=migrate(JSON.parse(JSON.stringify(packSave(S))));compute()');
|
||||
assert.equal(ev('S.pni.length'), 3 + batch.orders.filter(q => !q.ex).length);
|
||||
assert.equal(ev("S.pni.find(p=>p.id==='small').up.tier"), 1);
|
||||
const count = ev('S.pni.length');
|
||||
ev('ACT.pniAll({net:null,tier:1})');
|
||||
assert.equal(ev('S.cash'), cash - batch.cost, 'repeat clicks spend nothing');
|
||||
assert.equal(ev('S.pni.length'), count);
|
||||
assert.deepEqual(errors, []);
|
||||
dom.window.close();
|
||||
});
|
||||
|
||||
test('global PNIs share the available router ports, including four 10G breakouts per slot', () => {
|
||||
for (const [tier, count] of [[1, 1], [0, 4]]) {
|
||||
const { dom, ev, errors } = load();
|
||||
setup(ev);
|
||||
ev("S.pops.fra.rgen=0;S.caches=Array.from({length:7},()=>({id:uid(),city:'fra',net:'cfl'}));compute()");
|
||||
assert.equal(ev(`pniBatch(null,${tier}).orders.length`), count);
|
||||
assert.ok(ev(`pniBatch(null,${tier}).blocked.some(q=>/No free router ports/.test(q.why))`));
|
||||
ev(`ACT.pniAll({net:null,tier:${tier}})`);
|
||||
assert.equal(ev('S.pni.length'), count);
|
||||
assert.equal(ev("portsUsed('fra')"), 8);
|
||||
const cash = ev('S.cash');
|
||||
ev(`ACT.pniAll({net:null,tier:${tier}})`);
|
||||
assert.equal(ev('S.cash'), cash);
|
||||
assert.deepEqual(errors, []);
|
||||
dom.window.close();
|
||||
}
|
||||
});
|
||||
|
||||
test('global planning reserves ports for pending speed and LAG augments without mutating the save', () => {
|
||||
for (const [tier, n] of [[1, 1], [0, 4]]) {
|
||||
const { dom, ev, errors } = load();
|
||||
setup(ev);
|
||||
ev(`S.pops.fra.rgen=0;S.caches=Array.from({length:7},()=>({id:uid(),city:'fra',net:'cfl'}));
|
||||
S.pni=[{id:'pending',city:'fra',net:'cfl',tier:0,n:1,up:{tier:${tier},n:${n},ready:S.day+30}}];compute()`);
|
||||
const state = ev('JSON.stringify(S)');
|
||||
assert.equal(ev('pniBatch(null,0).orders.length'), 0);
|
||||
assert.equal(ev('pniBatch(null,1).orders.length'), 0);
|
||||
assert.equal(ev('JSON.stringify(S)'), state);
|
||||
const cash = ev('S.cash');
|
||||
ev('ACT.pniAll({net:null,tier:1})');
|
||||
assert.equal(ev('S.pni.length'), 1);
|
||||
assert.equal(ev('S.cash'), cash);
|
||||
assert.deepEqual(errors, []);
|
||||
dom.window.close();
|
||||
}
|
||||
});
|
||||
|
||||
test('global PNIs require the full budget and reject unsupported sizes and an empty POP list', () => {
|
||||
const { dom, ev, errors } = load();
|
||||
setup(ev);
|
||||
ev('S.cash=pniBatch(null,1).cost-1;ACT.pniAllOpen({net:null})');
|
||||
const cash = ev('S.cash');
|
||||
assert.equal(dom.window.document.querySelector('#modalCard [data-act="pniAll"]').disabled, true);
|
||||
ev('ACT.pniAll({net:null,tier:1})');
|
||||
assert.equal(ev('S.cash'), cash);
|
||||
assert.equal(ev('S.pni.length'), 0, 'no partial purchase');
|
||||
for (const tier of [-2, -1, 0.5, 99, NaN, Infinity]) ev(`ACT.pniAll({net:null,tier:${tier}})`);
|
||||
ev('ACT.pniAll({tier:1});S.pops={};ACT.pniAllOpen({net:null})');
|
||||
assert.equal(ev('S.cash'), cash);
|
||||
assert.equal(ev('S.pni.length'), 0);
|
||||
assert.match(dom.window.document.getElementById('modalCard').textContent, /No shared POPs/);
|
||||
assert.equal(dom.window.document.querySelector('#modalCard [data-act="pniAll"]').disabled, true);
|
||||
assert.deepEqual(errors, []);
|
||||
dom.window.close();
|
||||
});
|
||||
|
||||
test('the global Traffic button preserves scope, keyboard focus and translations on phones', () => {
|
||||
for (const lang of ['en', 'it', 'pt', 'fr', 'es']) {
|
||||
const { dom, ev, errors } = load(lang === 'en' ? {} : { lang });
|
||||
setup(ev);
|
||||
dom.window.innerWidth = 360;
|
||||
ev("ACT.dash();ACT.dashTab({k:'traffic'})");
|
||||
const doc = dom.window.document;
|
||||
const button = [...doc.querySelectorAll('#dashCard [data-act="pniAllOpen"]')].find(b => JSON.parse(b.dataset.args).net === null);
|
||||
assert.ok(button, lang);
|
||||
button.click();
|
||||
assert.equal(doc.querySelector('#modalCard h2').textContent, ev("tr('pni_all.peer_all_networks')"), lang);
|
||||
const cash = ev('S.cash');
|
||||
const select = doc.querySelector('#modalCard select');
|
||||
assert.equal([...select.options].some(o => o.value === '-1'), false, '1G is not available for all networks');
|
||||
select.focus();
|
||||
select.value = '0';
|
||||
select.dispatchEvent(new dom.window.Event('change', { bubbles: true }));
|
||||
assert.equal(doc.activeElement, doc.querySelector('#modalCard select'));
|
||||
const submit = doc.querySelector('#modalCard [data-act="pniAll"]');
|
||||
assert.deepEqual(JSON.parse(submit.dataset.args), { net: null, tier: 0 }, lang);
|
||||
assert.equal(submit.disabled, false, lang);
|
||||
assert.ok(doc.querySelectorAll('#modalCard details').length > 0, 'long lists are collapsed');
|
||||
assert.equal(ev('S.cash'), cash, 'preview does not buy anything');
|
||||
assert.doesNotMatch(doc.getElementById('modalCard').textContent, /pni_all\./, lang);
|
||||
const cost = ev('pniBatch(null,0).cost');
|
||||
submit.click();
|
||||
assert.equal(doc.getElementById('modal').hidden, true, lang);
|
||||
assert.equal(ev('S.cash'), cash - cost, lang);
|
||||
assert.ok(ev('new Set(S.pni.map(p=>p.net)).size') > 1, lang);
|
||||
assert.deepEqual(errors, [], lang);
|
||||
dom.window.close();
|
||||
}
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue