made REST API compatible with dummy gatekeeper to use them in the same topology

[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 6ea568a..69e7d0b 100755 (executable)
--- a/src/emuvim/examples/sonata_y1_demo_topology_1.py
+++ b/src/emuvim/examples/sonata_y1_demo_topology_1.py
@@ -7,27 +7,28 @@ A simple topology with two PoPs for the y1 demo story board.
 import logging
 from mininet.log import setLogLevel
 from emuvim.dcemulator.net import DCNetwork
 import logging
 from mininet.log import setLogLevel
 from emuvim.dcemulator.net import DCNetwork

-from emuvim.api.zerorpc.compute import ZeroRpcApiEndpoint
+from emuvim.api.rest.rest_api_endpoint import RestApiEndpoint

 from emuvim.api.sonata import SonataDummyGatekeeperEndpoint
 from emuvim.api.sonata import SonataDummyGatekeeperEndpoint

+from mininet.node import RemoteController

 
 logging.basicConfig(level=logging.INFO)
 
 
 def create_topology1():
     # create topology
 
 logging.basicConfig(level=logging.INFO)
 
 
 def create_topology1():
     # create topology

-    net = DCNetwork()
+    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")
 
     dc1 = net.addDatacenter("dc1")
     dc2 = net.addDatacenter("dc2")
     s1 = net.addSwitch("s1")
     net.addLink(dc1, s1, delay="10ms")
     net.addLink(dc2, s1, delay="20ms")
 

-    # add the command line interface endpoint to each DC
-    zapi1 = ZeroRpcApiEndpoint("0.0.0.0", 4242)
-    zapi1.connectDatacenter(dc1)
-    zapi1.connectDatacenter(dc2)
+    # add the command line interface endpoint to each DC (REST API)
+    rapi1 = RestApiEndpoint("0.0.0.0", 5001)
+    rapi1.connectDatacenter(dc1)
+    rapi1.connectDatacenter(dc2)

     # run API endpoint server (in another thread, don't block)
     # run API endpoint server (in another thread, don't block)

-    zapi1.start()
+    rapi1.start()

 
     # add the SONATA dummy gatekeeper to each DC
     sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 5000)
 
     # add the SONATA dummy gatekeeper to each DC
     sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 5000)