projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-client: Make "dump" print table names in default output format too.
[openvswitch]
/
ovsdb
/
ovsdb-dot.in
diff --git
a/ovsdb/ovsdb-dot.in
b/ovsdb/ovsdb-dot.in
index 179353035d9f044231134d43f50c8ef9af5388e8..3a9d9b0e862be1160480aaa060f65a5b7ea19bd5 100755
(executable)
--- a/
ovsdb/ovsdb-dot.in
+++ b/
ovsdb/ovsdb-dot.in
@@
-6,11
+6,6
@@
import os
import re
import sys
import re
import sys
-sys.path.insert(0, "@abs_top_srcdir@/ovsdb")
-import simplejson as json
-
-from OVSDB import *
-
argv0 = sys.argv[0]
def printEdge(tableName, baseType, label):
argv0 = sys.argv[0]
def printEdge(tableName, baseType, label):
@@
-25,7
+20,7
@@
def printEdge(tableName, baseType, label):
', '.join(['%s=%s' % (k,v) for k,v in options.items()]))
def schemaToDot(schemaFile):
', '.join(['%s=%s' % (k,v) for k,v in options.items()]))
def schemaToDot(schemaFile):
- schema = DbSchema.fromJson(
json.load(open(schemaFile, "r")
))
+ schema = DbSchema.fromJson(
ovs.json.from_file(schemaFile
))
print "digraph %s {" % schema.name
for tableName, table in schema.tables.iteritems():
print "digraph %s {" % schema.name
for tableName, table in schema.tables.iteritems():