adding port features to topology

Author: Joshua Reich

of_client/pox_client.py

@@ -417,7 +417,8 @@ def _handle_ConnectionUp(self, event):
                 self.switches[event.dpid]['ports'][port.port_no] = port.hw_addr
                 CONF_UP = not 'OFPPC_PORT_DOWN' in self.active_ofp_port_config(port.config)
                 STAT_UP = not 'OFPPS_LINK_DOWN' in self.active_ofp_port_state(port.state)
-                self.send_to_pyretic(['port','join',event.dpid, port.port_no, CONF_UP, STAT_UP])                        
+                PORT_TYPE = self.active_ofp_port_features(port.curr)
+                self.send_to_pyretic(['port','join',event.dpid, port.port_no, CONF_UP, STAT_UP, PORT_TYPE])                        
 
         self.send_to_pyretic(['switch','join',event.dpid,'END'])
 
@@ -518,7 +519,8 @@ def _handle_PortStatus(self, event):
                 #self.runtime.network.port_joins.signal((event.dpid, event.port))
                 CONF_UP = not 'OFPPC_PORT_DOWN' in self.active_ofp_port_config(port.config)
                 STAT_UP = not 'OFPPS_LINK_DOWN' in self.active_ofp_port_state(port.state)
-                self.send_to_pyretic(['port','join',event.dpid, port.port_no, CONF_UP, STAT_UP])
+                PORT_TYPE =  self.active_ofp_port_features(port.curr)
+                self.send_to_pyretic(['port','join',event.dpid, port.port_no, CONF_UP, STAT_UP, PORT_TYPE])                        
             elif event.deleted:
                 try:
                     del self.switches[event.dpid]['ports'][event.port] 
@@ -528,7 +530,8 @@ def _handle_PortStatus(self, event):
             elif event.modified:
                 CONF_UP = not 'OFPPC_PORT_DOWN' in self.active_ofp_port_config(port.config)
                 STAT_UP = not 'OFPPS_LINK_DOWN' in self.active_ofp_port_state(port.state)
-                self.send_to_pyretic(['port','mod',event.dpid, event.port, CONF_UP, STAT_UP])
+                PORT_TYPE = self.active_ofp_port_features(port.curr)
+                self.send_to_pyretic(['port','join',event.dpid, port.port_no, CONF_UP, STAT_UP, PORT_TYPE])                        
             else:
                 raise RuntimeException("Unknown port status event")
 

pyretic/backend/backend.py

@@ -94,9 +94,9 @@ def found_terminator(self):
                 print "ERROR: Bad switch event"
         elif msg[0] == 'port':
             if msg[1] == 'join':
-                self.backend.runtime.handle_port_join(msg[2],msg[3],msg[4],msg[5])
+                self.backend.runtime.handle_port_join(msg[2],msg[3],msg[4],msg[5],msg[6])
             elif msg[1] == 'mod':
-                self.backend.runtime.handle_port_mod(msg[2],msg[3],msg[4],msg[5])
+                self.backend.runtime.handle_port_mod(msg[2],msg[3],msg[4],msg[5],msg[6])
             elif msg[1] == 'part':
                 self.backend.runtime.handle_port_part(msg[2],msg[3])
             else:

pyretic/core/network.py

@@ -190,11 +190,12 @@ class MAC(EthAddr):
 # Tools
 ################################################################################
 class Port(object):
-    def __init__(self, port_no, config=True, status=True,linked_to=None):
+    def __init__(self,port_no,config=True,status=True,port_type=[],linked_to=None):
         self.port_no = port_no
         self.config = config
         self.status = status
         self.linked_to = linked_to
+        self.port_type = port_type
 
     def definitely_down(self):
         return not self.config and not self.status
@@ -213,7 +214,7 @@ def __eq__(self,other):
                 self.linked_to == other.linked_to)
 
     def __repr__(self):
-        return "%d:config_up=%s:status_up=%s:linked_to=%s" % (self.port_no,self.config,self.status,self.linked_to)
+        return "%d:config_up=%s:status_up=%s:linked_to=%s:port_type=%s" % (self.port_no,self.config,self.status,self.linked_to,self.port_type)
 
 
 
@@ -242,18 +243,22 @@ def exact_edge_match(e1,e2):
             return e1 == e2
         return nx.is_isomorphic(self,other,node_match=exact_node_match,edge_match=exact_edge_match)
 
-    def switches(self,with_ports=False):
-        if with_ports:
-            return [(switch,attrs['ports'].keys()) 
-                    for switch,attrs in self.nodes(data=True)]
-        else:
-            return self.nodes()
+    def switch_list(self):
+        return self.nodes()
+
+    def switch_with_port_ids_list(self):
+        return [(switch,attrs['ports'].keys()) 
+                for switch,attrs in self.nodes(data=True)]
+    
+    def switch_with_ports_list(self):
+        return [(switch,attrs['ports'].values()) 
+                for switch,attrs in self.nodes(data=True)]
 
     def add_switch(self,switch):
         self.add_node(switch, name=switch, ports={})  
 
-    def add_port(self,switch,port_no,config,status):
-        self.node[switch]["ports"][port_no] = Port(port_no,config,status)
+    def add_port(self,switch,port_no,config,status,port_type):
+        self.node[switch]["ports"][port_no] = Port(port_no,config,status,port_type)
 
     def add_link(self,loc1,loc2):
         self.add_edge(loc1.switch, loc2.switch, {loc1.switch: loc1.port_no, loc2.switch: loc2.port_no})
@@ -483,5 +488,11 @@ def copy(self):
         network.inject_packet = self.inject_packet
         return network
 
-    def switches(self,**kwargs):
-        return self.topology.switches(**kwargs)
+    def switch_list(self):
+        return self.topology.switch_list()
+
+    def switch_with_port_ids_list(self):
+        return self.topology.switch_with_port_ids_list()
+
+    def switch_with_ports_list(self):
+        return self.topology.switch_with_ports_list()

pyretic/core/runtime.py

@@ -656,7 +656,7 @@ def nuclear_install(classifier):
             :param classifier: the input classifer
             :type classifier: Classifier
             """
-            switches = self.network.switches()
+            switches = self.network.switch_list()
             classifier = switchify(classifier,switches)
             classifier = concretize(classifier)
             classifier = check_OF_rules(classifier)
@@ -697,7 +697,7 @@ def install_diff_rules(classifier):
             """
             with self.old_rules_lock:
                 old_rules = self.old_rules
-                switches = self.network.switches()
+                switches = self.network.switch_list()
                 classifier = switchify(classifier,switches)
                 classifier = concretize(classifier)
                 classifier = OF_inportize(classifier)
@@ -782,7 +782,7 @@ def pull_bucket_stats():
                 if 'switch' in concrete_pred:
                     switch_list.append(concrete_pred['switch'])
                 else:
-                    switch_list = self.network.switches()
+                    switch_list = self.network.switch_list()
                     break
             for s in switch_list:
                 bucket.add_outstanding_switch_query(s)
@@ -885,7 +885,7 @@ def send_clear(self,switch):
 
     def clear_all(self):
         def f():
-            switches = self.network.switches()
+            switches = self.network.switch_list()
             for s in switches:
                 self.send_barrier(s)
                 self.send_clear(s)
@@ -912,11 +912,11 @@ def handle_switch_join(self,switch_id):
     def handle_switch_part(self,switch_id):
         self.network.handle_switch_part(switch_id)
 
-    def handle_port_join(self,switch_id,port_id,conf_up,stat_up):
-        self.network.handle_port_join(switch_id,port_id,conf_up,stat_up)
+    def handle_port_join(self,switch_id,port_id,conf_up,stat_up,port_type):
+        self.network.handle_port_join(switch_id,port_id,conf_up,stat_up,port_type)
 
-    def handle_port_mod(self, switch, port_no, config, status):
-        self.network.handle_port_mod(switch, port_no, config, status)
+    def handle_port_mod(self,switch_id,port_id,conf_up,stat_up,port_type):
+        self.network.handle_port_mod(switch_id,port_id,conf_up,stat_up,port_type)
 
     def handle_port_part(self, switch, port_no):
         self.network.handle_port_part(switch, port_no)
@@ -1074,10 +1074,10 @@ def handle_switch_part(self, switch):
         self.debug_log.debug(str(self.next_topo))
         self.queue_update(self.get_update_no())
 
-    def handle_port_join(self, switch, port_no, config, status):
+    def handle_port_join(self, switch, port_no, config, status, port_type):
         self.debug_log.debug("handle_port_joins %s:%s:%s:%s" % (switch, port_no, config, status))
         this_update_no = self.get_update_no()
-        self.next_topo.add_port(switch,port_no,config,status)
+        self.next_topo.add_port(switch,port_no,config,status,port_type)
         if config or status:
             self.inject_discovery_packet(switch,port_no)
             self.debug_log.debug(str(self.next_topo))
@@ -1093,12 +1093,13 @@ def handle_port_part(self, switch, port_no):
         except KeyError:
             pass  # THE SWITCH HAS ALREADY BEEN REMOVED BY handle_switch_parts
 
-    def handle_port_mod(self, switch, port_no, config, status):
+    def handle_port_mod(self, switch, port_no, config, status, port_type):
         self.debug_log.debug("handle_port_mods %s:%s:%s:%s" % (switch, port_no, config, status))
         # GET PREV VALUES
         try:
             prev_config = self.next_topo.node[switch]["ports"][port_no].config
             prev_status = self.next_topo.node[switch]["ports"][port_no].status
+            prev_port_type = self.next_topo.node[switch]["ports"][port_no].port_type
         except KeyError:
             self.log.warning("KeyError CASE!!!!!!!!")
             self.port_down(switch, port_no)
@@ -1107,6 +1108,8 @@ def handle_port_mod(self, switch, port_no, config, status):
         # UPDATE VALUES
         self.next_topo.node[switch]["ports"][port_no].config = config
         self.next_topo.node[switch]["ports"][port_no].status = status
+        self.next_topo.node[switch]["ports"][port_no].port_type = port_type
+        
 
         # DETERMINE IF/WHAT CHANGED
         if (prev_config and not config):
@@ -1170,7 +1173,13 @@ def handle_link_update(self, s1, p_no1, s2, p_no2):
         if p1.possibly_up() and p2.possibly_up():
             self.next_topo.node[s1]["ports"][p_no1].linked_to = Location(s2,p_no2)
             self.next_topo.node[s2]["ports"][p_no2].linked_to = Location(s1,p_no1)   
-            self.next_topo.add_edge(s1, s2, {s1: p_no1, s2: p_no2})
+            pt1 = self.next_topo.node[s1]["ports"][p_no1].port_type 
+            pt2 = self.next_topo.node[s2]["ports"][p_no2].port_type 
+            if pt1 != pt2:
+                print "MISMATCH ",
+                print pt1
+                print pt2
+            self.next_topo.add_edge(s1, s2, {s1: p_no1, s2: p_no2, 'type' : pt1})
 
         # IF REACHED, WE'VE REMOVED AN EDGE, OR ADDED ONE, OR BOTH
         self.debug_log.debug(self.next_topo)

pyretic/examples/topology_printer.py

@@ -20,9 +20,14 @@ def set_network(self, network):
         with self.lock:
             print '------New Topology Information----------'
             print '---Switch ID list'
-            print network.switches()
-            print '---Switch ID paired with port ID list'
-            print network.switches(with_ports=True)
+            print network.switch_list()
+            print '---List of every switch ID paired with port ID'
+            print network.switch_with_port_ids_list()
+            print '---List of every switch ID paired with port type'
+            print [(sid,[(port.port_no,port.port_type) for port in ports]) 
+                   for (sid,ports) in network.switch_with_ports_list()]
+            print '---Edges'
+            print '\n'.join(['s%s[%s]---s%s[%s]\ttype=%s' % (s1,data[s1],s2,data[s2],data['type']) for (s1,s2,data) in network.topology.edges(data=True)])
             print '---Convert network topology object to string'
             print network.topology
             print '---Has changed: ',