From c60e7d5ea473b4d6f572e7a49d46325aaea800f9 Mon Sep 17 00:00:00 2001 From: amdfxlucas <54991547+amdfxlucas@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:58:54 +0100 Subject: [PATCH] disable route servers for SCION examples (#29) --- examples/scion/S01_scion/scion.py | 2 +- .../scion/S02_scion_bgp_mixed/scion_bgp_mixed.py | 10 +++++----- .../scion/S03_bandwidth_test/bandwidth_test.py | 2 +- examples/scion/S04_docker_api/docker_api.py | 2 +- .../scion/S05_scion_internet/scion_internet.py | 16 ++++++++-------- .../emulator-code/test-emulator.py | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/scion/S01_scion/scion.py b/examples/scion/S01_scion/scion.py index 77ac476d7..99d8be3ed 100755 --- a/examples/scion/S01_scion/scion.py +++ b/examples/scion/S01_scion/scion.py @@ -16,7 +16,7 @@ base.createIsolationDomain(1) # Internet Exchange -base.createInternetExchange(100) +base.createInternetExchange(100, create_rs=False ) # AS-150 as150 = base.createAutonomousSystem(150) diff --git a/examples/scion/S02_scion_bgp_mixed/scion_bgp_mixed.py b/examples/scion/S02_scion_bgp_mixed/scion_bgp_mixed.py index a1fe99ae7..c813e7364 100755 --- a/examples/scion/S02_scion_bgp_mixed/scion_bgp_mixed.py +++ b/examples/scion/S02_scion_bgp_mixed/scion_bgp_mixed.py @@ -21,11 +21,11 @@ base.createIsolationDomain(2) # Internet Exchanges -base.createInternetExchange(100) -base.createInternetExchange(101) -base.createInternetExchange(102) -base.createInternetExchange(103) -base.createInternetExchange(104) +base.createInternetExchange(100, create_rs=False) +base.createInternetExchange(101, create_rs=False) +base.createInternetExchange(102, create_rs=False) +base.createInternetExchange(103, create_rs=False) +base.createInternetExchange(104, create_rs=False) # Core AS 1-150 as150 = base.createAutonomousSystem(150) diff --git a/examples/scion/S03_bandwidth_test/bandwidth_test.py b/examples/scion/S03_bandwidth_test/bandwidth_test.py index 8545904bc..74d341ae9 100755 --- a/examples/scion/S03_bandwidth_test/bandwidth_test.py +++ b/examples/scion/S03_bandwidth_test/bandwidth_test.py @@ -18,7 +18,7 @@ base.createIsolationDomain(1) # Internet Exchange -base.createInternetExchange(100) +base.createInternetExchange(100, create_rs=False ) # AS-150 as150 = base.createAutonomousSystem(150) diff --git a/examples/scion/S04_docker_api/docker_api.py b/examples/scion/S04_docker_api/docker_api.py index 02208d679..19ef1adab 100755 --- a/examples/scion/S04_docker_api/docker_api.py +++ b/examples/scion/S04_docker_api/docker_api.py @@ -24,7 +24,7 @@ base.createIsolationDomain(1) # Internet Exchange -base.createInternetExchange(100) +base.createInternetExchange(100, create_rs=False ) # AS-150 as150 = base.createAutonomousSystem(150) diff --git a/examples/scion/S05_scion_internet/scion_internet.py b/examples/scion/S05_scion_internet/scion_internet.py index 60f58a681..89072df3d 100755 --- a/examples/scion/S05_scion_internet/scion_internet.py +++ b/examples/scion/S05_scion_internet/scion_internet.py @@ -56,14 +56,14 @@ def next_addr(self, net): # Internet Exchanges # We use "Internet Exchanges" as internal networks of the subdivided ASes in # order to reduce the number of networks Docker has to create. -base.createInternetExchange(5) # Tier-1 ISP -base.createInternetExchange(7) # Tier-1 ISP -base.createInternetExchange(10) # Large IXP -base.createInternetExchange(11) # Large IXP -base.createInternetExchange(12) # Small IXP -base.createInternetExchange(17) # Small access network -base.createInternetExchange(18) # Large access network -base.createInternetExchange(20) # Large content provider +base.createInternetExchange(5, create_rs=False) # Tier-1 ISP +base.createInternetExchange(7, create_rs=False) # Tier-1 ISP +base.createInternetExchange(10, create_rs=False) # Large IXP +base.createInternetExchange(11, create_rs=False) # Large IXP +base.createInternetExchange(12, create_rs=False) # Small IXP +base.createInternetExchange(17, create_rs=False) # Small access network +base.createInternetExchange(18, create_rs=False) # Large access network +base.createInternetExchange(20, create_rs=False) # Large content provider # Tier-1 ISP as50-53 br = create_as(1, 50, is_core=True)[1].joinNetwork('ix5') diff --git a/tests/scion/scion_bwtester/emulator-code/test-emulator.py b/tests/scion/scion_bwtester/emulator-code/test-emulator.py index 8545904bc..500b5fc8d 100755 --- a/tests/scion/scion_bwtester/emulator-code/test-emulator.py +++ b/tests/scion/scion_bwtester/emulator-code/test-emulator.py @@ -18,7 +18,7 @@ base.createIsolationDomain(1) # Internet Exchange -base.createInternetExchange(100) +base.createInternetExchange(100, create_rs=False) # AS-150 as150 = base.createAutonomousSystem(150)