Add ryu backend integration

Signed-off-by: James Guthrie <[email protected]>

Author: JamesGuthrie

of_client/ryu_shim.py

@@ -32,8 +32,7 @@
 from ryu.lib.packet import packet, ethernet, lldp
 from ryu.lib.packet import ethernet
 from ryu.lib.packet import ipv4
-from ryu.netide.comm import *
-
+from pyretic.backend.comm import *
 
 def inport_value_hack(outport):
     if outport > 1:
@@ -111,8 +110,12 @@ def found_terminator(self):
         with self.of_client.channel_lock:
             msg = deserialize(self.received_data)
 
+        # Set up time for starting rule installs.
+        if msg[0] == 'reset_install_time':
+            pass
+            # Ignore this for now - pyretic-specific thing
         # USE DESERIALIZED MSG
-        if msg[0] == 'inject_discovery_packet':
+        elif msg[0] == 'inject_discovery_packet':
             switch = msg[1]
             port = msg[2]
             self.of_client.inject_discovery_packet(switch,port)
@@ -188,7 +191,7 @@ def __init__(self, *args, **kwargs):
         }
 
         self.channel_lock = threading.Lock()
-        self.backend_channel = BackendChannel('127.0.0.1', RYU_BACKEND_PORT, self) 
+        self.backend_channel = BackendChannel('127.0.0.1', BACKEND_PORT, self)
         self.al = asyncore_loop()
         self.al.start()   
 
@@ -698,4 +701,4 @@ def _packet_in_handler(self, ev):
 
         received = self.packet_from_network(switch=datapath.id, inport=msg.in_port, raw=msg.data)
         self.send_to_pyretic(['packet',received])
-    
+

pyretic.py

@@ -94,12 +94,22 @@ def parseArgs():
     op.add_option( '--enable_profile', '-p', action="store_true",
                    dest="enable_profile",
                    help = 'enable yappi multithreaded profiler' )
+    backends = ['pox', 'ryu']
+    op.add_option( '--backend', '-b', type='choice',
+                   choices=backends,
+                   default = 'pox',
+                   help = '|'.join(backends) )
 
     op.set_defaults(frontend_only=False,mode='reactive0',enable_profile=False)
     options, args = op.parse_args()
 
     return (op, options, args, kwargs_to_pass)
 
+def which(file):
+    for path in os.environ["PATH"].split(":"):
+        if os.path.exists(path + "/" + file):
+            return path + "/" + file
+    return None
 
 def main():
     global of_client, enable_profile
@@ -174,29 +184,35 @@ def log_writer(queue, log_level):
     handler = util.QueueStreamHandler(logging_queue)
     logger.addHandler(handler)
     logger.setLevel(log_level)
-    
+
     runtime = Runtime(Backend(),main,path_main,kwargs,options.mode,options.verbosity)
     if not options.frontend_only:
-        try:
-            output = subprocess.check_output('echo $PYTHONPATH',shell=True).strip()
-        except:
-            print 'Error: Unable to obtain PYTHONPATH'
+        if options.backend == 'pox':
+            backend_client = 'of_client.pox_client'
+            backend_path = None
+            for p in sys.path:
+                 if re.match('.*pox/?$',p):
+                     backend_path = os.path.abspath(p)
+                     break
+            if backend_path is None:
+                print 'Error: {} not found in PYTHONPATH'.format(backend)
+                sys.exit(1)
+            backend_exec = os.path.join(backend_path,'pox.py')
+        elif options.backend == 'ryu':
+            backend_client = 'of_client.ryu_shim'
+            backend_exec = which('ryu-manager')
+            if not backend_exec:
+                print "Error: Could not find 'ryu-manager' in path. Is ryu installed?"
+        else:
+            print "Error: Invalid backend '{}' specified".format(options.backend)
             sys.exit(1)
-        poxpath = None
-        for p in output.split(':'):
-             if re.match('.*pox/?$',p):
-                 poxpath = os.path.abspath(p)
-                 break
-        if poxpath is None:
-            print 'Error: pox not found in PYTHONPATH'
-            sys.exit(1)
-        pox_exec = os.path.join(poxpath,'pox.py')
+
         python=sys.executable
-        # TODO(josh): pipe pox_client stdout to subprocess.PIPE or
+        # TODO(josh): pipe backend stdout to subprocess.PIPE or
         # other log file descriptor if necessary
-        of_client = subprocess.Popen([python, 
-                                      pox_exec,
-                                      'of_client.pox_client' ],
+        of_client = subprocess.Popen([python,
+                                      backend_exec,
+                                      backend_client ],
                                      stdout=sys.stdout,
                                      stderr=subprocess.STDOUT)