projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-ofctl: Fix reading flows from file for "replace-flows", "diff-flows".
[openvswitch]
/
ovsdb
/
ovsdb.h
diff --git
a/ovsdb/ovsdb.h
b/ovsdb/ovsdb.h
index 24ebd9c679aa2944c20b75cf1732c72286fa4e40..0d15ef2db2488c8dd8146b4bfb8f0621f8eb74ad 100644
(file)
--- a/
ovsdb/ovsdb.h
+++ b/
ovsdb/ovsdb.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009 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.
@@
-23,18
+23,22
@@
struct json;
struct ovsdb_log;
struct json;
struct ovsdb_log;
+struct ovsdb_session;
struct ovsdb_txn;
struct uuid;
/* Database schema. */
struct ovsdb_schema {
char *name;
struct ovsdb_txn;
struct uuid;
/* Database schema. */
struct ovsdb_schema {
char *name;
- char *comment;
+ char *version;
+ char *cksum;
struct shash tables; /* Contains "struct ovsdb_table_schema *"s. */
};
struct ovsdb_schema *ovsdb_schema_create(const char *name,
struct shash tables; /* Contains "struct ovsdb_table_schema *"s. */
};
struct ovsdb_schema *ovsdb_schema_create(const char *name,
- const char *comment);
+ const char *version,
+ const char *cksum);
+struct ovsdb_schema *ovsdb_schema_clone(const struct ovsdb_schema *);
void ovsdb_schema_destroy(struct ovsdb_schema *);
struct ovsdb_error *ovsdb_schema_from_file(const char *file_name,
void ovsdb_schema_destroy(struct ovsdb_schema *);
struct ovsdb_error *ovsdb_schema_from_file(const char *file_name,
@@
-44,6
+48,9
@@
struct ovsdb_error *ovsdb_schema_from_json(struct json *,
struct ovsdb_schema **)
WARN_UNUSED_RESULT;
struct json *ovsdb_schema_to_json(const struct ovsdb_schema *);
struct ovsdb_schema **)
WARN_UNUSED_RESULT;
struct json *ovsdb_schema_to_json(const struct ovsdb_schema *);
+
+bool ovsdb_schema_equal(const struct ovsdb_schema *,
+ const struct ovsdb_schema *);
\f
/* Database. */
struct ovsdb {
\f
/* Database. */
struct ovsdb {
@@
-65,7
+72,8
@@
struct json *ovsdb_to_json(const struct ovsdb *);
struct ovsdb_table *ovsdb_get_table(const struct ovsdb *, const char *);
struct ovsdb_table *ovsdb_get_table(const struct ovsdb *, const char *);
-struct json *ovsdb_execute(struct ovsdb *, const struct json *params,
+struct json *ovsdb_execute(struct ovsdb *, const struct ovsdb_session *,
+ const struct json *params,
long long int elapsed_msec,
long long int *timeout_msec);
\f
long long int elapsed_msec,
long long int *timeout_msec);
\f