X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=emuvim%2Fapi%2Fzerorpcapi_DCNetwork.py;fp=emuvim%2Fapi%2Fzerorpcapi_DCNetwork.py;h=27527aa759a5c264343e3aa710520505038ee425;hb=9ebd094670679a7cba47d1e508cda37242bc864b;hp=b60093d1cd8c558c332e907db0acb1f5db2fbdb3;hpb=5cacad58a570a694bcb69b6eae5757c0f862c909;p=osm%2Fvim-emu.git

diff --git a/emuvim/api/zerorpcapi_DCNetwork.py b/emuvim/api/zerorpcapi_DCNetwork.py
index b60093d..27527aa 100755
--- a/emuvim/api/zerorpcapi_DCNetwork.py
+++ b/emuvim/api/zerorpcapi_DCNetwork.py
@@ -6,8 +6,7 @@ Distributed Cloud Emulator (dcemulator)
 import logging
 import threading
 import zerorpc
-import site
-from subprocess import Popen
+
 
 logging.basicConfig(level=logging.INFO)
 
@@ -30,17 +29,6 @@ class ZeroRpcApiEndpointDCNetwork(object):
         logging.debug("Created monitoring API endpoint %s(%s:%d)" % (
             self.__class__.__name__, self.ip, self.port))
 
-        # start Ryu controller with rest-API
-        python_install_path = site.getsitepackages()[0]
-        ryu_path = python_install_path + '/ryu/app/simple_switch_13.py'
-        ryu_path2 =  python_install_path + '/ryu/app/ofctl_rest.py'
-        # change the default Openflow controller port to 6653 (official IANA-assigned port number), as used by Mininet
-        # Ryu still uses 6633 as default
-        ryu_option = '--ofp-tcp-listen-port'
-        ryu_of_port = '6653'
-        ryu_cmd =  'ryu-manager'
-        self.ryu_process = Popen([ryu_cmd, ryu_path, ryu_path2, ryu_option, ryu_of_port])
-
     def connectDCNetwork(self, net):
         self.net = net
         logging.info("Connected DCNetwork to API endpoint %s(%s:%d)" % (
@@ -59,17 +47,17 @@ class ZeroRpcApiEndpointDCNetwork(object):
         s.run()
 
     def stop(self):
-        # stop ryu controller
         logging.info("Stop the monitoring API endpoint")
-        self.ryu_process.terminate()
-        #self.ryu_process.kill()
         return
 
 
 class DCNetworkApi(object):
     """
+        The networking and monitoring commands need the scope of the
+        whole DC network to find the requested vnf. So this API is intended
+        to work with a DCNetwork.
         Just pass through the corresponding request to the
-        selected data center. Do not implement provisioning
+        selected data center network. Do not implement provisioning
         logic here because will will have multiple API
         endpoint implementations at the end.
     """