git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Global replace of Nicira Networks.
[sliver-openvswitch.git]
/
tests
/
test-ovsdb.py
diff --git
a/tests/test-ovsdb.py
b/tests/test-ovsdb.py
index
df29fdb
..
1350ccd
100644
(file)
--- a/
tests/test-ovsdb.py
+++ b/
tests/test-ovsdb.py
@@
-1,4
+1,4
@@
-# Copyright (c) 2009, 2010, 2011
Nicira Networks
+# Copyright (c) 2009, 2010, 2011
, 2012 Nicira, Inc.
#
# 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.
@@
-292,11
+292,17
@@
def idl_set(idl, commands, step):
'"%s"\n' % args[1])
sys.exit(1)
elif name == "increment":
'"%s"\n' % args[1])
sys.exit(1)
elif name == "increment":
- if len(args) !=
2
:
- sys.stderr.write('"increment" command requires
2 arguments
\n')
+ if len(args) !=
1
:
+ sys.stderr.write('"increment" command requires
1 argument
\n')
sys.exit(1)
sys.exit(1)
- txn.increment(args[0], args[1], [])
+ s = idltest_find_simple(idl, int(args[0]))
+ if not s:
+ sys.stderr.write('"set" command asks for nonexistent i=%d\n'
+ % int(args[0]))
+ sys.exit(1)
+
+ s.increment("i")
increment = True
elif name == "abort":
txn.abort()
increment = True
elif name == "abort":
txn.abort()
@@
-320,8
+326,9
@@
def idl_set(idl, commands, step):
def do_idl(schema_file, remote, *commands):
def do_idl(schema_file, remote, *commands):
- schema = ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schema_file))
- idl = ovs.db.idl.Idl(remote, schema)
+ schema_helper = ovs.db.idl.SchemaHelper(schema_file)
+ schema_helper.register_all()
+ idl = ovs.db.idl.Idl(remote, schema_helper)
if commands:
error, stream = ovs.stream.Stream.open_block(
if commands:
error, stream = ovs.stream.Stream.open_block(
@@
-375,6
+382,11
@@
def do_idl(schema_file, remote, *commands):
sys.stderr.write("jsonrpc transaction failed: %s"
% os.strerror(error))
sys.exit(1)
sys.stderr.write("jsonrpc transaction failed: %s"
% os.strerror(error))
sys.exit(1)
+ elif reply.error is not None:
+ sys.stderr.write("jsonrpc transaction failed: %s"
+ % reply.error)
+ sys.exit(1)
+
sys.stdout.write("%03d: " % step)
sys.stdout.flush()
step += 1
sys.stdout.write("%03d: " % step)
sys.stdout.flush()
step += 1