update openflow port for ryu

diff --git a/.gitignore b/.gitignore
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/emuvim/api/zerorpcapi_DCNetwork.py b/emuvim/api/zerorpcapi_DCNetwork.py
old mode 100644 (file)
new mode 100755 (executable)
index 24becd3..b60093d
--- a/emuvim/api/zerorpcapi_DCNetwork.py
+++ b/emuvim/api/zerorpcapi_DCNetwork.py
@@ -34,9 +34,12 @@ class ZeroRpcApiEndpointDCNetwork(object):
         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
         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
         ryu_cmd =  'ryu-manager'\r

-        self.ryu_process = Popen([ryu_cmd, ryu_path, ryu_path2])\r
-\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
 \r
     def connectDCNetwork(self, net):\r
         self.net = net\r

diff --git a/emuvim/cli/monitor.py b/emuvim/cli/monitor.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/emuvim/dcemulator/monitoring.py b/emuvim/dcemulator/monitoring.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/emuvim/dcemulator/net.py b/emuvim/dcemulator/net.py
index 609d46c..324c4d3 100755 (executable)
--- a/emuvim/dcemulator/net.py
+++ b/emuvim/dcemulator/net.py
@@ -27,9 +27,11 @@ class DCNetwork(Dockernet):
         self.dcs = {}
         # create a Mininet/Dockernet network
         # call original Docker.__init__ and setup default controller
         self.dcs = {}
         # create a Mininet/Dockernet network
         # call original Docker.__init__ and setup default controller

+        #Dockernet.__init__(
+        #    self, controller=RemoteController, switch=OVSKernelSwitch, **kwargs)

         Dockernet.__init__(
             self, controller=RemoteController, switch=OVSKernelSwitch, **kwargs)
         Dockernet.__init__(
             self, controller=RemoteController, switch=OVSKernelSwitch, **kwargs)

-        self.addController('c0')
+        self.addController('c0', controller=RemoteController)

 
         # graph of the complete DC network
         self.DCNetwork_graph=nx.DiGraph()
 
         # graph of the complete DC network
         self.DCNetwork_graph=nx.DiGraph()

diff --git a/emuvim/example_topology.py b/emuvim/example_topology.py
index 9412863..2342fd1 100755 (executable)
--- a/emuvim/example_topology.py
+++ b/emuvim/example_topology.py
@@ -37,7 +37,6 @@ def create_topology1():
     mon_api = ZeroRpcApiEndpointDCNetwork("0.0.0.0", 5151)
     mon_api.connectDCNetwork(net)
     mon_api.start()
     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
     """
     2. Add (logical) data centers to the topology
        (each data center is one "bigswitch" in our simplified