Merge pull request #50 from psav/psav/validate_topo

Validate topologies

Author: jhjaggars

.github/workflows/tester.yml

@@ -22,10 +22,12 @@ jobs:
     - name: Perform perf test 1 - Random
       run: |
         python ./test/perf/node_utils.py file ./test/perf/topology-random.yaml&
-        sleep 10
+        python ./test/perf/node_utils.py dot-compare graph_controller.dot last-topology_graph.dot --wait 40
         python ./test/perf/node_utils.py ping ./test/perf/topology-random.yaml --count 100 --validate 0.1
         kill `pidof python`
         rm -Rf /tmp/receptor
+        rm graph_controller.dot
+        rm last-topology_graph.dot
     - name: Upload artifact for Perf - Random
       uses: actions/upload-artifact@v1
       with:
@@ -34,10 +36,12 @@ jobs:
     - name: Perform perf test 2 - Flat
       run: |
         python ./test/perf/node_utils.py file ./test/perf/topology-flat.yaml&
-        sleep 10
+        python ./test/perf/node_utils.py dot-compare graph_controller.dot last-topology_graph.dot --wait 40
         python ./test/perf/node_utils.py ping ./test/perf/topology-flat.yaml --count 100 --validate 0.1
         kill `pidof python`
         rm -Rf /tmp/receptor
+        rm graph_controller.dot
+        rm last-topology_graph.dot
     - name: Upload artifact for Perf - Flat
       uses: actions/upload-artifact@v1
       with:
@@ -46,10 +50,12 @@ jobs:
     - name: Perform perf test 3 - Tree
       run: |
         python ./test/perf/node_utils.py file ./test/perf/topology-tree.yaml&
-        sleep 10
+        python ./test/perf/node_utils.py dot-compare graph_controller.dot last-topology_graph.dot --wait 40
         python ./test/perf/node_utils.py ping ./test/perf/topology-tree.yaml --count 100 --validate 0.1
         kill `pidof python`
         rm -Rf /tmp/receptor
+        rm graph_controller.dot
+        rm last-topology_graph.dot
     - name: Upload artifact for Perf - Tree
       uses: actions/upload-artifact@v1
       with:

test/perf/node_utils.py

@@ -9,11 +9,36 @@
 
 import click
 import yaml
+from pyparsing import alphanums
+from pyparsing import Group
+from pyparsing import OneOrMore
+from pyparsing import ParseException
+from pyparsing import Suppress
+from pyparsing import Word
 
 
 DEBUG = False
 
 
+class Conn:
+    def __init__(self, a, b):
+        self.a = a
+        self.b = b
+
+    def __eq__(self, other):
+        if self.a == other.a and self.b == other.b or self.a == other.b and self.b == other.a:
+            return True
+        return False
+
+    def __hash__(self):
+        enps = [self.a, self.b]
+        sorted_enps = sorted(enps)
+        return hash(tuple(sorted_enps))
+
+    def __repr__(self):
+        return f"{self.a} -- {self.b}"
+
+
 def random_port(tcp=True):
     """Get a random port number for making a socket
 
@@ -268,5 +293,43 @@ def ping(filename, count, validate):
             sys.exit(127)
 
 
+def read_and_parse_dot(filename):
+    group = Group(Word(alphanums) + Suppress("--") + Word(alphanums)) + Suppress(";")
+    dot = Suppress("graph {") + OneOrMore(group) + Suppress("}")
+
+    with open(filename) as f:
+        raw_data = f.read()
+    data = dot.parseString(raw_data).asList()
+    return {Conn(c[0], c[1]) for c in data}
+
+
+@main.command("dot-compare")
+@click.option("--wait", default=None)
+@click.argument("filename_one")
+@click.argument("filename_two")
+def dot_compare(filename_one, filename_two, wait):
+
+    if wait:
+        start = time.time()
+        while True:
+            try:
+                assert read_and_parse_dot(filename_one) == read_and_parse_dot(filename_two)
+                sys.stderr.write("Matched\n")
+                sys.exit(0)
+            except (AssertionError, ParseException, FileNotFoundError) as e:
+                if time.time() < start + float(wait):
+                    time.sleep(1)
+                else:
+                    sys.stderr.write("Failed match\n")
+                    raise e
+    else:
+        try:
+            assert read_and_parse_dot(filename_one) == read_and_parse_dot(filename_two)
+            sys.stderr.write("Matched\n")
+        except AssertionError:
+            sys.stderr.write("Failed match\n")
+            sys.exit(127)
+
+
 if __name__ == "__main__":
     main()

test/perf/requirements.txt

@@ -1,2 +1,3 @@
 click
 pyyaml
+pyparsing