projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nicira-ext: Fix NXM example.
[openvswitch]
/
tests
/
test-ovsdb.py
diff --git
a/tests/test-ovsdb.py
b/tests/test-ovsdb.py
index 863bcb8fd69734a0df98406883b260a29b49f105..ea45f9aed8adcd26b2eb8dc96e01cc5d96ea7e0a 100644
(file)
--- a/
tests/test-ovsdb.py
+++ b/
tests/test-ovsdb.py
@@
-1,4
+1,4
@@
-# Copyright (c) 2009, 2010 Nicira Networks
+# Copyright (c) 2009, 2010
, 2011
Nicira Networks
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-98,7
+98,7
@@
def do_parse_atoms(type_string, *atom_strings):
atom = data.Atom.from_json(base, atom_json)
print ovs.json.to_string(atom.to_json())
except error.Error, e:
atom = data.Atom.from_json(base, atom_json)
print ovs.json.to_string(atom.to_json())
except error.Error, e:
- print
e
+ print
unicode(e)
def do_parse_data(type_string, *data_strings):
type_json = unbox_json(ovs.json.from_string(type_string))
def do_parse_data(type_string, *data_strings):
type_json = unbox_json(ovs.json.from_string(type_string))
@@
-121,10
+121,11
@@
def do_parse_column(name, column_string):
column = ovs.db.schema.ColumnSchema.from_json(column_json, name)
print ovs.json.to_string(column.to_json(), sort_keys=True)
column = ovs.db.schema.ColumnSchema.from_json(column_json, name)
print ovs.json.to_string(column.to_json(), sort_keys=True)
-def do_parse_table(name, table_string):
+def do_parse_table(name, table_string, default_is_root_string='false'):
+ default_is_root = default_is_root_string == 'true'
table_json = unbox_json(ovs.json.from_string(table_string))
table = ovs.db.schema.TableSchema.from_json(table_json, name)
table_json = unbox_json(ovs.json.from_string(table_string))
table = ovs.db.schema.TableSchema.from_json(table_json, name)
- print ovs.json.to_string(table.to_json(), sort_keys=True)
+ print ovs.json.to_string(table.to_json(
default_is_root
), sort_keys=True)
def do_parse_rows(table_string, *rows):
table_json = unbox_json(ovs.json.from_string(table_string))
def do_parse_rows(table_string, *rows):
table_json = unbox_json(ovs.json.from_string(table_string))
@@
-272,7
+273,7
@@
parse-data TYPE DATUM...
parse JSON DATUMs as data of given TYPE, and re-serialize
parse-column NAME OBJECT
parse column NAME with info OBJECT, and re-serialize
parse JSON DATUMs as data of given TYPE, and re-serialize
parse-column NAME OBJECT
parse column NAME with info OBJECT, and re-serialize
-parse-table NAME OBJECT
+parse-table NAME OBJECT
[DEFAULT-IS-ROOT]
parse table NAME with info OBJECT
parse-schema JSON
parse JSON as an OVSDB schema, and re-serialize
parse table NAME with info OBJECT
parse-schema JSON
parse JSON as an OVSDB schema, and re-serialize
@@
-289,10
+290,6
@@
The following options are also available:
sys.exit(0)
def main(argv):
sys.exit(0)
def main(argv):
- # Make stdout and stderr UTF-8, even if they are redirected to a file.
- sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
- sys.stderr = codecs.getwriter("utf-8")(sys.stderr)
-
try:
options, args = getopt.gnu_getopt(argv[1:], 't:h',
['timeout',
try:
options, args = getopt.gnu_getopt(argv[1:], 't:h',
['timeout',
@@
-332,7
+329,7
@@
def main(argv):
"parse-data": (do_parse_data, (2,)),
"sort-atoms": (do_sort_atoms, 2),
"parse-column": (do_parse_column, 2),
"parse-data": (do_parse_data, (2,)),
"sort-atoms": (do_sort_atoms, 2),
"parse-column": (do_parse_column, 2),
- "parse-table": (do_parse_table,
2
),
+ "parse-table": (do_parse_table,
(2, 3)
),
"parse-schema": (do_parse_schema, 1),
"idl": (do_idl, (1,))}
"parse-schema": (do_parse_schema, 1),
"idl": (do_idl, (1,))}