From 22eaaafea99018edea850efd55a9e443c5282794 Mon Sep 17 00:00:00 2001 From: Manuel Peuster Date: Tue, 6 Sep 2016 15:00:56 +0200 Subject: [PATCH 1/2] Use smaller delays for demo --- .../sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py | 4 ++-- .../examples/sonata_y1_demo_topology_1_w_ls_and_sap.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py b/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py index 0e076db2..b38720e7 100644 --- a/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py +++ b/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py @@ -50,8 +50,8 @@ def create_topology1(): dc1 = net.addDatacenter("dc1") dc2 = net.addDatacenter("dc2") s1 = net.addSwitch("s1") - net.addLink(dc1, s1, delay="10ms") - net.addLink(dc2, s1, delay="20ms") + net.addLink(dc1, s1, delay="3ms") + net.addLink(dc2, s1, delay="5ms") # add the command line interface endpoint to each DC (REST API) rapi1 = RestApiEndpoint("0.0.0.0", 5001) diff --git a/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_sap.py b/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_sap.py index b13e05ae..ffb1159f 100644 --- a/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_sap.py +++ b/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_sap.py @@ -46,12 +46,12 @@ def create_topology1(): # create topology - net = DCNetwork(controller=RemoteController, monitor=False, enable_learning=True) + net = DCNetwork(controller=RemoteController, monitor=False, enable_learning=False) dc1 = net.addDatacenter("dc1") dc2 = net.addDatacenter("dc2") s1 = net.addSwitch("s1") - net.addLink(dc1, s1, delay="10ms") - net.addLink(dc2, s1, delay="20ms") + net.addLink(dc1, s1, delay="3ms") + net.addLink(dc2, s1, delay="5ms") # add the command line interface endpoint to each DC (REST API) rapi1 = RestApiEndpoint("0.0.0.0", 5001) From 09fee41da236eca28100fee89684316ac03d7da2 Mon Sep 17 00:00:00 2001 From: Manuel Peuster Date: Tue, 6 Sep 2016 15:49:56 +0200 Subject: [PATCH 2/2] Fix: Disabled learning flag in demo topo (does still not really work) --- .../examples/sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py b/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py index b38720e7..df7a6ac1 100644 --- a/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py +++ b/src/emuvim/examples/sonata_y1_demo_topology_1_w_ls_and_mon_and_sap.py @@ -46,7 +46,7 @@ def create_topology1(): # create topology - net = DCNetwork(controller=RemoteController, monitor=True, enable_learning=True) + net = DCNetwork(controller=RemoteController, monitor=True, enable_learning=False) dc1 = net.addDatacenter("dc1") dc2 = net.addDatacenter("dc2") s1 = net.addSwitch("s1")