diff --git a/CHANGELOG.md b/CHANGELOG.md index 210bf35..579da0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,9 @@ All notable changes to this project are documented here. The project follows ## [Unreleased] - Barcelona joins the map with Catnip-IX, local transit and peering. -- Community exchanges now include FRIES-IX, Paella-NIX, KleyWrecks, +- More exchanges now include FRIES-IX, Paella-NIX, KleyWrecks, LO-NAPS, JINXED-IX and IX Strayla, plus BB-Kicks in Tokyo and - DE-KICKS New York. FRIES-IX ports and LAG members up to 400G are free. + DE-KICKS New York. FRIES-IX 10G and 100G ports and LAG members are free. ## [1.10.0] — 2026-10-24 diff --git a/site/index.html b/site/index.html index 2024566..01706be 100644 --- a/site/index.html +++ b/site/index.html @@ -849,13 +849,13 @@ NETS.push( const XIX=[ {id:'jnb~2',c:'jnb',name:'JINXED-IX',cheap:.7,take:0.5,core:['drz','akm','cfl','tng'],blurb:'The older Johannesburg exchange, run by the local ISP association. Knock on wood before every maintenance window.'}, {id:'nyc~3',c:'nyc',name:'DE-KICKS New York',cheap:1,take:0.5,core:['drz','akm','cfl','nfx','ggl','amz','msf','cmc'],blurb:'The Frankfurt giant opened a branch in Manhattan. Same switches, worse bagels back home.'}, - {id:'fra~2',c:'fra',name:'KleyWrecks',cheap:.5,take:0.5,core:['drz','akm','cfl','slw','bdc','ydx'],blurb:'The scrappy little exchange down the road from DE-KICKS. Half the price, a tenth of the members, and nobody wears a suit.'}, + {id:'fra~2',c:'fra',name:'KleyWrecks',cheap:.5,take:0.5,core:['drz','akm','cfl','slw','bdc','ydx'],blurb:'A smaller commercial exchange down the road from DE-KICKS. The service comes with a port, without the sales webinar.'}, {id:'fra~3',c:'fra',name:'Apfelwein-IX',cheap:0.3,take:0.3,blurb:'A community exchange run from above a cider bar. Tiny, cheap, and every member gets a glass.'}, {id:'ams~2',c:'ams',name:'NL-Nyx',cheap:0.6,take:0.6,blurb:'One fabric across the whole country. Distributed, cheap and a little smug about it.'}, - {id:'ams~3',c:'ams',name:'FRIES-IX',cheap:1,take:0.5,freeTo:2,core:['drz','akm','cfl','slw','msf'],blurb:'Run by volunteers out of the Science Park. Ports up to 400G are free, sponsored by people who just like peering. Fewer members than HAMS-IX, but the price is hard to beat.'}, + {id:'ams~3',c:'ams',name:'FRIES-IX',cheap:1,take:0.5,freeTo:1,core:['drz','akm','cfl','slw','msf'],blurb:'Settlement-free peering with Frysian roots. The 10G and 100G ports cost nothing. Bring an ASN and an appetite for route servers.'}, {id:'lon~2',c:'lon',name:'LO-NAPS',cheap:.6,take:0.5,core:['drz','akm','cfl','slw','bdc','msf','fbk'],blurb:'Member-owned and not-for-profit. Smaller than LYNX, but the AGM has biscuits.'}, {id:'par~2',c:'par',name:'Baguette-IX',cheap:0.55,take:0.5,blurb:'The challenger. Fresh every morning, a bit crusty by the evening.'}, - {id:'mad~2',c:'mad',name:'Paella-NIX',cheap:.6,take:0.5,core:['drz','akm','cfl','tng','bdc','slw','msf'],blurb:'The original Madrid exchange, around since long before Siesta-IX woke up. Neutral, cheap and run by the local ISPs themselves.'}, + {id:'mad~2',c:'mad',name:'Paella-NIX',cheap:.6,take:0.5,core:['drz','akm','cfl','tng','bdc','slw','msf'],blurb:'The long-established Madrid exchange. Neutral interconnection, local flavour and a route server that never takes a siesta.'}, {id:'mil~2',c:'mil',name:'Aperitivo-IX',cheap:0.5,take:0.45,blurb:'Opens at six, comes with free snacks, closes when the last session drops.'}, {id:'ber~2',c:'ber',name:'Club-Mate-IX',cheap:0.35,take:0.4,blurb:'Run by hackers on caffeine. The route server has a disco ball.'}, {id:'waw~2',c:'waw',name:'Bigos-IX',cheap:0.45,take:0.5,blurb:'Warsaw has more exchanges than anyone can count. This is the second biggest, this week.'}, diff --git a/tests/peering.test.js b/tests/peering.test.js index 72e785a..7e59ac6 100644 --- a/tests/peering.test.js +++ b/tests/peering.test.js @@ -114,21 +114,22 @@ test('DE-KICKS hides prices, haggles, harmonises upwards, auto-enrolls add-ons a assert.deepEqual(errors, []); }); -test('Amsterdam has FRIES-IX, with free ports up to 400G', () => { +test('Amsterdam has FRIES-IX, with free 10G and 100G ports and paid larger ports', () => { const { ev, errors } = load(); setup(ev); assert.deepEqual(JSON.parse(ev("JSON.stringify(ixIdsIn('ams'))")), ['ams', 'ams~2', 'ams~3']); ev("ACT.buildPop({city:'ams'});S.pops.ams.rgen=RG.length-1;compute()"); const cash = () => ev('S.cash'); let c0 = cash(); - ev("ACT.buyIx({city:'ams~3',tier:2})"); - assert.equal(ev("S.ixp['ams~3']"), 2); - assert.equal(cash(), c0, '400G port is free'); + assert.equal(ev("ixPortMo('ams~3',0)"), 0, '10G port is free'); + ev("ACT.buyIx({city:'ams~3',tier:1})"); + assert.equal(ev("S.ixp['ams~3']"), 1); + assert.equal(cash(), c0, '100G port is free'); assert.equal(ev("S.ixp.ams"), undefined, 'HAMS-IX is separate'); c0 = cash(); ev("ACT.lagIx({city:'ams~3',d:1})"); assert.equal(cash(), c0, 'LAG members are free too'); - assert.equal(ev("ixPortMo('ams~3',3)"), ev("Math.round(PORT[3].ix*ixMul('ams~3'))"), '800G costs the usual price'); + assert.equal(ev("ixPortMo('ams~3',2)"), ev("Math.round(PORT[2].ix*ixMul('ams~3'))"), '400G is a paid game tier'); ev("ACT.buyIx({city:'ams',tier:1});ACT.rs({city:'ams~3'});compute()"); assert.ok(ev("ixSessions('ams~3').has('drz')")); assert.equal(ev("ixSessions('ams~3').has('ggl')"), false, 'Goggle is not a member'); @@ -139,12 +140,17 @@ test('Amsterdam has FRIES-IX, with free ports up to 400G', () => { assert.match(txt, /FRIES-IX/); assert.match(txt, /HAMS-IX/); assert.match(ev("ixBlock('ams~3',true)"), /LAG member free/); ev("save();restored=migrate(JSON.parse(localStorage.getItem('sot-save-v1')));"); - assert.equal(ev("restored.ixp['ams~3']"), 2, 'free port survives save migration'); + assert.equal(ev("restored.ixp['ams~3']"), 1, 'free port survives save migration'); assert.equal(ev("restored.ixn['ams~3']"), 2, 'free LAG survives save migration'); ev("S.ev.ixdown={'ams~3':S.day+2};compute()"); assert.equal(ev("R.useIx['ams~3']"), undefined, 'a FRIES-IX outage drops only that fabric'); assert.notEqual(ev("R.useIx.ams"), undefined); ev("S.ev.ixdown={};compute()"); + c0 = cash(); + ev("ACT.buyIx({city:'ams~3',tier:2})"); + assert.equal(ev("S.ixp['ams~3']"), 2); + assert.equal(c0 - cash(), ev("2*ixPortMo('ams~3',2)"), 'upgrading bills both LAG members'); + assert.equal(ev("R.cost.ix"), ev("ixPortMo('ams',1)+2*ixPortMo('ams~3',2)"), 'larger ports also have a recurring charge'); ev("ACT.cancelIx({city:'ams~3'});ACT.cancelIx({city:'ams~3'})"); assert.equal(ev("S.ixp['ams~3']"), undefined); assert.equal(ev("S.ixp.ams"), 1, 'leaving FRIES-IX keeps the HAMS-IX port');