2012-05-02 15:21:36 -07:00
|
|
|
# Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
|
2010-08-25 10:26:40 -07:00
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at:
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
# limitations under the License.
|
|
|
|
|
2015-12-14 10:21:53 -05:00
|
|
|
from __future__ import print_function
|
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
import getopt
|
|
|
|
import re
|
|
|
|
import os
|
|
|
|
import signal
|
|
|
|
import sys
|
2011-09-21 10:43:03 -07:00
|
|
|
import uuid
|
2010-08-25 10:26:40 -07:00
|
|
|
|
|
|
|
from ovs.db import error
|
|
|
|
import ovs.db.idl
|
|
|
|
import ovs.db.schema
|
|
|
|
from ovs.db import data
|
2015-12-12 12:54:31 -05:00
|
|
|
import ovs.db.types
|
2010-08-25 10:26:40 -07:00
|
|
|
import ovs.ovsuuid
|
|
|
|
import ovs.poller
|
|
|
|
import ovs.util
|
python: Convert dict iterators.
In Python 2, dict.items(), dict.keys(), and dict.values() returned a
list. dict.iteritems(), dict.iterkeys(), and dict.itervalues() returned
an iterator.
As of Python 3, dict.iteritems(), dict.itervalues(), and dict.iterkeys()
are gone. items(), keys(), and values() now return an iterator.
In the case where we want an iterator, we now use the six.iter*()
helpers. If we want a list, we explicitly create a list from the
iterator.
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
2015-12-14 15:13:20 -05:00
|
|
|
import six
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def unbox_json(json):
|
|
|
|
if type(json) == list and len(json) == 1:
|
|
|
|
return json[0]
|
|
|
|
else:
|
|
|
|
return json
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def do_default_atoms():
|
2015-12-12 12:54:31 -05:00
|
|
|
for type_ in ovs.db.types.ATOMIC_TYPES:
|
|
|
|
if type_ == ovs.db.types.VoidType:
|
2010-08-25 10:26:40 -07:00
|
|
|
continue
|
|
|
|
|
2011-09-21 10:43:03 -07:00
|
|
|
sys.stdout.write("%s: " % type_.to_string())
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-21 10:43:03 -07:00
|
|
|
atom = data.Atom.default(type_)
|
|
|
|
if atom != data.Atom.default(type_):
|
2010-08-25 10:26:40 -07:00
|
|
|
sys.stdout.write("wrong\n")
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
sys.stdout.write("OK\n")
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def do_default_data():
|
|
|
|
any_errors = False
|
|
|
|
for n_min in 0, 1:
|
2015-12-12 12:54:31 -05:00
|
|
|
for key in ovs.db.types.ATOMIC_TYPES:
|
|
|
|
if key == ovs.db.types.VoidType:
|
2010-08-25 10:26:40 -07:00
|
|
|
continue
|
2015-12-12 12:54:31 -05:00
|
|
|
for value in ovs.db.types.ATOMIC_TYPES:
|
|
|
|
if value == ovs.db.types.VoidType:
|
2010-08-25 10:26:40 -07:00
|
|
|
valueBase = None
|
|
|
|
else:
|
2015-12-12 12:54:31 -05:00
|
|
|
valueBase = ovs.db.types.BaseType(value)
|
|
|
|
type_ = ovs.db.types.Type(ovs.db.types.BaseType(key),
|
|
|
|
valueBase, n_min, 1)
|
2011-09-21 10:43:03 -07:00
|
|
|
assert type_.is_valid()
|
2010-08-25 10:26:40 -07:00
|
|
|
|
|
|
|
sys.stdout.write("key %s, value %s, n_min %d: "
|
|
|
|
% (key.to_string(), value.to_string(), n_min))
|
|
|
|
|
2011-09-21 10:43:03 -07:00
|
|
|
datum = data.Datum.default(type_)
|
|
|
|
if datum != data.Datum.default(type_):
|
2010-08-25 10:26:40 -07:00
|
|
|
sys.stdout.write("wrong\n")
|
|
|
|
any_errors = True
|
|
|
|
else:
|
|
|
|
sys.stdout.write("OK\n")
|
|
|
|
if any_errors:
|
|
|
|
sys.exit(1)
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def do_parse_atomic_type(type_string):
|
|
|
|
type_json = unbox_json(ovs.json.from_string(type_string))
|
2015-12-12 12:54:31 -05:00
|
|
|
atomic_type = ovs.db.types.AtomicType.from_json(type_json)
|
2015-12-14 10:21:53 -05:00
|
|
|
print(ovs.json.to_string(atomic_type.to_json(), sort_keys=True))
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def do_parse_base_type(type_string):
|
|
|
|
type_json = unbox_json(ovs.json.from_string(type_string))
|
2015-12-12 12:54:31 -05:00
|
|
|
base_type = ovs.db.types.BaseType.from_json(type_json)
|
2015-12-14 10:21:53 -05:00
|
|
|
print(ovs.json.to_string(base_type.to_json(), sort_keys=True))
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def do_parse_type(type_string):
|
|
|
|
type_json = unbox_json(ovs.json.from_string(type_string))
|
2015-12-12 12:54:31 -05:00
|
|
|
type_ = ovs.db.types.Type.from_json(type_json)
|
2015-12-14 10:21:53 -05:00
|
|
|
print(ovs.json.to_string(type_.to_json(), sort_keys=True))
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def do_parse_atoms(type_string, *atom_strings):
|
|
|
|
type_json = unbox_json(ovs.json.from_string(type_string))
|
2015-12-12 12:54:31 -05:00
|
|
|
base = ovs.db.types.BaseType.from_json(type_json)
|
2010-08-25 10:26:40 -07:00
|
|
|
for atom_string in atom_strings:
|
|
|
|
atom_json = unbox_json(ovs.json.from_string(atom_string))
|
|
|
|
try:
|
|
|
|
atom = data.Atom.from_json(base, atom_json)
|
2015-12-14 10:21:53 -05:00
|
|
|
print(ovs.json.to_string(atom.to_json()))
|
2016-01-06 13:48:16 -05:00
|
|
|
except error.Error as e:
|
2015-12-17 12:22:31 -05:00
|
|
|
print(e.args[0])
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def do_parse_data(type_string, *data_strings):
|
|
|
|
type_json = unbox_json(ovs.json.from_string(type_string))
|
2015-12-12 12:54:31 -05:00
|
|
|
type_ = ovs.db.types.Type.from_json(type_json)
|
2010-08-25 10:26:40 -07:00
|
|
|
for datum_string in data_strings:
|
|
|
|
datum_json = unbox_json(ovs.json.from_string(datum_string))
|
2011-09-21 10:43:03 -07:00
|
|
|
datum = data.Datum.from_json(type_, datum_json)
|
2015-12-14 10:21:53 -05:00
|
|
|
print(ovs.json.to_string(datum.to_json()))
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def do_sort_atoms(type_string, atom_strings):
|
|
|
|
type_json = unbox_json(ovs.json.from_string(type_string))
|
2015-12-12 12:54:31 -05:00
|
|
|
base = ovs.db.types.BaseType.from_json(type_json)
|
2010-08-25 10:26:40 -07:00
|
|
|
atoms = [data.Atom.from_json(base, atom_json)
|
|
|
|
for atom_json in unbox_json(ovs.json.from_string(atom_strings))]
|
2015-12-14 10:21:53 -05:00
|
|
|
print(ovs.json.to_string([data.Atom.to_json(atom)
|
|
|
|
for atom in sorted(atoms)]))
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
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)
|
2015-12-14 10:21:53 -05:00
|
|
|
print(ovs.json.to_string(column.to_json(), sort_keys=True))
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2011-03-10 11:15:01 -08:00
|
|
|
def do_parse_table(name, table_string, default_is_root_string='false'):
|
|
|
|
default_is_root = default_is_root_string == 'true'
|
2010-08-25 10:26:40 -07:00
|
|
|
table_json = unbox_json(ovs.json.from_string(table_string))
|
|
|
|
table = ovs.db.schema.TableSchema.from_json(table_json, name)
|
2015-12-14 10:21:53 -05:00
|
|
|
print(ovs.json.to_string(table.to_json(default_is_root), sort_keys=True))
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
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)
|
2015-12-14 10:21:53 -05:00
|
|
|
print(ovs.json.to_string(schema.to_json(), sort_keys=True))
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def print_idl(idl, step):
|
|
|
|
n = 0
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
if "simple" in idl.tables:
|
|
|
|
simple_columns = ["i", "r", "b", "s", "u", "ia",
|
|
|
|
"ra", "ba", "sa", "ua", "uuid"]
|
|
|
|
simple = idl.tables["simple"].rows
|
python: Convert dict iterators.
In Python 2, dict.items(), dict.keys(), and dict.values() returned a
list. dict.iteritems(), dict.iterkeys(), and dict.itervalues() returned
an iterator.
As of Python 3, dict.iteritems(), dict.itervalues(), and dict.iterkeys()
are gone. items(), keys(), and values() now return an iterator.
In the case where we want an iterator, we now use the six.iter*()
helpers. If we want a list, we explicitly create a list from the
iterator.
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
2015-12-14 15:13:20 -05:00
|
|
|
for row in six.itervalues(simple):
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
s = "%03d:" % step
|
|
|
|
for column in simple_columns:
|
|
|
|
if hasattr(row, column) and not (type(getattr(row, column))
|
|
|
|
is ovs.db.data.Atom):
|
|
|
|
s += " %s=%s" % (column, getattr(row, column))
|
|
|
|
s = re.sub('""|,|u?\'', "", s)
|
|
|
|
s = re.sub('UUID\(([^)]+)\)', r'\1', s)
|
|
|
|
s = re.sub('False', 'false', s)
|
|
|
|
s = re.sub('True', 'true', s)
|
|
|
|
s = re.sub(r'(ba)=([^[][^ ]*) ', r'\1=[\2] ', s)
|
|
|
|
print(s)
|
|
|
|
n += 1
|
|
|
|
|
|
|
|
if "link1" in idl.tables:
|
|
|
|
l1 = idl.tables["link1"].rows
|
python: Convert dict iterators.
In Python 2, dict.items(), dict.keys(), and dict.values() returned a
list. dict.iteritems(), dict.iterkeys(), and dict.itervalues() returned
an iterator.
As of Python 3, dict.iteritems(), dict.itervalues(), and dict.iterkeys()
are gone. items(), keys(), and values() now return an iterator.
In the case where we want an iterator, we now use the six.iter*()
helpers. If we want a list, we explicitly create a list from the
iterator.
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
2015-12-14 15:13:20 -05:00
|
|
|
for row in six.itervalues(l1):
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
s = ["%03d: i=%s k=" % (step, row.i)]
|
|
|
|
if hasattr(row, "k") and row.k:
|
|
|
|
s.append(str(row.k.i))
|
|
|
|
if hasattr(row, "ka"):
|
|
|
|
s.append(" ka=[")
|
|
|
|
s.append(' '.join(sorted(str(ka.i) for ka in row.ka)))
|
|
|
|
s.append("] l2=")
|
|
|
|
if hasattr(row, "l2") and row.l2:
|
|
|
|
s.append(str(row.l2[0].i))
|
|
|
|
if hasattr(row, "uuid"):
|
|
|
|
s.append(" uuid=%s" % row.uuid)
|
|
|
|
print(''.join(s))
|
|
|
|
n += 1
|
|
|
|
|
|
|
|
if "link2" in idl.tables:
|
|
|
|
l2 = idl.tables["link2"].rows
|
python: Convert dict iterators.
In Python 2, dict.items(), dict.keys(), and dict.values() returned a
list. dict.iteritems(), dict.iterkeys(), and dict.itervalues() returned
an iterator.
As of Python 3, dict.iteritems(), dict.itervalues(), and dict.iterkeys()
are gone. items(), keys(), and values() now return an iterator.
In the case where we want an iterator, we now use the six.iter*()
helpers. If we want a list, we explicitly create a list from the
iterator.
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
2015-12-14 15:13:20 -05:00
|
|
|
for row in six.itervalues(l2):
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
s = ["%03d:" % step]
|
|
|
|
s.append(" i=%s l1=" % row.i)
|
|
|
|
if hasattr(row, "l1") and row.l1:
|
|
|
|
s.append(str(row.l1[0].i))
|
|
|
|
if hasattr(row, "uuid"):
|
|
|
|
s.append(" uuid=%s" % row.uuid)
|
|
|
|
print(''.join(s))
|
|
|
|
n += 1
|
2011-09-21 10:43:03 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
if not n:
|
|
|
|
print("%03d: empty" % step)
|
2011-09-21 10:43:03 -07:00
|
|
|
sys.stdout.flush()
|
2010-08-25 10:26:40 -07:00
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def substitute_uuids(json, symtab):
|
2015-12-14 17:01:11 -05:00
|
|
|
if isinstance(json, six.string_types):
|
2010-08-25 10:26:40 -07:00
|
|
|
symbol = symtab.get(json)
|
|
|
|
if symbol:
|
|
|
|
return str(symbol)
|
|
|
|
elif type(json) == list:
|
|
|
|
return [substitute_uuids(element, symtab) for element in json]
|
|
|
|
elif type(json) == dict:
|
|
|
|
d = {}
|
python: Convert dict iterators.
In Python 2, dict.items(), dict.keys(), and dict.values() returned a
list. dict.iteritems(), dict.iterkeys(), and dict.itervalues() returned
an iterator.
As of Python 3, dict.iteritems(), dict.itervalues(), and dict.iterkeys()
are gone. items(), keys(), and values() now return an iterator.
In the case where we want an iterator, we now use the six.iter*()
helpers. If we want a list, we explicitly create a list from the
iterator.
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
2015-12-14 15:13:20 -05:00
|
|
|
for key, value in six.iteritems(json):
|
2010-08-25 10:26:40 -07:00
|
|
|
d[key] = substitute_uuids(value, symtab)
|
|
|
|
return d
|
|
|
|
return json
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def parse_uuids(json, symtab):
|
2015-12-14 17:01:11 -05:00
|
|
|
if (isinstance(json, six.string_types)
|
|
|
|
and ovs.ovsuuid.is_valid_string(json)):
|
2010-08-25 10:26:40 -07:00
|
|
|
name = "#%d#" % len(symtab)
|
|
|
|
sys.stderr.write("%s = %s\n" % (name, json))
|
|
|
|
symtab[name] = json
|
|
|
|
elif type(json) == list:
|
|
|
|
for element in json:
|
|
|
|
parse_uuids(element, symtab)
|
|
|
|
elif type(json) == dict:
|
python: Convert dict iterators.
In Python 2, dict.items(), dict.keys(), and dict.values() returned a
list. dict.iteritems(), dict.iterkeys(), and dict.itervalues() returned
an iterator.
As of Python 3, dict.iteritems(), dict.itervalues(), and dict.iterkeys()
are gone. items(), keys(), and values() now return an iterator.
In the case where we want an iterator, we now use the six.iter*()
helpers. If we want a list, we explicitly create a list from the
iterator.
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
2015-12-14 15:13:20 -05:00
|
|
|
for value in six.itervalues(json):
|
2010-08-25 10:26:40 -07:00
|
|
|
parse_uuids(value, symtab)
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2011-09-21 10:43:03 -07:00
|
|
|
def idltest_find_simple(idl, i):
|
python: Convert dict iterators.
In Python 2, dict.items(), dict.keys(), and dict.values() returned a
list. dict.iteritems(), dict.iterkeys(), and dict.itervalues() returned
an iterator.
As of Python 3, dict.iteritems(), dict.itervalues(), and dict.iterkeys()
are gone. items(), keys(), and values() now return an iterator.
In the case where we want an iterator, we now use the six.iter*()
helpers. If we want a list, we explicitly create a list from the
iterator.
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
2015-12-14 15:13:20 -05:00
|
|
|
for row in six.itervalues(idl.tables["simple"].rows):
|
2011-09-21 10:43:03 -07:00
|
|
|
if row.i == i:
|
|
|
|
return row
|
|
|
|
return None
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2011-09-21 10:43:03 -07:00
|
|
|
def idl_set(idl, commands, step):
|
|
|
|
txn = ovs.db.idl.Transaction(idl)
|
|
|
|
increment = False
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
fetch_cmds = []
|
2015-04-25 14:57:44 -05:00
|
|
|
events = []
|
2011-09-21 10:43:03 -07:00
|
|
|
for command in commands.split(','):
|
|
|
|
words = command.split()
|
|
|
|
name = words[0]
|
|
|
|
args = words[1:]
|
|
|
|
|
2015-04-25 14:57:44 -05:00
|
|
|
if name == "notifytest":
|
|
|
|
name = args[0]
|
|
|
|
args = args[1:]
|
|
|
|
old_notify = idl.notify
|
|
|
|
|
|
|
|
def notify(event, row, updates=None):
|
2015-04-29 10:41:39 -07:00
|
|
|
if updates:
|
python: Convert dict iterators.
In Python 2, dict.items(), dict.keys(), and dict.values() returned a
list. dict.iteritems(), dict.iterkeys(), and dict.itervalues() returned
an iterator.
As of Python 3, dict.iteritems(), dict.itervalues(), and dict.iterkeys()
are gone. items(), keys(), and values() now return an iterator.
In the case where we want an iterator, we now use the six.iter*()
helpers. If we want a list, we explicitly create a list from the
iterator.
Signed-off-by: Russell Bryant <russell@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
2015-12-14 15:13:20 -05:00
|
|
|
upcol = list(updates._data.keys())[0]
|
2015-04-29 10:41:39 -07:00
|
|
|
else:
|
|
|
|
upcol = None
|
2015-04-25 14:57:44 -05:00
|
|
|
events.append("%s|%s|%s" % (event, row.i, upcol))
|
|
|
|
idl.notify = old_notify
|
|
|
|
|
|
|
|
idl.notify = notify
|
|
|
|
|
2011-09-21 10:43:03 -07:00
|
|
|
if name == "set":
|
|
|
|
if len(args) != 3:
|
|
|
|
sys.stderr.write('"set" command requires 3 arguments\n')
|
|
|
|
sys.exit(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)
|
|
|
|
|
|
|
|
if args[1] == "b":
|
|
|
|
s.b = args[2] == "1"
|
|
|
|
elif args[1] == "s":
|
|
|
|
s.s = args[2]
|
|
|
|
elif args[1] == "u":
|
|
|
|
s.u = uuid.UUID(args[2])
|
|
|
|
elif args[1] == "r":
|
|
|
|
s.r = float(args[2])
|
|
|
|
else:
|
|
|
|
sys.stderr.write('"set" comamnd asks for unknown column %s\n'
|
|
|
|
% args[2])
|
|
|
|
sys.stderr.exit(1)
|
|
|
|
elif name == "insert":
|
|
|
|
if len(args) != 1:
|
|
|
|
sys.stderr.write('"set" command requires 1 argument\n')
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
s = txn.insert(idl.tables["simple"])
|
|
|
|
s.i = int(args[0])
|
|
|
|
elif name == "delete":
|
|
|
|
if len(args) != 1:
|
|
|
|
sys.stderr.write('"delete" command requires 1 argument\n')
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
s = idltest_find_simple(idl, int(args[0]))
|
|
|
|
if not s:
|
|
|
|
sys.stderr.write('"delete" command asks for nonexistent i=%d\n'
|
|
|
|
% int(args[0]))
|
|
|
|
sys.exit(1)
|
|
|
|
s.delete()
|
|
|
|
elif name == "verify":
|
|
|
|
if len(args) != 2:
|
|
|
|
sys.stderr.write('"verify" command requires 2 arguments\n')
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
s = idltest_find_simple(idl, int(args[0]))
|
|
|
|
if not s:
|
|
|
|
sys.stderr.write('"verify" command asks for nonexistent i=%d\n'
|
|
|
|
% int(args[0]))
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
if args[1] in ("i", "b", "s", "u", "r"):
|
|
|
|
s.verify(args[1])
|
|
|
|
else:
|
|
|
|
sys.stderr.write('"verify" command asks for unknown column '
|
|
|
|
'"%s"\n' % args[1])
|
|
|
|
sys.exit(1)
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
elif name == "fetch":
|
|
|
|
if len(args) != 2:
|
|
|
|
sys.stderr.write('"fetch" command requires 2 argument\n')
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
row = idltest_find_simple(idl, int(args[0]))
|
|
|
|
if not row:
|
|
|
|
sys.stderr.write('"fetch" command asks for nonexistent i=%d\n'
|
|
|
|
% int(args[0]))
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
column = args[1]
|
|
|
|
row.fetch(column)
|
|
|
|
fetch_cmds.append([row, column])
|
2011-09-21 10:43:03 -07:00
|
|
|
elif name == "increment":
|
2012-04-12 08:25:10 -07:00
|
|
|
if len(args) != 1:
|
|
|
|
sys.stderr.write('"increment" command requires 1 argument\n')
|
|
|
|
sys.exit(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]))
|
2011-09-21 10:43:03 -07:00
|
|
|
sys.exit(1)
|
|
|
|
|
2012-04-12 08:25:10 -07:00
|
|
|
s.increment("i")
|
2011-09-21 10:43:03 -07:00
|
|
|
increment = True
|
|
|
|
elif name == "abort":
|
|
|
|
txn.abort()
|
|
|
|
break
|
|
|
|
elif name == "destroy":
|
2015-12-14 10:21:53 -05:00
|
|
|
print("%03d: destroy" % step)
|
2011-09-21 10:43:03 -07:00
|
|
|
sys.stdout.flush()
|
|
|
|
txn.abort()
|
|
|
|
return
|
python/ovs/db/idl.py: Transaction._substitute doesn't handle list/tuple
Since Transaction._substitute doesn't substitute elements of list/tuple,
setting list references results in transaction error. Teach it such case.
Example:
{"op": "update",
"row":{"bridges":["set",[["uuid",
"1f42bc19-307f-42e7-a9c0-c12178bd8b51"],
["uuid",
"f97e0c76-7146-489d-9bed-29bc704f65fe"]]]},
"table": "Open_vSwitch",
"where":[["_uuid", "==", ["uuid",
"20c2a046-ae7e-4453-a576-11034db24985"]]]}
In the above case, uuid in "row" aren't replaced by "named-uuid" because
the function doesn't look into elements of lists.
When list/tuple is found, look into elements recursively.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-09-13 13:41:04 +09:00
|
|
|
elif name == "linktest":
|
|
|
|
l1_0 = txn.insert(idl.tables["link1"])
|
|
|
|
l1_0.i = 1
|
|
|
|
l1_0.k = [l1_0]
|
|
|
|
l1_0.ka = [l1_0]
|
|
|
|
l1_1 = txn.insert(idl.tables["link1"])
|
|
|
|
l1_1.i = 2
|
|
|
|
l1_1.k = [l1_0]
|
|
|
|
l1_1.ka = [l1_0, l1_1]
|
2012-09-27 18:29:45 +09:00
|
|
|
elif name == 'getattrtest':
|
|
|
|
l1 = txn.insert(idl.tables["link1"])
|
|
|
|
i = getattr(l1, 'i', 1)
|
|
|
|
assert i == 1
|
|
|
|
l1.i = 2
|
|
|
|
i = getattr(l1, 'i', 1)
|
|
|
|
assert i == 2
|
|
|
|
l1.k = [l1]
|
2011-09-21 10:43:03 -07:00
|
|
|
else:
|
|
|
|
sys.stderr.write("unknown command %s\n" % name)
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
status = txn.commit_block()
|
|
|
|
sys.stdout.write("%03d: commit, status=%s"
|
|
|
|
% (step, ovs.db.idl.Transaction.status_to_string(status)))
|
|
|
|
if increment and status == ovs.db.idl.Transaction.SUCCESS:
|
|
|
|
sys.stdout.write(", increment=%d" % txn.get_increment_new_value())
|
2015-04-25 14:57:44 -05:00
|
|
|
if events:
|
|
|
|
# Event notifications from operations in a single transaction are
|
|
|
|
# not in a gauranteed order due to update messages being dicts
|
|
|
|
sys.stdout.write(", events=" + ", ".join(sorted(events)))
|
2011-09-21 10:43:03 -07:00
|
|
|
sys.stdout.write("\n")
|
|
|
|
sys.stdout.flush()
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2011-09-21 10:43:03 -07:00
|
|
|
def do_idl(schema_file, remote, *commands):
|
2012-03-02 17:50:59 -08:00
|
|
|
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
|
2015-10-07 13:52:11 -07:00
|
|
|
if commands and commands[0].startswith("?"):
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
readonly = {}
|
2015-10-07 13:52:11 -07:00
|
|
|
for x in commands[0][1:].split("?"):
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
readonly = []
|
2015-10-07 13:52:11 -07:00
|
|
|
table, columns = x.split(":")
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
columns = columns.split(",")
|
|
|
|
for index, column in enumerate(columns):
|
|
|
|
if column[-1] == '!':
|
|
|
|
columns[index] = columns[index][:-1]
|
|
|
|
readonly.append(columns[index])
|
|
|
|
schema_helper.register_columns(table, columns, readonly)
|
2015-10-07 13:52:11 -07:00
|
|
|
commands = commands[1:]
|
|
|
|
else:
|
|
|
|
schema_helper.register_all()
|
2012-03-02 17:50:59 -08:00
|
|
|
idl = ovs.db.idl.Idl(remote, schema_helper)
|
2010-08-25 10:26:40 -07:00
|
|
|
|
|
|
|
if commands:
|
|
|
|
error, stream = ovs.stream.Stream.open_block(
|
|
|
|
ovs.stream.Stream.open(remote))
|
|
|
|
if error:
|
|
|
|
sys.stderr.write("failed to connect to \"%s\"" % remote)
|
|
|
|
sys.exit(1)
|
|
|
|
rpc = ovs.jsonrpc.Connection(stream)
|
|
|
|
else:
|
|
|
|
rpc = None
|
|
|
|
|
|
|
|
symtab = {}
|
|
|
|
seqno = 0
|
|
|
|
step = 0
|
|
|
|
for command in commands:
|
|
|
|
if command.startswith("+"):
|
|
|
|
# The previous transaction didn't change anything.
|
|
|
|
command = command[1:]
|
|
|
|
else:
|
|
|
|
# Wait for update.
|
2011-09-21 10:43:03 -07:00
|
|
|
while idl.change_seqno == seqno and not idl.run():
|
2010-08-25 10:26:40 -07:00
|
|
|
rpc.run()
|
|
|
|
|
|
|
|
poller = ovs.poller.Poller()
|
|
|
|
idl.wait(poller)
|
|
|
|
rpc.wait(poller)
|
|
|
|
poller.block()
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
print_idl(idl, step)
|
|
|
|
step += 1
|
|
|
|
|
2011-09-21 10:43:03 -07:00
|
|
|
seqno = idl.change_seqno
|
2010-08-25 10:26:40 -07:00
|
|
|
|
|
|
|
if command == "reconnect":
|
|
|
|
print("%03d: reconnect" % step)
|
2011-09-21 10:43:03 -07:00
|
|
|
sys.stdout.flush()
|
2010-08-25 10:26:40 -07:00
|
|
|
step += 1
|
|
|
|
idl.force_reconnect()
|
|
|
|
elif not command.startswith("["):
|
|
|
|
idl_set(idl, command, step)
|
|
|
|
step += 1
|
|
|
|
else:
|
|
|
|
json = ovs.json.from_string(command)
|
2015-12-14 17:01:11 -05:00
|
|
|
if isinstance(json, six.string_types):
|
2010-08-25 10:26:40 -07:00
|
|
|
sys.stderr.write("\"%s\": %s\n" % (command, json))
|
|
|
|
sys.exit(1)
|
|
|
|
json = substitute_uuids(json, symtab)
|
|
|
|
request = ovs.jsonrpc.Message.create_request("transact", json)
|
|
|
|
error, reply = rpc.transact_block(request)
|
|
|
|
if error:
|
|
|
|
sys.stderr.write("jsonrpc transaction failed: %s"
|
|
|
|
% os.strerror(error))
|
|
|
|
sys.exit(1)
|
2012-02-16 20:26:35 -08:00
|
|
|
elif reply.error is not None:
|
|
|
|
sys.stderr.write("jsonrpc transaction failed: %s"
|
|
|
|
% reply.error)
|
|
|
|
sys.exit(1)
|
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
sys.stdout.write("%03d: " % step)
|
|
|
|
sys.stdout.flush()
|
|
|
|
step += 1
|
|
|
|
if reply.result is not None:
|
|
|
|
parse_uuids(reply.result, symtab)
|
|
|
|
reply.id = None
|
|
|
|
sys.stdout.write("%s\n" % ovs.json.to_string(reply.to_json()))
|
2011-09-21 10:43:03 -07:00
|
|
|
sys.stdout.flush()
|
2010-08-25 10:26:40 -07:00
|
|
|
|
|
|
|
if rpc:
|
|
|
|
rpc.close()
|
2011-09-21 10:43:03 -07:00
|
|
|
while idl.change_seqno == seqno and not idl.run():
|
2010-08-25 10:26:40 -07:00
|
|
|
poller = ovs.poller.Poller()
|
|
|
|
idl.wait(poller)
|
|
|
|
poller.block()
|
|
|
|
print_idl(idl, step)
|
|
|
|
step += 1
|
|
|
|
idl.close()
|
|
|
|
print("%03d: done" % step)
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2016-05-18 18:29:13 +03:00
|
|
|
def do_idl_passive(schema_file, remote, *commands):
|
|
|
|
symtab = {}
|
|
|
|
step = 0
|
|
|
|
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
|
|
|
|
schema_helper.register_all()
|
|
|
|
idl = ovs.db.idl.Idl(remote, schema_helper)
|
|
|
|
|
|
|
|
while idl._session.rpc is None:
|
|
|
|
idl.run()
|
|
|
|
|
|
|
|
rpc = idl._session.rpc
|
|
|
|
|
|
|
|
print_idl(idl, step)
|
|
|
|
step += 1
|
|
|
|
|
|
|
|
for command in commands:
|
|
|
|
json = ovs.json.from_string(command)
|
|
|
|
if isinstance(json, six.string_types):
|
|
|
|
sys.stderr.write("\"%s\": %s\n" % (command, json))
|
|
|
|
sys.exit(1)
|
|
|
|
json = substitute_uuids(json, symtab)
|
|
|
|
request = ovs.jsonrpc.Message.create_request("transact", json)
|
|
|
|
error, reply = rpc.transact_block(request)
|
|
|
|
if error:
|
|
|
|
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
|
|
|
|
if reply.result is not None:
|
|
|
|
parse_uuids(reply.result, symtab)
|
|
|
|
reply.id = None
|
|
|
|
sys.stdout.write("%s\n" % ovs.json.to_string(reply.to_json()))
|
|
|
|
sys.stdout.flush()
|
|
|
|
|
|
|
|
idl.close()
|
|
|
|
print("%03d: done" % step)
|
|
|
|
|
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def usage():
|
2015-12-14 10:21:53 -05:00
|
|
|
print("""\
|
2010-08-25 10:26:40 -07:00
|
|
|
%(program_name)s: test utility for Open vSwitch database Python bindings
|
|
|
|
usage: %(program_name)s [OPTIONS] COMMAND ARG...
|
|
|
|
|
|
|
|
The following commands are supported:
|
|
|
|
default-atoms
|
|
|
|
test ovsdb_atom_default()
|
|
|
|
default-data
|
|
|
|
test ovsdb_datum_default()
|
|
|
|
parse-atomic-type TYPE
|
|
|
|
parse TYPE as OVSDB atomic type, and re-serialize
|
|
|
|
parse-base-type TYPE
|
|
|
|
parse TYPE as OVSDB base type, and re-serialize
|
|
|
|
parse-type JSON
|
|
|
|
parse JSON as OVSDB type, and re-serialize
|
|
|
|
parse-atoms TYPE ATOM...
|
|
|
|
parse JSON ATOMs as atoms of TYPE, and re-serialize
|
|
|
|
parse-atom-strings TYPE ATOM...
|
|
|
|
parse string ATOMs as atoms of given TYPE, and re-serialize
|
|
|
|
sort-atoms TYPE ATOM...
|
|
|
|
print JSON ATOMs in sorted order
|
|
|
|
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
|
2011-03-10 11:15:01 -08:00
|
|
|
parse-table NAME OBJECT [DEFAULT-IS-ROOT]
|
2010-08-25 10:26:40 -07:00
|
|
|
parse table NAME with info OBJECT
|
|
|
|
parse-schema JSON
|
|
|
|
parse JSON as an OVSDB schema, and re-serialize
|
2015-10-07 13:52:11 -07:00
|
|
|
idl SCHEMA SERVER [?T1:C1,C2...[?T2:C1,C2,...]...] [TRANSACTION...]
|
2011-09-21 10:43:03 -07:00
|
|
|
connect to SERVER (which has the specified SCHEMA) and dump the
|
|
|
|
contents of the database as seen initially by the IDL implementation
|
|
|
|
and after executing each TRANSACTION. (Each TRANSACTION must modify
|
2010-08-25 10:26:40 -07:00
|
|
|
the database or this command will hang.)
|
2015-10-07 13:52:11 -07:00
|
|
|
By default, all columns of all tables are monitored. The "?" option
|
|
|
|
can be used to monitor specific Table:Column(s). The table and their
|
|
|
|
columns are listed as a string of the form starting with "?":
|
|
|
|
?<table-name>:<column-name>,<column-name>,...
|
|
|
|
e.g.:
|
|
|
|
?simple:b - Monitor column "b" in table "simple"
|
|
|
|
Entries for multiple tables are seperated by "?":
|
|
|
|
?<table-name>:<column-name>,...?<table-name>:<column-name>,...
|
|
|
|
e.g.:
|
|
|
|
?simple:b?link1:i,k - Monitor column "b" in table "simple",
|
|
|
|
and column "i", "k" in table "link1"
|
ovsdb-idl: Support for readonly columns that are fetched on-demand
There is currently no mechanism in IDL to fetch specific column values
on-demand without having to register them for monitoring. In the case
where the column represent a frequently changing entity (e.g. counter),
and the reads are relatively infrequent (e.g. CLI client), there is a
significant overhead in replication.
This patch adds support in the Python IDL to register a subset of the
columns of a table as "readonly". Readonly columns are not replicated.
Users may "fetch" the readonly columns of a row on-demand. Once fetched,
the columns are not updated until the next fetch by the user. Writes by
the user to readonly columns does not change the value (both locally or
on the server).
The two main user visible changes in this patch are:
- The SchemaHelper.register_columns() method now takes an optionaly
argument to specify the subset of readonly column(s)
- A new Row.fetch(columns) method to fetch values of readonly columns(s)
Usage:
------
# Schema file includes all columns, including readonly
schema_helper = ovs.db.idl.SchemaHelper(schema_file)
# Register interest in columns with 'r' and 's' as readonly
schema_helper.register_columns("simple", [i, r, s], [r, s])
# Create Idl and jsonrpc, and wait for update, as usual
...
# Fetch value of column 'r' for a specific row
row.fetch('r')
txn.commit_block()
print row.r
print getattr(row, 'r')
# Writing to readonly column has no effect (locally or on server)
row.r = 3
print row.r # prints fetched value not 3
Signed-off-by: Shad Ansari <shad.ansari@hp.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
2015-10-22 14:35:24 -07:00
|
|
|
Readonly columns: Suffixing a "!" after a column indicates that the
|
|
|
|
column is to be registered "readonly".
|
|
|
|
e.g.:
|
|
|
|
?simple:i,b! - Register interest in column "i" (monitoring) and
|
|
|
|
column "b" (readonly).
|
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
|
|
|
|
The following options are also available:
|
|
|
|
-t, --timeout=SECS give up after SECS seconds
|
|
|
|
-h, --help display this help message\
|
2015-12-14 10:21:53 -05:00
|
|
|
""" % {'program_name': ovs.util.PROGRAM_NAME})
|
2010-08-25 10:26:40 -07:00
|
|
|
sys.exit(0)
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
def main(argv):
|
|
|
|
try:
|
|
|
|
options, args = getopt.gnu_getopt(argv[1:], 't:h',
|
|
|
|
['timeout',
|
|
|
|
'help'])
|
2016-01-06 13:48:16 -05:00
|
|
|
except getopt.GetoptError as geo:
|
2010-08-25 10:26:40 -07:00
|
|
|
sys.stderr.write("%s: %s\n" % (ovs.util.PROGRAM_NAME, geo.msg))
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
for key, value in options:
|
|
|
|
if key in ['-h', '--help']:
|
|
|
|
usage()
|
|
|
|
elif key in ['-t', '--timeout']:
|
|
|
|
try:
|
|
|
|
timeout = int(value)
|
|
|
|
if timeout < 1:
|
|
|
|
raise TypeError
|
|
|
|
except TypeError:
|
|
|
|
raise error.Error("value %s on -t or --timeout is not at "
|
|
|
|
"least 1" % value)
|
|
|
|
signal.alarm(timeout)
|
|
|
|
else:
|
|
|
|
sys.exit(0)
|
|
|
|
|
|
|
|
if not args:
|
|
|
|
sys.stderr.write("%s: missing command argument "
|
|
|
|
"(use --help for help)\n" % ovs.util.PROGRAM_NAME)
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
commands = {"default-atoms": (do_default_atoms, 0),
|
|
|
|
"default-data": (do_default_data, 0),
|
|
|
|
"parse-atomic-type": (do_parse_atomic_type, 1),
|
|
|
|
"parse-base-type": (do_parse_base_type, 1),
|
|
|
|
"parse-type": (do_parse_type, 1),
|
|
|
|
"parse-atoms": (do_parse_atoms, (2,)),
|
|
|
|
"parse-data": (do_parse_data, (2,)),
|
|
|
|
"sort-atoms": (do_sort_atoms, 2),
|
|
|
|
"parse-column": (do_parse_column, 2),
|
2011-03-10 11:15:01 -08:00
|
|
|
"parse-table": (do_parse_table, (2, 3)),
|
2010-08-25 10:26:40 -07:00
|
|
|
"parse-schema": (do_parse_schema, 1),
|
2016-05-18 18:29:13 +03:00
|
|
|
"idl": (do_idl, (2,)),
|
|
|
|
"idl_passive": (do_idl_passive, (2,))}
|
2010-08-25 10:26:40 -07:00
|
|
|
|
|
|
|
command_name = args[0]
|
|
|
|
args = args[1:]
|
2015-12-22 11:30:32 -05:00
|
|
|
if command_name not in commands:
|
2010-08-25 10:26:40 -07:00
|
|
|
sys.stderr.write("%s: unknown command \"%s\" "
|
|
|
|
"(use --help for help)\n" % (ovs.util.PROGRAM_NAME,
|
|
|
|
command_name))
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
func, n_args = commands[command_name]
|
|
|
|
if type(n_args) == tuple:
|
|
|
|
if len(args) < n_args[0]:
|
|
|
|
sys.stderr.write("%s: \"%s\" requires at least %d arguments but "
|
|
|
|
"only %d provided\n"
|
|
|
|
% (ovs.util.PROGRAM_NAME, command_name,
|
|
|
|
n_args, len(args)))
|
|
|
|
sys.exit(1)
|
|
|
|
elif type(n_args) == int:
|
|
|
|
if len(args) != n_args:
|
|
|
|
sys.stderr.write("%s: \"%s\" requires %d arguments but %d "
|
|
|
|
"provided\n"
|
|
|
|
% (ovs.util.PROGRAM_NAME, command_name,
|
|
|
|
n_args, len(args)))
|
|
|
|
sys.exit(1)
|
|
|
|
else:
|
|
|
|
assert False
|
|
|
|
|
|
|
|
func(*args)
|
|
|
|
|
2011-09-23 23:43:12 -07:00
|
|
|
|
2010-08-25 10:26:40 -07:00
|
|
|
if __name__ == '__main__':
|
|
|
|
try:
|
|
|
|
main(sys.argv)
|
2016-01-06 13:48:16 -05:00
|
|
|
except error.Error as e:
|
2010-08-25 10:26:40 -07:00
|
|
|
sys.stderr.write("%s\n" % e)
|
|
|
|
sys.exit(1)
|