Re: [ovs-dev] [PATCH ovn v2 02/13] ovn-inb: Interconnection northbound DB schema and CLI.
On Tue, Nov 12, 2019 at 4:24 AM Numan Siddique wrote: > > This patch has some whitespace warning when applying the patch. > > Applying: ovn-inb: Interconnection northbound DB schema and CLI. > .git/rebase-apply/patch:167: new blank line at EOF. > + > warning: 1 line adds whitespace errors. > It is caused by the extra line at the end of lib/automake.mk. It seem checkpatch can't catch such warning. I will fix in next version. ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Re: [ovs-dev] [PATCH ovn v2 02/13] ovn-inb: Interconnection northbound DB schema and CLI.
This patch has some whitespace warning when applying the patch.
Applying: ovn-inb: Interconnection northbound DB schema and CLI.
.git/rebase-apply/patch:167: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
On Thu, Oct 31, 2019 at 2:45 AM Han Zhou wrote:
>
> This patch introduces OVN_IC_Northbound DB schema and the CLI
> ovn-inbctl that manages the DB.
>
> Signed-off-by: Han Zhou
> ---
> .gitignore | 3 +
> automake.mk| 37 ++
> debian/ovn-common.install | 1 +
> debian/ovn-common.manpages | 2 +
> lib/.gitignore | 3 +
> lib/automake.mk| 17 +-
> lib/ovn-inb-idl.ann| 9 +
> lib/ovn-util.c | 13 +
> lib/ovn-util.h | 1 +
> ovn-inb.ovsschema | 75
> ovn-inb.xml| 371 ++
> tests/automake.mk | 2 +
> tests/ovn-inbctl.at| 65
> tests/testsuite.at | 1 +
> utilities/.gitignore | 2 +
> utilities/automake.mk | 8 +
> utilities/ovn-inbctl.8.xml | 174 +
> utilities/ovn-inbctl.c | 948
> +
> 18 files changed, 1731 insertions(+), 1 deletion(-)
> create mode 100644 lib/ovn-inb-idl.ann
> create mode 100644 ovn-inb.ovsschema
> create mode 100644 ovn-inb.xml
> create mode 100644 tests/ovn-inbctl.at
> create mode 100644 utilities/ovn-inbctl.8.xml
> create mode 100644 utilities/ovn-inbctl.c
>
> diff --git a/.gitignore b/.gitignore
> index 6fee075..1994937 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -67,6 +67,9 @@
> /ovn-sb.5
> /ovn-sb.gv
> /ovn-sb.pic
> +/ovn-inb.5
> +/ovn-inb.gv
> +/ovn-inb.pic
> /package.m4
> /stamp-h1
> /_build-gcc
> diff --git a/automake.mk b/automake.mk
> index ad801f1..3bfbf57 100644
> --- a/automake.mk
> +++ b/automake.mk
> @@ -66,6 +66,36 @@ ovn-sb.5: \
> $(srcdir)/ovn-sb.xml > $@.tmp && \
> mv $@.tmp $@
>
> +# OVN interconnection northbound E-R diagram
> +#
> +# If "python" or "dot" is not available, then we do not add graphical diagram
> +# to the documentation.
> +if HAVE_PYTHON
> +if HAVE_DOT
> +ovn-inb.gv: ${OVSDIR}/ovsdb/ovsdb-dot.in $(srcdir)/ovn-inb.ovsschema
> + $(AM_V_GEN)$(OVSDB_DOT) --no-arrows $(srcdir)/ovn-inb.ovsschema > $@
> +ovn-inb.pic: ovn-inb.gv ${OVSDIR}/ovsdb/dot2pic
> + $(AM_V_GEN)(dot -T plain < ovn-inb.gv | $(PYTHON)
> ${OVSDIR}/ovsdb/dot2pic -f 3) > $@.tmp && \
> + mv $@.tmp $@
> +OVN_INB_PIC = ovn-inb.pic
> +OVN_INB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_INB_PIC)
> +CLEANFILES += ovn-inb.gv ovn-inb.pic
> +endif
> +endif
> +
> +# OVN interconnection northbound schema documentation
> +EXTRA_DIST += ovn-inb.xml
> +CLEANFILES += ovn-inb.5
> +man_MANS += ovn-inb.5
> +
> +ovn-inb.5: \
> + ${OVSDIR}/ovsdb/ovsdb-doc $(srcdir)/ovn-inb.xml
> $(srcdir)/ovn-inb.ovsschema $(OVN_INB_PIC)
> + $(AM_V_GEN)$(OVSDB_DOC) \
> + $(OVN_INB_DOT_DIAGRAM_ARG) \
> + --version=$(VERSION) \
> + $(srcdir)/ovn-inb.ovsschema \
> + $(srcdir)/ovn-inb.xml > $@.tmp && \
> + mv $@.tmp $@
>
> # Version checking for ovn-nb.ovsschema.
> ALL_LOCAL += ovn-nb.ovsschema.stamp
> @@ -78,7 +108,14 @@ ALL_LOCAL += ovn-sb.ovsschema.stamp
> ovn-sb.ovsschema.stamp: ovn-sb.ovsschema
> $(srcdir)/build-aux/cksum-schema-check $? $@
>
> +# Version checking for ovn-inb.ovsschema.
> +ALL_LOCAL += ovn-inb.ovsschema.stamp
> +ovn-inb.ovsschema.stamp: ovn-inb.ovsschema
> + $(srcdir)/build-aux/cksum-schema-check $? $@
> +CLEANFILES += ovn-inb.ovsschema.stamp
> +
> pkgdata_DATA += ovn-nb.ovsschema
> pkgdata_DATA += ovn-sb.ovsschema
> +pkgdata_DATA += ovn-inb.ovsschema
>
> CLEANFILES += ovn-sb.ovsschema.stamp
> diff --git a/debian/ovn-common.install b/debian/ovn-common.install
> index 90484d2..9e9bcfb 100644
> --- a/debian/ovn-common.install
> +++ b/debian/ovn-common.install
> @@ -1,5 +1,6 @@
> usr/bin/ovn-nbctl
> usr/bin/ovn-sbctl
> +usr/bin/ovn-inbctl
> usr/bin/ovn-trace
> usr/bin/ovn-detrace
> usr/share/openvswitch/scripts/ovn-ctl
> diff --git a/debian/ovn-common.manpages b/debian/ovn-common.manpages
> index 249349e..94325dd 100644
> --- a/debian/ovn-common.manpages
> +++ b/debian/ovn-common.manpages
> @@ -1,8 +1,10 @@
> ovn/ovn-architecture.7
> ovn/ovn-nb.5
> ovn/ovn-sb.5
> +ovn/ovn-inb.5
> ovn/utilities/ovn-ctl.8
> ovn/utilities/ovn-nbctl.8
> ovn/utilities/ovn-sbctl.8
> +ovn/utilities/ovn-inbctl.8
> ovn/utilities/ovn-trace.8
> ovn/utilities/ovn-detrace.1
> diff --git a/lib/.gitignore b/lib/.gitignore
> index 3eed458..e5d9bf3 100644
> --- a/lib/.gitignore
> +++ b/lib/.gitignore
> @@ -5,4 +5,7 @@
> /ovn-sb-idl.c
> /ovn-sb-idl.h
> /ovn-sb-idl.ovsidl
> +/ovn-inb-idl.c
> +/ovn-inb-idl.h
> +/ovn-inb-idl.ovsidl
> /ovn-dirs.c
> diff --git a/lib/automake.mk b/lib/automake.mk
> index 0c8245c..83fdbcd 100644
> --- a/lib/automake.mk
> +++ b/lib/automake.mk
> @@ -29,7 +29,9 @@
Re: [ovs-dev] [PATCH ovn v2 02/13] ovn-inb: Interconnection northbound DB schema and CLI.
Bleep bloop. Greetings Han Zhou, I am a robot and I have tried out your patch.
Thanks for your contribution.
I encountered some error that I wasn't expecting. See the details below.
checkpatch:
WARNING: Line is 85 characters long (recommended limit is 79)
#349 FILE: ovn-inb.xml:35:
Northbound configuration for OVN interconnection. This table must have
exactly
WARNING: Line is 80 characters long (recommended limit is 79)
#381 FILE: ovn-inb.xml:67:
Each row represents one transit logical switch for interconnection between
WARNING: Line is 82 characters long (recommended limit is 79)
#473 FILE: ovn-inb.xml:159:
ssl:host[:port]
WARNING: Line is 81 characters long (recommended limit is 79)
#480 FILE: ovn-inb.xml:166:
specified via command-line options or the
table.
WARNING: Line is 82 characters long (recommended limit is 79)
#491 FILE: ovn-inb.xml:177:
tcp:host[:port]
WARNING: Line is 84 characters long (recommended limit is 79)
#497 FILE: ovn-inb.xml:183:
address, wrap it in square brackets, e.g.
tcp:[::1]:6640.
WARNING: Line is 85 characters long (recommended limit is 79)
#503 FILE: ovn-inb.xml:189:
pssl:[port][:host]
WARNING: Line is 80 characters long (recommended limit is 79)
#515 FILE: ovn-inb.xml:201:
A valid SSL configuration must be provided when this form is used,
WARNING: Line is 85 characters long (recommended limit is 79)
#527 FILE: ovn-inb.xml:213:
ptcp:[port][:host]
WARNING: Line is 110 characters long (recommended limit is 79)
#602 FILE: ovn-inb.xml:288:
type='{"type": "string", "enum": ["set", ["VOID", "BACKOFF",
"CONNECTING", "ACTIVE", "IDLE"]]}'>
WARNING: Line is 94 characters long (recommended limit is 79)
#851 FILE: utilities/ovn-inbctl.8.xml:4:
ovn-inbctl -- Open Virtual Network interconnection northbound db
management utility
WARNING: Line is 94 characters long (recommended limit is 79)
#854 FILE: utilities/ovn-inbctl.8.xml:7:
ovn-inbctl [options] command
[arg...]
WARNING: Line is 90 characters long (recommended limit is 79)
#857 FILE: utilities/ovn-inbctl.8.xml:10:
This utility can be used to manage the OVN interconnection northbound
database.
WARNING: Line is 81 characters long (recommended limit is 79)
#903 FILE: utilities/ovn-inbctl.8.xml:56:
These commands query and modify the contents of ovsdb
tables.
WARNING: Line is 90 characters long (recommended limit is 79)
#905 FILE: utilities/ovn-inbctl.8.xml:58:
as such they operate at a lower level than other ovn-inbctl
commands.
WARNING: Line is 82 characters long (recommended limit is 79)
#907 FILE: utilities/ovn-inbctl.8.xml:60:
Each of these commands has a table parameter to identify a
table
WARNING: Line is 87 characters long (recommended limit is 79)
#931 FILE: utilities/ovn-inbctl.8.xml:84:
http://www.w3.org/2003/XInclude"/>
WARNING: Line is 114 characters long (recommended limit is 79)
#945 FILE: utilities/ovn-inbctl.8.xml:98:
[--inactivity-probe=msecs]
set-connection target...
WARNING: Line is 80 characters long (recommended limit is 79)
#948 FILE: utilities/ovn-inbctl.8.xml:101:
--inactivity-probe=msecs to override the default
WARNING: Line is 83 characters long (recommended limit is 79)
#949 FILE: utilities/ovn-inbctl.8.xml:102:
idle connection inactivity probe time. Use 0 to disable inactivity
probes.
WARNING: Line is 83 characters long (recommended limit is 79)
#980 FILE: utilities/ovn-inbctl.8.xml:133:
Otherwise, the default is unix:@RUNDIR@/ovninb_db.sock, but
this
WARNING: Line is 80 characters long (recommended limit is 79)
#992 FILE: utilities/ovn-inbctl.8.xml:145:
--no-leader-only, ovn-inbctl will use any server
WARNING: Line is 80 characters long (recommended limit is 79)
#1002 FILE: utilities/ovn-inbctl.8.xml:155:
http://www.w3.org/2003/XInclude"/>
WARNING: Line is 81 characters long (recommended limit is 79)
#1007 FILE: utilities/ovn-inbctl.8.xml:160:
http://www.w3.org/2003/XInclude"/>
WARNING: Line is 89 characters long (recommended limit is 79)
#1015 FILE: utilities/ovn-inbctl.8.xml:168:
http://www.w3.org/2003/XInclude"/>
WARNING: Line is 82 characters long (recommended limit is 79)
#1019 FILE: utilities/ovn-inbctl.8.xml:172:
http://www.w3.org/2003/XInclude"/>
WARNING: Line lacks whitespace around operator
#1331 FILE: utilities/ovn-inbctl.c:304:
ts-add SWITCH create a transit switch named SWITCH\n\
WARNING: Line lacks whitespace around operator
#1332 FILE: utilities/ovn-inbctl.c:305:
ts-del SWITCH delete SWITCH\n\
WARNING: Line lacks whitespace around operator
#1333 FILE: utilities/ovn-inbctl.c:306:
ts-listprint all transit switches\n\
WARNING: Line lacks whitespace around operator
#1336 FILE: utilities/ovn-inbctl.c:309:
get-connection print the connections\n\
WARNING: Line lacks whitespace around operator
#1337
[ovs-dev] [PATCH ovn v2 02/13] ovn-inb: Interconnection northbound DB schema and CLI.
This patch introduces OVN_IC_Northbound DB schema and the CLI
ovn-inbctl that manages the DB.
Signed-off-by: Han Zhou
---
.gitignore | 3 +
automake.mk| 37 ++
debian/ovn-common.install | 1 +
debian/ovn-common.manpages | 2 +
lib/.gitignore | 3 +
lib/automake.mk| 17 +-
lib/ovn-inb-idl.ann| 9 +
lib/ovn-util.c | 13 +
lib/ovn-util.h | 1 +
ovn-inb.ovsschema | 75
ovn-inb.xml| 371 ++
tests/automake.mk | 2 +
tests/ovn-inbctl.at| 65
tests/testsuite.at | 1 +
utilities/.gitignore | 2 +
utilities/automake.mk | 8 +
utilities/ovn-inbctl.8.xml | 174 +
utilities/ovn-inbctl.c | 948 +
18 files changed, 1731 insertions(+), 1 deletion(-)
create mode 100644 lib/ovn-inb-idl.ann
create mode 100644 ovn-inb.ovsschema
create mode 100644 ovn-inb.xml
create mode 100644 tests/ovn-inbctl.at
create mode 100644 utilities/ovn-inbctl.8.xml
create mode 100644 utilities/ovn-inbctl.c
diff --git a/.gitignore b/.gitignore
index 6fee075..1994937 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,9 @@
/ovn-sb.5
/ovn-sb.gv
/ovn-sb.pic
+/ovn-inb.5
+/ovn-inb.gv
+/ovn-inb.pic
/package.m4
/stamp-h1
/_build-gcc
diff --git a/automake.mk b/automake.mk
index ad801f1..3bfbf57 100644
--- a/automake.mk
+++ b/automake.mk
@@ -66,6 +66,36 @@ ovn-sb.5: \
$(srcdir)/ovn-sb.xml > $@.tmp && \
mv $@.tmp $@
+# OVN interconnection northbound E-R diagram
+#
+# If "python" or "dot" is not available, then we do not add graphical diagram
+# to the documentation.
+if HAVE_PYTHON
+if HAVE_DOT
+ovn-inb.gv: ${OVSDIR}/ovsdb/ovsdb-dot.in $(srcdir)/ovn-inb.ovsschema
+ $(AM_V_GEN)$(OVSDB_DOT) --no-arrows $(srcdir)/ovn-inb.ovsschema > $@
+ovn-inb.pic: ovn-inb.gv ${OVSDIR}/ovsdb/dot2pic
+ $(AM_V_GEN)(dot -T plain < ovn-inb.gv | $(PYTHON)
${OVSDIR}/ovsdb/dot2pic -f 3) > $@.tmp && \
+ mv $@.tmp $@
+OVN_INB_PIC = ovn-inb.pic
+OVN_INB_DOT_DIAGRAM_ARG = --er-diagram=$(OVN_INB_PIC)
+CLEANFILES += ovn-inb.gv ovn-inb.pic
+endif
+endif
+
+# OVN interconnection northbound schema documentation
+EXTRA_DIST += ovn-inb.xml
+CLEANFILES += ovn-inb.5
+man_MANS += ovn-inb.5
+
+ovn-inb.5: \
+ ${OVSDIR}/ovsdb/ovsdb-doc $(srcdir)/ovn-inb.xml
$(srcdir)/ovn-inb.ovsschema $(OVN_INB_PIC)
+ $(AM_V_GEN)$(OVSDB_DOC) \
+ $(OVN_INB_DOT_DIAGRAM_ARG) \
+ --version=$(VERSION) \
+ $(srcdir)/ovn-inb.ovsschema \
+ $(srcdir)/ovn-inb.xml > $@.tmp && \
+ mv $@.tmp $@
# Version checking for ovn-nb.ovsschema.
ALL_LOCAL += ovn-nb.ovsschema.stamp
@@ -78,7 +108,14 @@ ALL_LOCAL += ovn-sb.ovsschema.stamp
ovn-sb.ovsschema.stamp: ovn-sb.ovsschema
$(srcdir)/build-aux/cksum-schema-check $? $@
+# Version checking for ovn-inb.ovsschema.
+ALL_LOCAL += ovn-inb.ovsschema.stamp
+ovn-inb.ovsschema.stamp: ovn-inb.ovsschema
+ $(srcdir)/build-aux/cksum-schema-check $? $@
+CLEANFILES += ovn-inb.ovsschema.stamp
+
pkgdata_DATA += ovn-nb.ovsschema
pkgdata_DATA += ovn-sb.ovsschema
+pkgdata_DATA += ovn-inb.ovsschema
CLEANFILES += ovn-sb.ovsschema.stamp
diff --git a/debian/ovn-common.install b/debian/ovn-common.install
index 90484d2..9e9bcfb 100644
--- a/debian/ovn-common.install
+++ b/debian/ovn-common.install
@@ -1,5 +1,6 @@
usr/bin/ovn-nbctl
usr/bin/ovn-sbctl
+usr/bin/ovn-inbctl
usr/bin/ovn-trace
usr/bin/ovn-detrace
usr/share/openvswitch/scripts/ovn-ctl
diff --git a/debian/ovn-common.manpages b/debian/ovn-common.manpages
index 249349e..94325dd 100644
--- a/debian/ovn-common.manpages
+++ b/debian/ovn-common.manpages
@@ -1,8 +1,10 @@
ovn/ovn-architecture.7
ovn/ovn-nb.5
ovn/ovn-sb.5
+ovn/ovn-inb.5
ovn/utilities/ovn-ctl.8
ovn/utilities/ovn-nbctl.8
ovn/utilities/ovn-sbctl.8
+ovn/utilities/ovn-inbctl.8
ovn/utilities/ovn-trace.8
ovn/utilities/ovn-detrace.1
diff --git a/lib/.gitignore b/lib/.gitignore
index 3eed458..e5d9bf3 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -5,4 +5,7 @@
/ovn-sb-idl.c
/ovn-sb-idl.h
/ovn-sb-idl.ovsidl
+/ovn-inb-idl.c
+/ovn-inb-idl.h
+/ovn-inb-idl.ovsidl
/ovn-dirs.c
diff --git a/lib/automake.mk b/lib/automake.mk
index 0c8245c..83fdbcd 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -29,7 +29,9 @@ nodist_lib_libovn_la_SOURCES = \
lib/ovn-nb-idl.c \
lib/ovn-nb-idl.h \
lib/ovn-sb-idl.c \
- lib/ovn-sb-idl.h
+ lib/ovn-sb-idl.h \
+ lib/ovn-inb-idl.c \
+ lib/ovn-inb-idl.h
CLEANFILES += $(nodist_lib_libovn_la_SOURCES)
@@ -74,3 +76,16 @@ lib/ovn-nb-idl.ovsidl: $(OVN_NB_IDL_FILES)
$(AM_V_GEN)$(OVSDB_IDLC) annotate $(OVN_NB_IDL_FILES) > $@.tmp && \
mv $@.tmp $@
+# ovn-inb IDL
+OVSIDL_BUILT += \
+ lib/ovn-inb-idl.c \
+ lib/ovn-inb-idl.h \
+ lib/ovn-inb-idl.ovsidl
+EXTRA_DIST +=
