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

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

diff --git a/src/emuvim/examples/simple_topology.py b/src/emuvim/examples/simple_topology.py
index 8f14b69..b43ad78 100755 (executable)
--- a/src/emuvim/examples/simple_topology.py
+++ b/src/emuvim/examples/simple_topology.py
@@ -1,8 +1,31 @@
 """
 """

-This is an example topology for the distributed cloud emulator (dcemulator).
-(c) 2015 by Manuel Peuster <manuel.peuster@upb.de>
-
-
+Copyright (c) 2015 SONATA-NFV
+ALL RIGHTS RESERVED.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+
+Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION]
+nor the names of its contributors may be used to endorse or promote
+products derived from this software without specific prior written
+permission.
+
+This work has been performed in the framework of the SONATA project,
+funded by the European Commission under Grant number 671517 through
+the Horizon 2020 and 5G-PPP programmes. The authors would like to
+acknowledge the contributions of their colleagues of the SONATA
+partner consortium (www.sonata-nfv.eu).
+"""
+"""

 This is an example that shows how a user of the emulation tool can
 define network topologies with multiple emulated cloud data centers.
 
 This is an example that shows how a user of the emulation tool can
 define network topologies with multiple emulated cloud data centers.
 


@@ -19,8 +42,8 @@ script.
 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.zerorpcapi import ZeroRpcApiEndpoint
-from emuvim.api.zerorpcapi_DCNetwork import ZeroRpcApiEndpointDCNetwork
+from emuvim.api.rest.rest_api_endpoint import RestApiEndpoint
+from mininet.node import RemoteController

 
 logging.basicConfig(level=logging.INFO)
 
 
 logging.basicConfig(level=logging.INFO)
 


@@ -29,14 +52,8 @@ def create_topology1():
     """
     1. Create a data center network object (DCNetwork)
     """
     """
     1. Create a data center network object (DCNetwork)
     """

-    net = DCNetwork()
-
-    """
-    1b. add a monitoring agent to the DCNetwork
-    """
-    mon_api = ZeroRpcApiEndpointDCNetwork("0.0.0.0", 5151)
-    mon_api.connectDCNetwork(net)
-    mon_api.start()
+    net = DCNetwork(controller=RemoteController, monitor=False, enable_learning=True)
+    

     """
     2. Add (logical) data centers to the topology
        (each data center is one "bigswitch" in our simplified
     """
     2. Add (logical) data centers to the topology
        (each data center is one "bigswitch" in our simplified


@@ -76,28 +93,15 @@ def create_topology1():
        this API, e.g., start/stop/list compute instances.
     """
     # create a new instance of a endpoint implementation
        this API, e.g., start/stop/list compute instances.
     """
     # create a new instance of a endpoint implementation

-    zapi1 = ZeroRpcApiEndpoint("0.0.0.0", 4242)
+    rapi1 = RestApiEndpoint("127.0.0.1", 5001, net)

     # connect data centers to this endpoint
     # connect data centers to this endpoint

-    zapi1.connectDatacenter(dc1)
-    zapi1.connectDatacenter(dc2)
-    zapi1.connectDatacenter(dc3)
-    zapi1.connectDatacenter(dc4)
+    rapi1.connectDatacenter(dc1)
+    rapi1.connectDatacenter(dc2)
+    rapi1.connectDatacenter(dc3)
+    rapi1.connectDatacenter(dc4)

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

-    zapi1.start()

 
 

-    """
-    5.1. For our example, we create a second endpoint to illustrate that
-         this is supported by our design. This feature allows us to have
-         one API endpoint for each data center. This makes the emulation
-         environment more realistic because you can easily create one
-         OpenStack-like REST API endpoint for *each* data center.
-         This will look like a real-world multi PoP/data center deployment
-         from the perspective of an orchestrator.
-    """
-    zapi2 = ZeroRpcApiEndpoint("0.0.0.0", 4343)
-    zapi2.connectDatacenter(dc3)
-    zapi2.connectDatacenter(dc4)
-    zapi2.start()
+    rapi1.start()

 
     """
     6. Finally we are done and can start our network (the emulator).
 
     """
     6. Finally we are done and can start our network (the emulator).