X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=tests%2Ftest-ovsdb.py;h=4e87dbb4c4554ed5586c7458850da8473b7b2142;hb=f76def2592cc5cb449a3360430ee9cc0f208765d;hp=e240208d4966f68513c2a2721b984c4a028444ee;hpb=603e325fa56392a4a139ba00aff5dd416d1c512e;p=cascardo%2Fovs.git diff --git a/tests/test-ovsdb.py b/tests/test-ovsdb.py index e240208d4..4e87dbb4c 100644 --- a/tests/test-ovsdb.py +++ b/tests/test-ovsdb.py @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +from __future__ import print_function + import getopt import re import os @@ -27,6 +29,7 @@ import ovs.db.types import ovs.ovsuuid import ovs.poller import ovs.util +import six def unbox_json(json): @@ -82,19 +85,19 @@ def do_default_data(): def do_parse_atomic_type(type_string): type_json = unbox_json(ovs.json.from_string(type_string)) atomic_type = ovs.db.types.AtomicType.from_json(type_json) - print ovs.json.to_string(atomic_type.to_json(), sort_keys=True) + print(ovs.json.to_string(atomic_type.to_json(), sort_keys=True)) def do_parse_base_type(type_string): type_json = unbox_json(ovs.json.from_string(type_string)) base_type = ovs.db.types.BaseType.from_json(type_json) - print ovs.json.to_string(base_type.to_json(), sort_keys=True) + print(ovs.json.to_string(base_type.to_json(), sort_keys=True)) def do_parse_type(type_string): type_json = unbox_json(ovs.json.from_string(type_string)) type_ = ovs.db.types.Type.from_json(type_json) - print ovs.json.to_string(type_.to_json(), sort_keys=True) + print(ovs.json.to_string(type_.to_json(), sort_keys=True)) def do_parse_atoms(type_string, *atom_strings): @@ -104,9 +107,9 @@ def do_parse_atoms(type_string, *atom_strings): atom_json = unbox_json(ovs.json.from_string(atom_string)) try: atom = data.Atom.from_json(base, atom_json) - print ovs.json.to_string(atom.to_json()) - except error.Error, e: - print e.args[0].encode("utf8") + print(ovs.json.to_string(atom.to_json())) + except error.Error as e: + print(e.args[0]) def do_parse_data(type_string, *data_strings): @@ -115,7 +118,7 @@ def do_parse_data(type_string, *data_strings): for datum_string in data_strings: datum_json = unbox_json(ovs.json.from_string(datum_string)) datum = data.Datum.from_json(type_, datum_json) - print ovs.json.to_string(datum.to_json()) + print(ovs.json.to_string(datum.to_json())) def do_sort_atoms(type_string, atom_strings): @@ -123,27 +126,27 @@ def do_sort_atoms(type_string, atom_strings): base = ovs.db.types.BaseType.from_json(type_json) atoms = [data.Atom.from_json(base, atom_json) for atom_json in unbox_json(ovs.json.from_string(atom_strings))] - print ovs.json.to_string([data.Atom.to_json(atom) - for atom in sorted(atoms)]) + print(ovs.json.to_string([data.Atom.to_json(atom) + for atom in sorted(atoms)])) def do_parse_column(name, column_string): column_json = unbox_json(ovs.json.from_string(column_string)) column = ovs.db.schema.ColumnSchema.from_json(column_json, name) - print ovs.json.to_string(column.to_json(), sort_keys=True) + print(ovs.json.to_string(column.to_json(), sort_keys=True)) 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) - print ovs.json.to_string(table.to_json(default_is_root), sort_keys=True) + print(ovs.json.to_string(table.to_json(default_is_root), sort_keys=True)) def do_parse_schema(schema_string): schema_json = unbox_json(ovs.json.from_string(schema_string)) schema = ovs.db.schema.DbSchema.from_json(schema_json) - print ovs.json.to_string(schema.to_json(), sort_keys=True) + print(ovs.json.to_string(schema.to_json(), sort_keys=True)) def print_idl(idl, step): @@ -152,7 +155,7 @@ def print_idl(idl, step): simple_columns = ["i", "r", "b", "s", "u", "ia", "ra", "ba", "sa", "ua", "uuid"] simple = idl.tables["simple"].rows - for row in simple.itervalues(): + for row in six.itervalues(simple): s = "%03d:" % step for column in simple_columns: if hasattr(row, column) and not (type(getattr(row, column)) @@ -168,7 +171,7 @@ def print_idl(idl, step): if "link1" in idl.tables: l1 = idl.tables["link1"].rows - for row in l1.itervalues(): + for row in six.itervalues(l1): s = ["%03d: i=%s k=" % (step, row.i)] if hasattr(row, "k") and row.k: s.append(str(row.k.i)) @@ -185,7 +188,7 @@ def print_idl(idl, step): if "link2" in idl.tables: l2 = idl.tables["link2"].rows - for row in l2.itervalues(): + for row in six.itervalues(l2): s = ["%03d:" % step] s.append(" i=%s l1=" % row.i) if hasattr(row, "l1") and row.l1: @@ -201,7 +204,7 @@ def print_idl(idl, step): def substitute_uuids(json, symtab): - if type(json) in [str, unicode]: + if isinstance(json, six.string_types): symbol = symtab.get(json) if symbol: return str(symbol) @@ -209,14 +212,15 @@ def substitute_uuids(json, symtab): return [substitute_uuids(element, symtab) for element in json] elif type(json) == dict: d = {} - for key, value in json.iteritems(): + for key, value in six.iteritems(json): d[key] = substitute_uuids(value, symtab) return d return json def parse_uuids(json, symtab): - if type(json) in [str, unicode] and ovs.ovsuuid.is_valid_string(json): + if (isinstance(json, six.string_types) + and ovs.ovsuuid.is_valid_string(json)): name = "#%d#" % len(symtab) sys.stderr.write("%s = %s\n" % (name, json)) symtab[name] = json @@ -224,12 +228,12 @@ def parse_uuids(json, symtab): for element in json: parse_uuids(element, symtab) elif type(json) == dict: - for value in json.itervalues(): + for value in six.itervalues(json): parse_uuids(value, symtab) def idltest_find_simple(idl, i): - for row in idl.tables["simple"].rows.itervalues(): + for row in six.itervalues(idl.tables["simple"].rows): if row.i == i: return row return None @@ -252,7 +256,7 @@ def idl_set(idl, commands, step): def notify(event, row, updates=None): if updates: - upcol = updates._data.keys()[0] + upcol = list(updates._data.keys())[0] else: upcol = None events.append("%s|%s|%s" % (event, row.i, upcol)) @@ -349,7 +353,7 @@ def idl_set(idl, commands, step): txn.abort() break elif name == "destroy": - print "%03d: destroy" % step + print("%03d: destroy" % step) sys.stdout.flush() txn.abort() return @@ -447,7 +451,7 @@ def do_idl(schema_file, remote, *commands): step += 1 else: json = ovs.json.from_string(command) - if type(json) in [str, unicode]: + if isinstance(json, six.string_types): sys.stderr.write("\"%s\": %s\n" % (command, json)) sys.exit(1) json = substitute_uuids(json, symtab) @@ -484,7 +488,7 @@ def do_idl(schema_file, remote, *commands): def usage(): - print """\ + print("""\ %(program_name)s: test utility for Open vSwitch database Python bindings usage: %(program_name)s [OPTIONS] COMMAND ARG... @@ -539,7 +543,7 @@ idl SCHEMA SERVER [?T1:C1,C2...[?T2:C1,C2,...]...] [TRANSACTION...] The following options are also available: -t, --timeout=SECS give up after SECS seconds -h, --help display this help message\ -""" % {'program_name': ovs.util.PROGRAM_NAME} +""" % {'program_name': ovs.util.PROGRAM_NAME}) sys.exit(0) @@ -548,7 +552,7 @@ def main(argv): options, args = getopt.gnu_getopt(argv[1:], 't:h', ['timeout', 'help']) - except getopt.GetoptError, geo: + except getopt.GetoptError as geo: sys.stderr.write("%s: %s\n" % (ovs.util.PROGRAM_NAME, geo.msg)) sys.exit(1) @@ -617,6 +621,6 @@ def main(argv): if __name__ == '__main__': try: main(sys.argv) - except error.Error, e: + except error.Error as e: sys.stderr.write("%s\n" % e) sys.exit(1)