improve interface to topology info

Author: Joshua Reich

pyretic/core/language.py

@@ -1107,10 +1107,11 @@ def set_network(self, network):
                 changed = True
         if changed:
             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.switches(with_ports=True)])
+                
     def __repr__(self):
         try:
             return "flood on:\n%s" % self.mst

pyretic/core/network.py

@@ -242,6 +242,13 @@ 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 add_switch(self,switch):
         self.add_node(switch, name=switch, ports={})  
 
@@ -475,3 +482,6 @@ def copy(self):
         network = Network(topology)
         network.inject_packet = self.inject_packet
         return network
+
+    def switches(self,**kwargs):
+        return self.topology.switches(**kwargs)

pyretic/core/runtime.py

@@ -172,7 +172,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
@@ -656,9 +656,7 @@ def nuclear_install(classifier):
             :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.switches()
             classifier = switchify(classifier,switches)
             classifier = concretize(classifier)
             classifier = check_OF_rules(classifier)
@@ -699,9 +697,7 @@ def install_diff_rules(classifier):
             """
             with self.old_rules_lock:
                 old_rules = self.old_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.switches()
                 classifier = switchify(classifier,switches)
                 classifier = concretize(classifier)
                 classifier = OF_inportize(classifier)
@@ -786,7 +782,7 @@ def pull_bucket_stats():
                 if 'switch' in concrete_pred:
                     switch_list.append(concrete_pred['switch'])
                 else:
-                    switch_list = self.network.topology.nodes()
+                    switch_list = self.network.switches()
                     break
             for s in switch_list:
                 bucket.add_outstanding_switch_query(s)
@@ -889,7 +885,7 @@ def send_clear(self,switch):
 
     def clear_all(self):
         def f():
-            switches = self.network.topology.nodes()
+            switches = self.network.switches()
             for s in switches:
                 self.send_barrier(s)
                 self.send_clear(s)