e2e: switch to bigger topology

Makefile

@@ -27,7 +27,7 @@ test:
 
 e2e: # minindn container
 	sed -i 's/readvertise_nlsr no/readvertise_nlsr yes/g' /usr/local/etc/ndn/nfd.conf.sample
-	python3 e2e/runner.py
+	python3 e2e/runner.py e2e/topo.sprint.conf
 
 coverage:
 	go tool cover -html=coverage.out

e2e/runner.py

@@ -14,9 +14,11 @@ def run(scenario: FunctionType, **kwargs) -> None:
     try:
         random.seed(0)
 
+        info(f"===================================================\n")
         start = time.time()
         scenario(ndn, **kwargs)
         info(f'Scenario completed in: {time.time()-start:.2f}s\n')
+        info(f"===================================================\n\n")
 
         # Call all cleanups without stopping the network
         # This ensures we don't recreate the network for each test

e2e/test_001.py

@@ -43,7 +43,7 @@ def scenario(ndn: Minindn, fw=None, network='/minindn'):
         node.cmd(cmd)
 
     info('Waiting for put to complete\n')
-    time.sleep(3)
+    time.sleep(30)
 
     for node in cat_nodes:
         put_node = random.choice(put_nodes)

e2e/topo.sprint.conf

@@ -0,0 +1,139 @@
+[nodes]
+Stockholm: _ network=/world router=/Stockholm.Router/ position=45.9,36.1,0
+Orlando: _ network=/world router=/Orlando.Router/ position=22.5,-5,0
+PennSkn: _ network=/world router=/PennSkn.Router/ position=-4.5,7.1,0
+Stockton: _ network=/world router=/Stockton.Router/ position=-12.2,-23.3,0
+Phoenix: _ network=/world router=/Phoenix.Router/ position=25.2,-49.5,0
+NewYork: _ network=/world router=/NewYork.Router/ position=-2.8,20.9,0
+Hamburg: _ network=/world router=/Hamburg.Router/ position=39.2,63.8,0
+Tuckerton: _ network=/world router=/Tuckerton.Router/ position=11,29.7,0
+Manasquan: _ network=/world router=/Manasquan.Router/ position=18,29.2,0
+RC: _ network=/world router=/RC.Router/ position=-29.8,-33.8,0
+Amsterdam: _ network=/world router=/Amsterdam.Router/ position=30.6,76.7,0
+Sydney: _ network=/world router=/Sydney.Router/ position=5.8,-50.5,0
+Dublin: _ network=/world router=/Dublin.Router/ position=7.6,60.6,0
+Tacoma: _ network=/world router=/Tacoma.Router/ position=-25.2,-31.7,0
+Singapore: _ network=/world router=/Singapore.Router/ position=-31.1,-55.6,0
+Burbank: _ network=/world router=/Burbank.Router/ position=37.7,-32.4,0
+Atlanta: _ network=/world router=/Atlanta.Router/ position=4.6,3.3,0
+Milan: _ network=/world router=/Milan.Router/ position=58.8,54.8,0
+Richardson: _ network=/world router=/Richardson.Router/ position=22.1,-14,0
+KansasCity: _ network=/world router=/KansasCity.Router/ position=-21.4,-6,0
+Copenhagen: _ network=/world router=/Copenhagen.Router/ position=33,44.1,0
+Boston: _ network=/world router=/Boston.Router/ position=-27,38.5,0
+London: _ network=/world router=/London.Router/ position=21,52.7,0
+Dallas: _ network=/world router=/Dallas.Router/ position=4.1,-10.9,0
+Ashburn: _ network=/world router=/Ashburn.Router/ position=35.1,11.5,0
+Auckland: _ network=/world router=/Auckland.Router/ position=9.6,-65.5,0
+SanJose: _ network=/world router=/SanJose.Router/ position=-1.6,-27.3,0
+Brussels: _ network=/world router=/Brussels.Router/ position=20.1,69.9,0
+Miami: _ network=/world router=/Miami.Router/ position=39.4,-8.3,0
+PaloAlto: _ network=/world router=/PaloAlto.Router/ position=-3.5,-45.8,0
+SprngFld: _ network=/world router=/SprngFld.Router/ position=-16.9,24.1,0
+Hartford: _ network=/world router=/Hartford.Router/ position=-5.8,38.7,0
+Chicago: _ network=/world router=/Chicago.Router/ position=-19.9,0.2,0
+PrlHbr: _ network=/world router=/PrlHbr.Router/ position=5.3,-35.1,0
+WA: _ network=/world router=/WA.Router/ position=31.9,3.3,0
+Frankfurt: _ network=/world router=/Frankfurt.Router/ position=53.7,65.2,0
+Anaheim: _ network=/world router=/Anaheim.Router/ position=20.1,-33.2,0
+Tucson: _ network=/world router=/Tucson.Router/ position=34.7,-43.4,0
+RchDl: _ network=/world router=/RchDl.Router/ position=-24.9,14.2,0
+Reston: _ network=/world router=/Reston.Router/ position=30.6,19.3,0
+IndPls: _ network=/world router=/IndPls.Router/ position=-21.3,19.7,0
+Cheyenne: _ network=/world router=/Cheyenne.Router/ position=-23.8,-19,0
+ClvLand: _ network=/world router=/ClvLand.Router/ position=-37.7,13.1,0
+Seattle: _ network=/world router=/Seattle.Router/ position=-33.9,-16.8,0
+LeesSmt: _ network=/world router=/LeesSmt.Router/ position=-39,-4,0
+LA: _ network=/world router=/LA.Router/ position=19.3,-21.8,0
+Relay: _ network=/world router=/Relay.Router/ position=16,10,0
+Paris: _ network=/world router=/Paris.Router/ position=43.2,55.4,0
+Denver: _ network=/world router=/Denver.Router/ position=-7.4,-19.1,0
+Tokyo: _ network=/world router=/Tokyo.Router/ position=-18.4,-44.4,0
+StLouis: _ network=/world router=/StLouis.Router/ position=-41.7,5.1,0
+HongKong: _ network=/world router=/HongKong.Router/ position=-18.2,-60.9,0
+[switches]
+[links]
+KansasCity:Seattle delay=50ms
+IndPls:NewYork delay=50ms
+SanJose:Stockton delay=50ms
+Anaheim:Dallas delay=50ms
+Anaheim:SanJose delay=50ms
+Chicago:SprngFld delay=50ms
+Chicago:Seattle delay=50ms
+Dallas:Denver delay=50ms
+Amsterdam:Brussels delay=50ms
+KansasCity:PennSkn delay=50ms
+Relay:Tuckerton delay=50ms
+Anaheim:LA delay=50ms
+PennSkn:Stockton delay=50ms
+SanJose:Tacoma delay=50ms
+Chicago:KansasCity delay=50ms
+NewYork:PennSkn delay=50ms
+PennSkn:Relay delay=50ms
+Hartford:NewYork delay=50ms
+KansasCity:LeesSmt delay=50ms
+PaloAlto:SanJose delay=50ms
+Anaheim:PrlHbr delay=50ms
+Chicago:ClvLand delay=50ms
+Milan:Paris delay=50ms
+Copenhagen:Hamburg delay=50ms
+Dallas:PennSkn delay=50ms
+PennSkn:Tuckerton delay=50ms
+Anaheim:Tucson delay=50ms
+Relay:Reston delay=50ms
+Ashburn:Relay delay=50ms
+Dallas:Richardson delay=50ms
+Cheyenne:Denver delay=50ms
+Cheyenne:Tacoma delay=50ms
+Manasquan:NewYork delay=50ms
+Seattle:Tacoma delay=50ms
+London:Paris delay=50ms
+Chicago:StLouis delay=50ms
+SanJose:Sydney delay=50ms
+PennSkn:SprngFld delay=50ms
+NewYork:Relay delay=50ms
+Amsterdam:Hamburg delay=50ms
+Brussels:London delay=50ms
+Atlanta:Relay delay=50ms
+Relay:WA delay=50ms
+PennSkn:RchDl delay=50ms
+SanJose:Tokyo delay=50ms
+Cheyenne:Chicago delay=50ms
+IndPls:RchDl delay=50ms
+NewYork:SprngFld delay=50ms
+Dallas:Orlando delay=50ms
+Atlanta:Chicago delay=50ms
+London:Tuckerton delay=50ms
+Miami:Orlando delay=50ms
+Chicago:RchDl delay=50ms
+Atlanta:NewYork delay=50ms
+Chicago:SanJose delay=50ms
+Stockton:Tokyo delay=50ms
+Singapore:Tokyo delay=50ms
+Chicago:Dallas delay=50ms
+HongKong:Tokyo delay=50ms
+Auckland:Sydney delay=50ms
+Anaheim:Burbank delay=50ms
+Copenhagen:Stockholm delay=50ms
+Copenhagen:London delay=50ms
+Dublin:London delay=50ms
+Dallas:KansasCity delay=50ms
+RC:Stockton delay=50ms
+Atlanta:Orlando delay=50ms
+Chicago:NewYork delay=50ms
+Chicago:Stockton delay=50ms
+Frankfurt:Hamburg delay=50ms
+Manasquan:Tuckerton delay=50ms
+Tacoma:Tokyo delay=50ms
+Frankfurt:Milan delay=50ms
+Chicago:IndPls delay=50ms
+PrlHbr:Stockton delay=50ms
+Atlanta:Dallas delay=50ms
+Anaheim:Phoenix delay=50ms
+Frankfurt:Paris delay=50ms
+Relay:SanJose delay=50ms
+Dallas:LA delay=50ms
+Boston:SprngFld delay=50ms
+Chicago:LeesSmt delay=50ms
+Manasquan:Relay delay=50ms
+Copenhagen:Manasquan delay=50ms