Fix: Try to run tests in a Docker-only environment.

[osm/vim-emu.git] / src / emuvim / examples / sonata_y1_demo_topology_1.py

diff --git a/src/emuvim/examples/sonata_y1_demo_topology_1.py b/src/emuvim/examples/sonata_y1_demo_topology_1.py
index 1792f88..5c2402c 100755 (executable)
--- a/src/emuvim/examples/sonata_y1_demo_topology_1.py
+++ b/src/emuvim/examples/sonata_y1_demo_topology_1.py
@@ -1,5 +1,5 @@
 """
 """

-Copyright (c) 2015 SONATA-NFV
+Copyright (c) 2015 SONATA-NFV and Paderborn University

 ALL RIGHTS RESERVED.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 ALL RIGHTS RESERVED.
 
 Licensed under the Apache License, Version 2.0 (the "License");


@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
 See the License for the specific language governing permissions and
 limitations under the License.
 

-Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION]
+Neither the name of the SONATA-NFV, Paderborn University

 nor the names of its contributors may be used to endorse or promote
 products derived from this software without specific prior written
 permission.
 nor the names of its contributors may be used to endorse or promote
 products derived from this software without specific prior written
 permission.


@@ -43,7 +43,7 @@ logging.basicConfig(level=logging.INFO)
 
 def create_topology1():
     # create topology
 
 def create_topology1():
     # create topology

-    net = DCNetwork(controller=RemoteController, monitor=False, enable_learning=False)
+    net = DCNetwork(controller=RemoteController, monitor=False, enable_learning=True)

     dc1 = net.addDatacenter("dc1")
     dc2 = net.addDatacenter("dc2")
     s1 = net.addSwitch("s1")
     dc1 = net.addDatacenter("dc1")
     dc2 = net.addDatacenter("dc2")
     s1 = net.addSwitch("s1")


@@ -59,7 +59,7 @@ def create_topology1():
     rapi1.start()
 
     # add the SONATA dummy gatekeeper to each DC
     rapi1.start()
 
     # add the SONATA dummy gatekeeper to each DC

-    sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 5000)
+    sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 5000, deploy_sap=False)

     sdkg1.connectDatacenter(dc1)
     sdkg1.connectDatacenter(dc2)
     # run the dummy gatekeeper (in another thread, don't block)
     sdkg1.connectDatacenter(dc1)
     sdkg1.connectDatacenter(dc2)
     # run the dummy gatekeeper (in another thread, don't block)


@@ -68,6 +68,7 @@ def create_topology1():
     # start the emulation platform
     net.start()
     net.CLI()
     # start the emulation platform
     net.start()
     net.CLI()

+    rapi1.stop()

     net.stop()
 
 
     net.stop()