merge with master

Author: ngsrinivas

of_client/pox_client.py

@@ -476,7 +476,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'])
 
@@ -577,7 +578,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] 
@@ -587,7 +589,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/language.py

@@ -1544,10 +1544,11 @@ def set_network(self, network):
         if changed:
             self.log.debug("Printing updated MST:\n %s" % str(updated_mst))
             self.policy = parallel([
-                    match(switch=switch) >>
-                        parallel(map(xfwd,attrs['ports'].keys()))
-                    for switch,attrs in self.mst.nodes(data=True)])
-
+                match(switch=switch) >>
+                parallel(map(xfwd,ports))
+                for switch,ports 
+                in self.mst.switch_with_port_ids_list()])
+                
     def __repr__(self):
         try:
             return "flood on:\n%s" % self.mst

pyretic/core/network.py

@@ -191,11 +191,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
@@ -214,7 +215,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)
 
 
 
@@ -243,11 +244,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 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})
@@ -476,3 +488,12 @@ def copy(self):
         network = Network(topology)
         network.inject_packet = self.inject_packet
         return network
+
+    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

@@ -223,7 +223,7 @@ def handle_network_change(self):
         with self.network_lock:
 
             # if the topology hasn't changed, ignore
-            if self.network.topology == self.prev_network.topology:
+            if self.network == self.prev_network:
                 return
 
             # otherwise copy the network object
@@ -880,9 +880,7 @@ def nuclear_install(new_rules, curr_classifier_no):
             :param classifier: the input classifer
             :type classifier: Classifier
             """
-            switch_attrs_tuples = self.network.topology.nodes(data=True)
-            switch_to_attrs = { k : v for (k,v) in switch_attrs_tuples }
-            switches = switch_to_attrs.keys()
+            switches = self.network.switch_list()
 
             for s in switches:
                 self.send_barrier(s)
@@ -915,9 +913,7 @@ def add_version(rules, version):
                     new_rules.append(r + (version,))
                 return new_rules
 
-            switch_attrs_tuples = self.network.topology.nodes(data=True)
-            switch_to_attrs = { k : v for (k,v) in switch_attrs_tuples }
-            switches = switch_to_attrs.keys()
+            switches = self.network.switch_list()
 
             classifier = switchify(classifier,switches)
             classifier = concretize(classifier)
@@ -1016,9 +1012,7 @@ def install_diff_lists(diff_lists, classifier_version_no):
             :type classifier_version_no: int
             """
             (to_add, to_delete, to_modify, to_stay) = diff_lists
-            switch_attrs_tuples = self.network.topology.nodes(data=True)
-            switch_to_attrs = { k : v for (k,v) in switch_attrs_tuples }
-            switches = switch_to_attrs.keys()
+            switches = self.network.switch_list()
 
             # If the controller just came up, clear out the switches.
             if classifier_version_no == 1 or self.mode == 'proactive0':
@@ -1118,10 +1112,10 @@ def pull_switches_for_preds(self, concrete_preds, bucket):
             if 'switch' in concrete_pred:
                 switch_id = concrete_pred['switch']
                 if ((not switch_id in switch_list) and
-                    (switch_id in self.network.topology.nodes())):
+                    (switch_id in self.network.switch_list())):
                     switch_list.append(switch_id)
             else:
-                switch_list = self.network.topology.nodes()
+                switch_list = self.network.switch_list()
                 break
         self.log.info('Pulling stats from switches '
                       + str(switch_list) + ' for bucket ' +
@@ -1282,7 +1276,7 @@ def send_clear(self,switch):
 
     def clear_all(self):
         def f():
-            switches = self.network.topology.nodes()
+            switches = self.network.switch_list()
             for s in switches:
                 self.send_barrier(s)
                 self.send_clear(s)
@@ -1309,11 +1303,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)
@@ -1569,10 +1563,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))
@@ -1588,12 +1582,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)
@@ -1602,6 +1597,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):
@@ -1665,7 +1662,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

@@ -12,20 +12,30 @@
 class topology_printer(DynamicPolicy):
 
     def __init__(self):
-        self.topology = None
+        self.last_topology = None
         self.lock = Lock()
         super(topology_printer,self).__init__()
 
     def set_network(self, network):
         with self.lock:
-            if self.topology and (self.topology == network.topology):
-                pass
+            print '------New Topology Information----------'
+            print '---Switch ID list'
+            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: ',
+            if self.last_topology:
+                print self.last_topology != network.topology 
             else:
-                print self.topology
-                print network.topology
-                self.topology = network.topology
-                print self.topology
-
+                print True
+            self.last_topology = network.topology
 
 def main ():
     return topology_printer()