X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-dot.in;h=006d7ed90ded2183c5fdacf6c849dd6b380170ca;hb=e379e4d167e31d1cd5f7b86fff091a2e09ff6e45;hp=d41728627f6c850f21f0724b32c5ccdd82c1adaa;hpb=c5f341ab193b9126dffef8c77bf8ed35e91290fd;p=sliver-openvswitch.git

diff --git a/ovsdb/ovsdb-dot.in b/ovsdb/ovsdb-dot.in
index d41728627..006d7ed90 100755
--- a/ovsdb/ovsdb-dot.in
+++ b/ovsdb/ovsdb-dot.in
@@ -10,26 +10,43 @@ import sys
 
 argv0 = sys.argv[0]
 
-def printEdge(tableName, baseType, label):
-    if baseType.ref_table:
+def printEdge(tableName, type, baseType, label):
+    if baseType.ref_table_name:
+        if type.n_min == 0:
+            if type.n_max == 1:
+                arity = "?"
+            elif type.n_max == sys.maxint:
+                arity = "*"
+            else:
+                arity = "{,%d}" % type.n_max
+        elif type.n_min == 1:
+            if type.n_max == 1:
+                arity = ""
+            elif type.n_max == sys.maxint:
+                arity = "+"
+            else:
+                arity = "{1,%d}" % type.n_max
+
         options = {}
-        options['label'] = '"%s"' % label
+        options['label'] = '"%s%s"' % (label, arity)
         if baseType.ref_type == 'weak':
             options['constraint'] = 'false'
             options['style'] = 'dotted'
         print "\t%s -> %s [%s];" % (
             tableName,
-            baseType.ref_table,
+            baseType.ref_table_name,
             ', '.join(['%s=%s' % (k,v) for k,v in options.items()]))
 
-def schemaToDot(schemaFile):
+def schemaToDot(schemaFile, arrows):
     schema = ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schemaFile))
 
     print "digraph %s {" % schema.name
+    print '\trankdir=LR;'
     print '\tsize="6.5,4";'
     print '\tmargin="0";'
     print "\tnode [shape=box];"
-    print "\tedge [dir=none, arrowhead=none, arrowtail=none];"
+    if not arrows:
+        print "\tedge [dir=none, arrowhead=none, arrowtail=none];"
     for tableName, table in schema.tables.iteritems():
         options = {}
         if table.is_root:
@@ -39,10 +56,10 @@ def schemaToDot(schemaFile):
             ', '.join(['%s=%s' % (k,v) for k,v in options.items()]))
         for columnName, column in table.columns.iteritems():
             if column.type.value:
-                printEdge(tableName, column.type.key, "%s key" % columnName)
-                printEdge(tableName, column.type.value, "%s value" % columnName)
+                printEdge(tableName, column.type, column.type.key, "%s key" % columnName)
+                printEdge(tableName, column.type, column.type.value, "%s value" % columnName)
             else:
-                printEdge(tableName, column.type.key, columnName)
+                printEdge(tableName, column.type, column.type.key, columnName)
     print "}";
 
 def usage():
@@ -53,6 +70,7 @@ usage: %(argv0)s [OPTIONS] SCHEMA
 where SCHEMA is an OVSDB schema in JSON format
 
 The following options are also available:
+  --no-arrows                 omit arrows from diagram
   -h, --help                  display this help message
   -V, --version               display version information\
 """ % {'argv0': argv0}
@@ -62,13 +80,17 @@ if __name__ == "__main__":
     try:
         try:
             options, args = getopt.gnu_getopt(sys.argv[1:], 'hV',
-                                              ['help', 'version'])
+                                              ['no-arrows',
+                                               'help', 'version',])
         except getopt.GetoptError, geo:
             sys.stderr.write("%s: %s\n" % (argv0, geo.msg))
             sys.exit(1)
 
+        arrows = True
         for key, value in options:
-            if key in ['-h', '--help']:
+            if key == '--no-arrows':
+                arrows = False
+            elif key in ['-h', '--help']:
                 usage()
             elif key in ['-V', '--version']:
                 print "ovsdb-dot (Open vSwitch) @VERSION@"
@@ -80,7 +102,7 @@ if __name__ == "__main__":
                              "(use --help for help)\n" % argv0)
             sys.exit(1)
 
-        schemaToDot(args[0])
+        schemaToDot(args[0], arrows)
 
     except ovs.db.error.Error, e:
         sys.stderr.write("%s: %s\n" % (argv0, e.msg))