fix unit test and start Ryu from DCNetwork init

[osm/vim-emu.git] / emuvim / api / zerorpcapi_DCNetwork.py

diff --git a/emuvim/api/zerorpcapi_DCNetwork.py b/emuvim/api/zerorpcapi_DCNetwork.py
index b60093d..27527aa 100755 (executable)
--- a/emuvim/api/zerorpcapi_DCNetwork.py
+++ b/emuvim/api/zerorpcapi_DCNetwork.py
@@ -6,8 +6,7 @@ Distributed Cloud Emulator (dcemulator)
 import logging\r
 import threading\r
 import zerorpc\r
 import logging\r
 import threading\r
 import zerorpc\r

-import site\r
-from subprocess import Popen\r
+\r

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


@@ -30,17 +29,6 @@ class ZeroRpcApiEndpointDCNetwork(object):
         logging.debug("Created monitoring API endpoint %s(%s:%d)" % (\r
             self.__class__.__name__, self.ip, self.port))\r
 \r
         logging.debug("Created monitoring API endpoint %s(%s:%d)" % (\r
             self.__class__.__name__, self.ip, self.port))\r
 \r

-        # start Ryu controller with rest-API\r
-        python_install_path = site.getsitepackages()[0]\r
-        ryu_path = python_install_path + '/ryu/app/simple_switch_13.py'\r
-        ryu_path2 =  python_install_path + '/ryu/app/ofctl_rest.py'\r
-        # change the default Openflow controller port to 6653 (official IANA-assigned port number), as used by Mininet\r
-        # Ryu still uses 6633 as default\r
-        ryu_option = '--ofp-tcp-listen-port'\r
-        ryu_of_port = '6653'\r
-        ryu_cmd =  'ryu-manager'\r
-        self.ryu_process = Popen([ryu_cmd, ryu_path, ryu_path2, ryu_option, ryu_of_port])\r
-\r

     def connectDCNetwork(self, net):\r
         self.net = net\r
         logging.info("Connected DCNetwork to API endpoint %s(%s:%d)" % (\r
     def connectDCNetwork(self, net):\r
         self.net = net\r
         logging.info("Connected DCNetwork to API endpoint %s(%s:%d)" % (\r


@@ -59,17 +47,17 @@ class ZeroRpcApiEndpointDCNetwork(object):
         s.run()\r
 \r
     def stop(self):\r
         s.run()\r
 \r
     def stop(self):\r

-        # stop ryu controller\r

         logging.info("Stop the monitoring API endpoint")\r
         logging.info("Stop the monitoring API endpoint")\r

-        self.ryu_process.terminate()\r
-        #self.ryu_process.kill()\r

         return\r
 \r
 \r
 class DCNetworkApi(object):\r
     """\r
         return\r
 \r
 \r
 class DCNetworkApi(object):\r
     """\r

+        The networking and monitoring commands need the scope of the\r
+        whole DC network to find the requested vnf. So this API is intended\r
+        to work with a DCNetwork.\r

         Just pass through the corresponding request to the\r
         Just pass through the corresponding request to the\r

-        selected data center. Do not implement provisioning\r
+        selected data center network. Do not implement provisioning\r

         logic here because will will have multiple API\r
         endpoint implementations at the end.\r
     """\r
         logic here because will will have multiple API\r
         endpoint implementations at the end.\r
     """\r