Looks good.
Ethan
On Tue, Oct 18, 2011 at 09:30, Ben Pfaff <b...@nicira.com> wrote:
> Initial versions of commit 8cdf034974 "python: Implement write support in
> Python IDL for OVSDB" converted the OVSDB schemas to Python code so that
> their Python clients could just import them. The final version instead
> read the schemas from a file, but I forgot to remove some code that
> generated the Python schema modules. This commit removes that code.
>
> Reported-by: Ethan Jackson <et...@nicira.com>
> ---
> ovsdb/automake.mk | 5 +----
> ovsdb/ovsdb-idlc.in | 18 +-----------------
> tests/automake.mk | 9 +--------
> 3 files changed, 3 insertions(+), 29 deletions(-)
>
> diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
> index 5d0b6d7..b0ee8c9 100644
> --- a/ovsdb/automake.mk
> +++ b/ovsdb/automake.mk
> @@ -67,7 +67,7 @@ EXTRA_DIST += \
> ovsdb/ovsdb-idlc.in \
> ovsdb/ovsdb-idlc.1
> DISTCLEANFILES += ovsdb/ovsdb-idlc
> -SUFFIXES += .ovsidl .ovsschema .py
> +SUFFIXES += .ovsidl .ovsschema
> OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
> .ovsidl.c:
> $(OVSDB_IDLC) c-idl-source $< > $@.tmp
> @@ -75,9 +75,6 @@ OVSDB_IDLC = $(run_python) $(srcdir)/ovsdb/ovsdb-idlc.in
> .ovsidl.h:
> $(OVSDB_IDLC) c-idl-header $< > $@.tmp
> mv $@.tmp $@
> -.ovsschema.py:
> - $(OVSDB_IDLC) python-module $< > $@.tmp
> - mv $@.tmp $@
>
> EXTRA_DIST += $(OVSIDL_BUILT)
> BUILT_SOURCES += $(OVSIDL_BUILT)
> diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
> index 4e40288..d711541 100755
> --- a/ovsdb/ovsdb-idlc.in
> +++ b/ovsdb/ovsdb-idlc.in
> @@ -548,20 +548,6 @@ void
> print " %s_columns_init();" % structName
> print "}"
>
> -def print_python_module(schema_file):
> - schema =
> ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schema_file))
> - print """\
> -# Generated automatically -- do not modify! -*- buffer-read-only: t -*-
> -
> -import ovs.db.schema
> -import ovs.json
> -
> -__schema_json = \"\"\"
> -%s
> -\"\"\"
> -
> -schema =
> ovs.db.schema.DbSchema.from_json(ovs.json.from_string(__schema_json))
> -""" % ovs.json.to_string(schema.to_json(), pretty=True)
>
> def ovsdb_escape(string):
> def escape(match):
> @@ -593,7 +579,6 @@ The following commands are supported:
> annotate SCHEMA ANNOTATIONS print SCHEMA combined with ANNOTATIONS
> c-idl-header IDL print C header file for IDL
> c-idl-source IDL print C source file for IDL implementation
> - python-module IDL print Python module for IDL
> nroff IDL print schema documentation in nroff format
>
> The following options are also available:
> @@ -632,8 +617,7 @@ if __name__ == "__main__":
>
> commands = {"annotate": (annotateSchema, 2),
> "c-idl-header": (printCIDLHeader, 1),
> - "c-idl-source": (printCIDLSource, 1),
> - "python-module": (print_python_module, 1)}
> + "c-idl-source": (printCIDLSource, 1)}
>
> if not args[0] in commands:
> sys.stderr.write("%s: unknown command \"%s\" "
> diff --git a/tests/automake.mk b/tests/automake.mk
> index 54c0c99..dcd7f97 100644
> --- a/tests/automake.mk
> +++ b/tests/automake.mk
> @@ -282,22 +282,15 @@ EXTRA_DIST += tests/uuidfilt.pl
> tests/ovsdb-monitor-sort.pl
> tests_test_ovsdb_LDADD = ovsdb/libovsdb.a lib/libopenvswitch.a $(SSL_LIBS)
>
> # idltest schema and IDL
> -OVSIDL_BUILT += \
> - tests/idltest.c \
> - tests/idltest.h \
> - tests/idltest.ovsidl \
> - tests/idltest.py
> +OVSIDL_BUILT += tests/idltest.c tests/idltest.h tests/idltest.ovsidl
> IDLTEST_IDL_FILES = tests/idltest.ovsschema tests/idltest.ann
> EXTRA_DIST += $(IDLTEST_IDL_FILES)
> -CLEANFILES += tests/idltest.pyc tests/idltest.pyo
> tests/idltest.ovsidl: $(IDLTEST_IDL_FILES)
> $(OVSDB_IDLC) -C $(srcdir) annotate $(IDLTEST_IDL_FILES) > $@.tmp
> mv $@.tmp $@
>
> tests/idltest.c: tests/idltest.h
>
> -noinst_SCRIPTS += tests/idltest.py
> -
> noinst_PROGRAMS += tests/test-reconnect
> tests_test_reconnect_SOURCES = tests/test-reconnect.c
> tests_test_reconnect_LDADD = lib/libopenvswitch.a
> --
> 1.7.4.4
>
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
