X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fexamples%2Fmonitoring_demo_topology.py;h=0650be463498ed931d1186164917fb9c64b2c68c;hb=718fba45788c096641ed9d7c911375df781f20b5;hp=fc515a8945a69346b073e282612829298888d7c1;hpb=d806ed7ca29fa8d4f07dbed383378ecb1c353c13;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/examples/monitoring_demo_topology.py b/src/emuvim/examples/monitoring_demo_topology.py
index fc515a8..0650be4 100755
--- a/src/emuvim/examples/monitoring_demo_topology.py
+++ b/src/emuvim/examples/monitoring_demo_topology.py
@@ -29,21 +29,26 @@ def create_topology1():
     """
     1. Create a data center network object (DCNetwork) with monitoring enabled
     """
-    net = DCNetwork(monitor=False)
+    net = DCNetwork(monitor=True, enable_learning=False)
 
     """
-    1b. add a monitoring agent to the DCNetwork
+    1b. Add endpoint APIs for the whole DCNetwork,
+        to access and control the networking from outside.
+        e.g., to setup forwarding paths between compute
+        instances aka. VNFs (represented by Docker containers), passing through
+        different switches and datacenters of the emulated topology
     """
     mon_api = ZeroRpcApiEndpointDCNetwork("0.0.0.0", 5151)
     mon_api.connectDCNetwork(net)
     mon_api.start()
+
     """
     2. Add (logical) data centers to the topology
        (each data center is one "bigswitch" in our simplified
         first prototype)
     """
     dc1 = net.addDatacenter("datacenter1")
-    #dc2 = net.addDatacenter("datacenter2")
+    dc2 = net.addDatacenter("datacenter2")
     #dc3 = net.addDatacenter("long_data_center_name3")
     #dc4 = net.addDatacenter(
     #    "datacenter4",
@@ -53,7 +58,7 @@ def create_topology1():
     3. You can add additional SDN switches for data center
        interconnections to the network.
     """
-    #s1 = net.addSwitch("s1")
+    s1 = net.addSwitch("s1")
 
     """
     4. Add links between your data centers and additional switches
@@ -62,6 +67,8 @@ def create_topology1():
     """
     #net.addLink(dc1, dc2, delay="10ms")
     #net.addLink(dc1, dc2)
+    net.addLink(dc1, s1)
+    net.addLink(s1, dc2)
     #net.addLink("datacenter1", s1, delay="20ms")
     #net.addLink(s1, dc3)
     #net.addLink(s1, "datacenter4")
@@ -81,7 +88,7 @@ def create_topology1():
     zapi1 = ZeroRpcApiEndpoint("0.0.0.0", 4242)
     # connect data centers to this endpoint
     zapi1.connectDatacenter(dc1)
-    #zapi1.connectDatacenter(dc2)
+    zapi1.connectDatacenter(dc2)
     #zapi1.connectDatacenter(dc3)
     #zapi1.connectDatacenter(dc4)
     # run API endpoint server (in another thread, don't block)