Fix: The '-l' option is specified, the output resubmit / goto_table, descriptoion...

[ftg/ftg.git] / ftg.py

diff --git a/ftg.py b/ftg.py
index 7b12695..dbb8da0 100755 (executable)
--- a/ftg.py
+++ b/ftg.py
@@ -39,6 +39,9 @@ if __name__ == "__main__":
         '-b', '--entries_per_block', dest='entries_per_block', type='int',
         help="specify number of entries in priority block", default=10)
     p.add_option(
+        '-l', '--description_list_file', dest='description_list_file',
+        help="specify description list FILE", metavar="FILE")
+    p.add_option(
         '-T', '--tables', dest='output_target_tables',
         help="specify the tables to be output.")
     p.add_option(
@@ -89,18 +92,19 @@ if __name__ == "__main__":
         util.error_out("specify valid formatter.")
         sys.exit(1)
 
+    # load description list
+    if opts.description_list_file is not None and opts.description_list_file != "":
+        formatter.set_description_list_file(opts.description_list_file)
+        formatter.load_description_list()
+        
     if opts.ovs_dump_file is not None and opts.ovs_dump_file != "":
         grapher = Grapher(util, opts.ovs_dump_file, Grapher.DUMP_FILE_OVS, formatter)
-        grapher.run()
     elif opts.csv_dump_file is not None and opts.csv_dump_file != "":
         grapher = Grapher(util, opts.csv_dump_file, Grapher.DUMP_FILE_CSV, formatter)
-        grapher.run()
     elif opts.tsv_dump_file is not None and opts.tsv_dump_file != "":
         grapher = Grapher(util, opts.tsv_dump_file, Grapher.DUMP_FILE_TSV, formatter)
-        grapher.run()
     else:
         util.error_out("specify flow file with -i or -c or -t option.")
         sys.exit(1)
-        
-
-     
+    
+    grapher.run()