change default formatter graph-easy to graphviz-tb

diff --git a/linkpair/collect/collector.py b/linkpair/collect/collector.py
index 29ecff2..2c24791 100755 (executable)
--- a/linkpair/collect/collector.py
+++ b/linkpair/collect/collector.py
@@ -10,7 +10,7 @@ import re
 from linkpair.device import Device
 from linkpair.port import Port
 from linkpair.linkpair import LinkPair
-from linkpair.formatter.grapheasy import GraphEasyFormatter
+from linkpair.formatter.graphviz_tb import GraphvizTBFormatter
 from linkpair.utils.common import CommonUtils
 from linkpair.collect.utils import CollectUtils
 from linkpair.collect.collector_dataset import CollectorDataset
@@ -33,7 +33,7 @@ class Collector(object):
 
     PEER_FOUND = 1
 
-    def __init__(self, opts, util, formatter=GraphEasyFormatter()):
+    def __init__(self, opts, util, formatter=GraphvizTBFormatter()):
         self._devices = {}
         self._ports = {}
         self._os_info = {}

diff --git a/ti2.py b/ti2.py
index c8911f8..fa80731 100755 (executable)
--- a/ti2.py
+++ b/ti2.py
@@ -9,6 +9,7 @@
 #
 __version__ = '1.1'
 
+import sys
 from optparse import OptionParser, OptionGroup
 from linkpair.collect.collector import Collector
 from linkpair.formatter.grapheasy import GraphEasyFormatter
@@ -16,6 +17,7 @@ from linkpair.formatter.springy import SpringyFormatter
 from linkpair.formatter.springy_raphael import SpringyRaphaelFormatter
 from linkpair.formatter.graphviz_tb import GraphvizTBFormatter
 from linkpair.utils.common import CommonUtils
+from linkpair.exporter.json import JsonExporter
 
 
 def print_linkpair_records(lps):
@@ -40,13 +42,15 @@ if __name__ == "__main__":
     p.add_option('-f', '--format', dest='format',
                  choices=['g', 'graph-easy', 's', 'springy',
                           'r', 'springy-raphael', 't', 'graphviz-tb'],
-                 default="graph-easy",
+                 default="graphviz-tb",
                  help="specify output format [FORMAT: g/graph-easy, s/springy, r/springy-raphael, t/graphviz-tb]",
                  metavar="FORMAT")
     p.add_option('-d', '--debug', dest='debug', action="store_true", default=False,
                  help="enable debug output")
     p.add_option('-e', '--export_file', dest='export_file', 
                  help="export linkpairs to json file", metavar="FILE")
+    p.add_option('-x', '--export_stdout', dest='export_stdout', action="store_true", default=False,
+                 help="export linkpairs to stdout")
     p.add_option('-i', '--import_file', dest='import_file', 
                  help="import json file as linkpairs", metavar="FILE")
     g2 = OptionGroup(p, "Collector Agent flags",
@@ -98,7 +102,7 @@ if __name__ == "__main__":
     elif opts.format == "t" or opts.format == "graphviz-tb":
         formatter = GraphvizTBFormatter(util)
     else:
-        formatter = GraphEasyFormatter()
+        formatter = GraphvizTBFormatter()
     util.debug_out("formatter: " + str(formatter))
 
     col = Collector(opts, util, formatter)
@@ -112,6 +116,11 @@ if __name__ == "__main__":
     #if dbu.db_enable:
     #    dbu.store_to_db(opts.database, linkpairs)
 
+    if opts.export_stdout:
+        exporter = JsonExporter(util, linkpairs)
+        print(exporter.export())
+        sys.exit(0)
+
     print_linkpair_records(linkpairs)
 
 #    if dbu.enable_db: