From ba9064d0b263a5482bbb35a23dc952c09174c466 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Fri, 17 May 2024 10:22:31 -0700 Subject: [PATCH] Update new topology --- host_vars/AFA | 10 +++++----- host_vars/ANYANG | 16 +++++++++------- host_vars/ARIZONA | 12 +++++------- host_vars/AVEIRO | 12 ++++++------ host_vars/BERN | 10 +++++++--- host_vars/DELFT | 12 ++++++------ host_vars/FRANKFURT | 16 +++++++++++++++- host_vars/IIITH | 14 ++++++++------ host_vars/MEMPHIS | 16 ++++++---------- host_vars/MINHO | 8 +++++--- host_vars/MML1 | 16 ++++++++++++---- host_vars/MML2 | 10 +++++++--- host_vars/NEU | 12 +++++++----- host_vars/OSAKA | 16 +++++++++------- host_vars/QUB | 14 +++++++------- host_vars/SAVI | 8 +++++--- host_vars/SINGAPORE | 14 ++++++++++++-- host_vars/SRRU | 12 +++++++----- host_vars/TNO | 6 ++++-- host_vars/TORONTO | 14 +++++++++++++- host_vars/UCLA | 26 ++++++++++++++------------ host_vars/UFBA | 8 +++++--- host_vars/URJC | 18 ++++++++++++------ host_vars/WASEDA | 12 +++++++----- host_vars/WU | 28 +++++++++------------------- 25 files changed, 202 insertions(+), 138 deletions(-) diff --git a/host_vars/AFA b/host_vars/AFA index 217c3ea..2580065 100644 --- a/host_vars/AFA +++ b/host_vars/AFA @@ -18,12 +18,12 @@ router_name: ndn http_access: https memsize: 4 neighbors: - AVEIRO: - link_cost: 45 - IIITH: - link_cost: 72 + FRANKFURT: + link_cost: 28 + TNO: + link_cost: 37 BERN: - link_cost: 15 + link_cost: 28 position: - 42.1 - 14.5 diff --git a/host_vars/ANYANG b/host_vars/ANYANG index 65f137f..0987023 100644 --- a/host_vars/ANYANG +++ b/host_vars/ANYANG @@ -18,14 +18,16 @@ router_name: anyanghub http_access: http memsize: 48 neighbors: - SRRU: - link_cost: 57 - OSAKA: - link_cost: 36 + ARIZONA: + link_cost: 234 WASEDA: - link_cost: 40 - UCLA: - link_cost: 100 + link_cost: 89 + OSAKA: + link_cost: 98 + IIITH: + link_cost: 116 + SRRU: + link_cost: 140 position: - 37.7 - 127.0 diff --git a/host_vars/ARIZONA b/host_vars/ARIZONA index 304a32a..3cdf5eb 100644 --- a/host_vars/ARIZONA +++ b/host_vars/ARIZONA @@ -22,15 +22,13 @@ http_access: https memsize: 8 neighbors: UCLA: - link_cost: 25 + link_cost: 12 MEMPHIS: - link_cost: 17 + link_cost: 41 WU: - link_cost: 33 - WASEDA: - link_cost: 75 - OSAKA: - link_cost: 100 + link_cost: 50 + ANYANG: + link_cost: 234 position: - 32.2289614 - -110.9483226 diff --git a/host_vars/AVEIRO b/host_vars/AVEIRO index bb30932..8309148 100644 --- a/host_vars/AVEIRO +++ b/host_vars/AVEIRO @@ -20,14 +20,14 @@ router_name: selficn http_access: https memsize: 4 neighbors: - WU: - link_cost: 75 + FRANKFURT: + link_cost: 44 URJC: - link_cost: 15 + link_cost: 30 MINHO: - link_cost: 2 - AFA: - link_cost: 45 + link_cost: 3 + NEU: + link_cost: 108 position: - 40.6 - -9.0 diff --git a/host_vars/BERN b/host_vars/BERN index fcc74a8..efc68ae 100644 --- a/host_vars/BERN +++ b/host_vars/BERN @@ -18,10 +18,14 @@ router_name: ndn-1 http_access: http memsize: 2 neighbors: - WU: - link_cost: 60 + URJC: + link_cost: 30 + QUB: + link_cost: 39 + MML2: + link_cost: 42 AFA: - link_cost: 15 + link_cost: 28 position: - 46.8 - 8.5836 diff --git a/host_vars/DELFT b/host_vars/DELFT index 3071cfc..fbf18ee 100644 --- a/host_vars/DELFT +++ b/host_vars/DELFT @@ -18,14 +18,14 @@ router_name: ndn-testbed http_access: https memsize: 4 neighbors: + FRANKFURT: + link_cost: 9 TNO: link_cost: 2 - QUB: - link_cost: 15 - WU: - link_cost: 60 - MML2: - link_cost: 26 + MEMPHIS: + link_cost: 119 + OSAKA: + link_cost: 234 position: - 52.0 - 4.4 diff --git a/host_vars/FRANKFURT b/host_vars/FRANKFURT index 9dbb704..59f2e00 100644 --- a/host_vars/FRANKFURT +++ b/host_vars/FRANKFURT @@ -18,7 +18,21 @@ http_access: https memsize: 8 neighbors: UCLA: - link_cost: 100 + link_cost: 149 + TORONTO: + link_cost: 107 + URJC: + link_cost: 36 + MML1: + link_cost: 50 + AVEIRO: + link_cost: 44 + DELFT: + link_cost: 9 + AFA: + link_cost: 28 + SINGAPORE: + link_cost: 178 position: - 50.1187 - 8.6842 diff --git a/host_vars/IIITH b/host_vars/IIITH index 6234272..a2eb83c 100644 --- a/host_vars/IIITH +++ b/host_vars/IIITH @@ -18,12 +18,14 @@ router_name: ndntestbed http_access: http memsize: 2 neighbors: - URJC: - link_cost: 90 - WU: - link_cost: 122 - AFA: - link_cost: 72 + MML1: + link_cost: 191 + SINGAPORE: + link_cost: 214 + ANYANG: + link_cost: 116 + SRRU: + link_cost: 108 position: - 17.4456 - 78.3497 diff --git a/host_vars/MEMPHIS b/host_vars/MEMPHIS index eda415d..d50d520 100644 --- a/host_vars/MEMPHIS +++ b/host_vars/MEMPHIS @@ -18,18 +18,14 @@ router_name: titan http_access: https memsize: 4 neighbors: - MML1: - link_cost: 80 - SRRU: - link_cost: 150 - UFBA: - link_cost: 115 ARIZONA: - link_cost: 17 + link_cost: 41 WU: - link_cost: 17 - NEU: - link_cost: 21 + link_cost: 27 + SAVI: + link_cost: 28 + DELFT: + link_cost: 119 position: - 35.1186099 - -89.93700109999999 diff --git a/host_vars/MINHO b/host_vars/MINHO index 7120b19..fd9d3e2 100644 --- a/host_vars/MINHO +++ b/host_vars/MINHO @@ -19,10 +19,12 @@ router_name: vnetlab http_access: https memsize: 4 neighbors: - AVEIRO: - link_cost: 2 URJC: - link_cost: 13 + link_cost: 28 + QUB: + link_cost: 60 + AVEIRO: + link_cost: 3 position: - 41.8 - -8.2 diff --git a/host_vars/MML1 b/host_vars/MML1 index fd5ad15..e7c95a9 100644 --- a/host_vars/MML1 +++ b/host_vars/MML1 @@ -19,10 +19,18 @@ router_name: mmlab1 http_access: http memsize: 2 neighbors: - WU: - link_cost: 75 - MEMPHIS: - link_cost: 80 + UCLA: + link_cost: 195 + TORONTO: + link_cost: 167 + FRANKFURT: + link_cost: 50 + URJC: + link_cost: 60 + MML2: + link_cost: 1 + IIITH: + link_cost: 191 position: - 37.9942 - 23.7326 diff --git a/host_vars/MML2 b/host_vars/MML2 index 4a19246..d5c6dfd 100644 --- a/host_vars/MML2 +++ b/host_vars/MML2 @@ -19,9 +19,13 @@ http_access: http memsize: 2 neighbors: TNO: - link_cost: 25 - DELFT: - link_cost: 26 + link_cost: 50 + MML1: + link_cost: 1 + BERN: + link_cost: 42 + UFBA: + link_cost: 190 position: - 37.9942 - 23.7326 diff --git a/host_vars/NEU b/host_vars/NEU index 66b69a1..d3e59ad 100644 --- a/host_vars/NEU +++ b/host_vars/NEU @@ -18,12 +18,14 @@ router_name: ndnrtr http_access: http memsize: 2 neighbors: - QUB: - link_cost: 60 + WU: + link_cost: 38 SAVI: - link_cost: 15 - MEMPHIS: - link_cost: 21 + link_cost: 38 + TORONTO: + link_cost: 25 + AVEIRO: + link_cost: 108 position: - 42.3398783 - -71.0887358 diff --git a/host_vars/OSAKA b/host_vars/OSAKA index fadf2c7..9448953 100644 --- a/host_vars/OSAKA +++ b/host_vars/OSAKA @@ -18,14 +18,16 @@ router_name: NDNtestbed http_access: http memsize: 16 neighbors: - SRRU: - link_cost: 67 - ANYANG: - link_cost: 36 + DELFT: + link_cost: 234 + SINGAPORE: + link_cost: 79 WASEDA: - link_cost: 5 - ARIZONA: - link_cost: 100 + link_cost: 12 + ANYANG: + link_cost: 98 + SRRU: + link_cost: 123 position: - 34.72 - 135.5193 diff --git a/host_vars/QUB b/host_vars/QUB index 48ef217..7b3ecb0 100644 --- a/host_vars/QUB +++ b/host_vars/QUB @@ -18,14 +18,14 @@ router_name: ndn http_access: https memsize: 8 neighbors: - DELFT: - link_cost: 15 - WU: - link_cost: 60 - NEU: - link_cost: 60 TNO: - link_cost: 15 + link_cost: 22 + BERN: + link_cost: 39 + MINHO: + link_cost: 60 + SAVI: + link_cost: 100 position: - 54.5973 - -5.9301 diff --git a/host_vars/SAVI b/host_vars/SAVI index 56a2d59..6708478 100644 --- a/host_vars/SAVI +++ b/host_vars/SAVI @@ -19,10 +19,12 @@ router_name: ndnrtr http_access: https memsize: 8 neighbors: - UCLA: - link_cost: 40 NEU: - link_cost: 15 + link_cost: 38 + MEMPHIS: + link_cost: 28 + QUB: + link_cost: 100 position: - 43.6 - -79.4 diff --git a/host_vars/SINGAPORE b/host_vars/SINGAPORE index cae9492..c64c32a 100644 --- a/host_vars/SINGAPORE +++ b/host_vars/SINGAPORE @@ -17,8 +17,18 @@ router_name: vm http_access: https memsize: 8 neighbors: - UCLA: - link_cost: 100 + TORONTO: + link_cost: 252 + FRANKFURT: + link_cost: 178 + WASEDA: + link_cost: 89 + OSAKA: + link_cost: 79 + IIITH: + link_cost: 214 + SRRU: + link_cost: 39 position: - 1.2868 - 103.8503 diff --git a/host_vars/SRRU b/host_vars/SRRU index a949ea6..aea270a 100644 --- a/host_vars/SRRU +++ b/host_vars/SRRU @@ -18,12 +18,14 @@ router_name: comsci2 http_access: https memsize: 8 neighbors: - MEMPHIS: - link_cost: 150 - ANYANG: - link_cost: 57 OSAKA: - link_cost: 67 + link_cost: 123 + SINGAPORE: + link_cost: 39 + IIITH: + link_cost: 108 + ANYANG: + link_cost: 140 position: - 15.3 - 103.7 diff --git a/host_vars/TNO b/host_vars/TNO index b4600ee..f645d4e 100644 --- a/host_vars/TNO +++ b/host_vars/TNO @@ -21,9 +21,11 @@ neighbors: DELFT: link_cost: 2 MML2: - link_cost: 25 + link_cost: 50 + AFA: + link_cost: 37 QUB: - link_cost: 15 + link_cost: 22 position: - 52.05858 - 4.0 diff --git a/host_vars/TORONTO b/host_vars/TORONTO index cddeea4..bcda566 100644 --- a/host_vars/TORONTO +++ b/host_vars/TORONTO @@ -18,7 +18,19 @@ http_access: https memsize: 8 neighbors: UCLA: - link_cost: 100 + link_cost: 66 + FRANKFURT: + link_cost: 107 + URJC: + link_cost: 111 + MML1: + link_cost: 167 + WU: + link_cost: 25 + NEU: + link_cost: 25 + SINGAPORE: + link_cost: 252 position: - 44.4006 - -79.6676 diff --git a/host_vars/UCLA b/host_vars/UCLA index 484bb20..2a586d2 100644 --- a/host_vars/UCLA +++ b/host_vars/UCLA @@ -25,20 +25,22 @@ router_name: suns http_access: https memsize: 2 neighbors: - SAVI: - link_cost: 40 - ARIZONA: - link_cost: 25 - WU: - link_cost: 30 - ANYANG: - link_cost: 100 - SINGAPORE: - link_cost: 100 TORONTO: - link_cost: 100 + link_cost: 66 FRANKFURT: - link_cost: 100 + link_cost: 149 + URJC: + link_cost: 171 + MML1: + link_cost: 195 + ARIZONA: + link_cost: 12 + WU: + link_cost: 54 + UFBA: + link_cost: 130 + WASEDA: + link_cost: 108 position: - 34.0728225 - -118.4387398 diff --git a/host_vars/UFBA b/host_vars/UFBA index 089f360..276688d 100644 --- a/host_vars/UFBA +++ b/host_vars/UFBA @@ -18,10 +18,12 @@ router_name: ndn-testbed-ufba http_access: https memsize: 2 neighbors: + UCLA: + link_cost: 130 WU: - link_cost: 65 - MEMPHIS: - link_cost: 115 + link_cost: 129 + MML2: + link_cost: 190 position: - -3.7 - -49.6 diff --git a/host_vars/URJC b/host_vars/URJC index d7c67fd..8314b01 100644 --- a/host_vars/URJC +++ b/host_vars/URJC @@ -19,14 +19,20 @@ router_name: insula http_access: https memsize: 24 neighbors: - IIITH: - link_cost: 90 + UCLA: + link_cost: 171 + TORONTO: + link_cost: 111 + FRANKFURT: + link_cost: 36 + MML1: + link_cost: 60 AVEIRO: - link_cost: 15 + link_cost: 30 MINHO: - link_cost: 13 - WU: - link_cost: 86 + link_cost: 28 + BERN: + link_cost: 30 position: - 40.3359 - -3.8732 diff --git a/host_vars/WASEDA b/host_vars/WASEDA index d97fe4c..3392bde 100644 --- a/host_vars/WASEDA +++ b/host_vars/WASEDA @@ -19,12 +19,14 @@ router_name: ndn-tb http_access: htt memsize: 2 neighbors: - OSAKA: - link_cost: 5 + UCLA: + link_cost: 108 ANYANG: - link_cost: 40 - ARIZONA: - link_cost: 75 + link_cost: 89 + SINGAPORE: + link_cost: 89 + OSAKA: + link_cost: 12 position: - 35.7092 - 139.7193 diff --git a/host_vars/WU b/host_vars/WU index 9e02349..91ac705 100644 --- a/host_vars/WU +++ b/host_vars/WU @@ -18,28 +18,18 @@ router_name: wundngw http_access: https memsize: 2 neighbors: - DELFT: - link_cost: 60 - MML1: - link_cost: 75 - QUB: - link_cost: 60 - IIITH: - link_cost: 122 - AVEIRO: - link_cost: 75 - UFBA: - link_cost: 65 UCLA: - link_cost: 30 - URJC: - link_cost: 86 + link_cost: 54 ARIZONA: - link_cost: 33 + link_cost: 50 MEMPHIS: - link_cost: 17 - BERN: - link_cost: 60 + link_cost: 27 + NEU: + link_cost: 38 + UFBA: + link_cost: 129 + TORONTO: + link_cost: 25 position: - 38.6490701 - -90.3033471