Re: [ovs-dev] [PATCH ovn 1/2] Add ovn-appctl utility
On Wed, Sep 4, 2019 at 11:21 PM Mark Michelson wrote: > On 9/2/19 1:09 PM, nusid...@redhat.com wrote: > > From: Numan Siddique > > > > Now that OVN has it's own rundir, "ovs-appctl -t > ovn-controller/ovn-northd" > > doesn't work. To fix this, ovn-appctl utility is added which > > looks for the OVN pid/ctl files in the ovn rundir. > > > > The code is taken from ovs-appctl.c and modified to use ovn_rundir() > > instead of ovs_rundir(). > > > > Signed-off-by: Numan Siddique > > --- > > rhel/ovn-fedora.spec.in| 2 + > > utilities/.gitignore | 2 + > > utilities/automake.mk | 13 +- > > utilities/ovn-appctl.8.xml | 352 + > > utilities/ovn-appctl.c | 239 + > > utilities/ovn-ctl | 18 +- > > 6 files changed, 615 insertions(+), 11 deletions(-) > > create mode 100644 utilities/ovn-appctl.8.xml > > create mode 100644 utilities/ovn-appctl.c > > > > diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in > > index 14035de9a..9ee807fab 100644 > > --- a/rhel/ovn-fedora.spec.in > > +++ b/rhel/ovn-fedora.spec.in > > @@ -430,6 +430,7 @@ fi > > %{_bindir}/ovn-sbctl > > %{_bindir}/ovn-trace > > %{_bindir}/ovn-detrace > > +%{_bindir}/ovn-appctl > > %{_datadir}/ovn/scripts/ovn-ctl > > %{_datadir}/ovn/scripts/ovn-lib > > %{_datadir}/ovn/scripts/ovndb-servers.ocf > > @@ -440,6 +441,7 @@ fi > > %{_mandir}/man8/ovn-nbctl.8* > > %{_mandir}/man8/ovn-trace.8* > > %{_mandir}/man1/ovn-detrace.1* > > +%{_mandir}/man8/ovn-appctl.8* > > #%{_mandir}/man7/ovn-architecture.7* - Uncomment this once the manpage > is fixed > > %{_mandir}/man8/ovn-sbctl.8* > > #%{_mandir}/man5/ovn-nb.5* - Uncomment this once the manpage is fixed > > diff --git a/utilities/.gitignore b/utilities/.gitignore > > index 1d01e0b28..b319e8366 100644 > > --- a/utilities/.gitignore > > +++ b/utilities/.gitignore > > @@ -3,6 +3,8 @@ > > /ovn-nbctl.8 > > /ovn-sbctl > > /ovn-sbctl.8 > > +/ovn-appctl > > +/ovn-appctl.8 > > /ovn-trace > > /ovn-trace.8 > > /ovn-detrace > > diff --git a/utilities/automake.mk b/utilities/automake.mk > > index 21dd8ccdf..ab0f6003a 100644 > > --- a/utilities/automake.mk > > +++ b/utilities/automake.mk > > @@ -8,7 +8,8 @@ man_MANS += \ > > utilities/ovn-nbctl.8 \ > > utilities/ovn-sbctl.8 \ > > utilities/ovn-trace.8 \ > > -utilities/ovn-detrace.1 > > +utilities/ovn-detrace.1 \ > > +utilities/ovn-appctl.8 > > > > MAN_ROOTS += \ > > utilities/ovn-sbctl.8.in \ > > @@ -27,6 +28,7 @@ EXTRA_DIST += \ > > utilities/ovn-docker-overlay-driver.in \ > > utilities/ovn-docker-underlay-driver.in \ > > utilities/ovn-nbctl.8.xml \ > > +utilities/ovn-appctl.8.xml \ > > utilities/ovn-trace.8.xml \ > > utilities/ovn-detrace.in \ > > utilities/ovndb-servers.ocf \ > > @@ -49,7 +51,9 @@ CLEANFILES += \ > > utilities/ovn-sbctl.8 \ > > utilities/ovn-trace.8 \ > > utilities/ovn-detrace.1 \ > > -utilities/ovn-detrace > > +utilities/ovn-detrace \ > > +utilities/ovn-appctl.8 \ > > +utilities/ovn-appctl > > > > utilities/ovn-lib: $(top_builddir)/config.status > > > > @@ -68,4 +72,9 @@ bin_PROGRAMS += utilities/ovn-trace > > utilities_ovn_trace_SOURCES = utilities/ovn-trace.c > > utilities_ovn_trace_LDADD = lib/libovn.la $(OVSDB_LIBDIR)/libovsdb.la > $(OVS_LIBDIR)/libopenvswitch.la > > > > +# ovn-nbctl > > +bin_PROGRAMS += utilities/ovn-appctl > > +utilities_ovn_appctl_SOURCES = utilities/ovn-appctl.c > > +utilities_ovn_appctl_LDADD = lib/libovn.la $(OVSDB_LIBDIR)/libovsdb.la > $(OVS_LIBDIR)/libopenvswitch.la > > + > > include utilities/bugtool/automake.mk > > diff --git a/utilities/ovn-appctl.8.xml b/utilities/ovn-appctl.8.xml > > new file mode 100644 > > index 0..32a42a766 > > --- /dev/null > > +++ b/utilities/ovn-appctl.8.xml > > @@ -0,0 +1,352 @@ > > + > > + > > +Name > > +ovn-appctl -- utility for configuring running OVN daemons > > + > > +Synopsis > > + > > + ovn-appctl [--target=target | -t target] > > + [-T secs | --timeout=secs] command [arg...] > > + > > +ovn-appctl --help > > +ovn-appctl --version > > + > > +Description > > + > > + OVN daemons accept certain commands at runtime to control their > behavior > > + and query their settings. Every daemon accepts a common set of > commands > > + documented under COMMON COMMANDS below. Some daemons support > additional > > + commands documented in their own manpages. > > + > > + > > + > > + The ovn-appctl program provides a simple way to > invoke > > + these commands. The command to be sent is specified on > > + ovn-appctl's command line as non-option arguments. > > + ovn-appctl sends the command and prints the daemon's > > + response on standard output. > > + > > + > > + > > + ovn-ctl is exactly similar to Open vSwitch > > +
Re: [ovs-dev] [PATCH ovn 1/2] Add ovn-appctl utility
On 9/2/19 1:09 PM, nusid...@redhat.com wrote: From: Numan Siddique Now that OVN has it's own rundir, "ovs-appctl -t ovn-controller/ovn-northd" doesn't work. To fix this, ovn-appctl utility is added which looks for the OVN pid/ctl files in the ovn rundir. The code is taken from ovs-appctl.c and modified to use ovn_rundir() instead of ovs_rundir(). Signed-off-by: Numan Siddique --- rhel/ovn-fedora.spec.in| 2 + utilities/.gitignore | 2 + utilities/automake.mk | 13 +- utilities/ovn-appctl.8.xml | 352 + utilities/ovn-appctl.c | 239 + utilities/ovn-ctl | 18 +- 6 files changed, 615 insertions(+), 11 deletions(-) create mode 100644 utilities/ovn-appctl.8.xml create mode 100644 utilities/ovn-appctl.c diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in index 14035de9a..9ee807fab 100644 --- a/rhel/ovn-fedora.spec.in +++ b/rhel/ovn-fedora.spec.in @@ -430,6 +430,7 @@ fi %{_bindir}/ovn-sbctl %{_bindir}/ovn-trace %{_bindir}/ovn-detrace +%{_bindir}/ovn-appctl %{_datadir}/ovn/scripts/ovn-ctl %{_datadir}/ovn/scripts/ovn-lib %{_datadir}/ovn/scripts/ovndb-servers.ocf @@ -440,6 +441,7 @@ fi %{_mandir}/man8/ovn-nbctl.8* %{_mandir}/man8/ovn-trace.8* %{_mandir}/man1/ovn-detrace.1* +%{_mandir}/man8/ovn-appctl.8* #%{_mandir}/man7/ovn-architecture.7* - Uncomment this once the manpage is fixed %{_mandir}/man8/ovn-sbctl.8* #%{_mandir}/man5/ovn-nb.5* - Uncomment this once the manpage is fixed diff --git a/utilities/.gitignore b/utilities/.gitignore index 1d01e0b28..b319e8366 100644 --- a/utilities/.gitignore +++ b/utilities/.gitignore @@ -3,6 +3,8 @@ /ovn-nbctl.8 /ovn-sbctl /ovn-sbctl.8 +/ovn-appctl +/ovn-appctl.8 /ovn-trace /ovn-trace.8 /ovn-detrace diff --git a/utilities/automake.mk b/utilities/automake.mk index 21dd8ccdf..ab0f6003a 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -8,7 +8,8 @@ man_MANS += \ utilities/ovn-nbctl.8 \ utilities/ovn-sbctl.8 \ utilities/ovn-trace.8 \ -utilities/ovn-detrace.1 +utilities/ovn-detrace.1 \ +utilities/ovn-appctl.8 MAN_ROOTS += \ utilities/ovn-sbctl.8.in \ @@ -27,6 +28,7 @@ EXTRA_DIST += \ utilities/ovn-docker-overlay-driver.in \ utilities/ovn-docker-underlay-driver.in \ utilities/ovn-nbctl.8.xml \ +utilities/ovn-appctl.8.xml \ utilities/ovn-trace.8.xml \ utilities/ovn-detrace.in \ utilities/ovndb-servers.ocf \ @@ -49,7 +51,9 @@ CLEANFILES += \ utilities/ovn-sbctl.8 \ utilities/ovn-trace.8 \ utilities/ovn-detrace.1 \ -utilities/ovn-detrace +utilities/ovn-detrace \ +utilities/ovn-appctl.8 \ +utilities/ovn-appctl utilities/ovn-lib: $(top_builddir)/config.status @@ -68,4 +72,9 @@ bin_PROGRAMS += utilities/ovn-trace utilities_ovn_trace_SOURCES = utilities/ovn-trace.c utilities_ovn_trace_LDADD = lib/libovn.la $(OVSDB_LIBDIR)/libovsdb.la $(OVS_LIBDIR)/libopenvswitch.la +# ovn-nbctl +bin_PROGRAMS += utilities/ovn-appctl +utilities_ovn_appctl_SOURCES = utilities/ovn-appctl.c +utilities_ovn_appctl_LDADD = lib/libovn.la $(OVSDB_LIBDIR)/libovsdb.la $(OVS_LIBDIR)/libopenvswitch.la + include utilities/bugtool/automake.mk diff --git a/utilities/ovn-appctl.8.xml b/utilities/ovn-appctl.8.xml new file mode 100644 index 0..32a42a766 --- /dev/null +++ b/utilities/ovn-appctl.8.xml @@ -0,0 +1,352 @@ + + +Name +ovn-appctl -- utility for configuring running OVN daemons + +Synopsis + + ovn-appctl [--target=target | -t target] + [-T secs | --timeout=secs] command [arg...] + +ovn-appctl --help +ovn-appctl --version + +Description + + OVN daemons accept certain commands at runtime to control their behavior + and query their settings. Every daemon accepts a common set of commands + documented under COMMON COMMANDS below. Some daemons support additional + commands documented in their own manpages. + + + + The ovn-appctl program provides a simple way to invoke + these commands. The command to be sent is specified on + ovn-appctl's command line as non-option arguments. + ovn-appctl sends the command and prints the daemon's + response on standard output. + + + + ovn-ctl is exactly similar to Open vSwitch + ovs-appctl utility. + + +Command Commands + + Every OVN daemon supports a common set of commands, which are documented + in this section. + + +General Commands + + These commands display daemon-specific commands and the running version. + Note that these commands are different from the --help and --version + options that return information about the ovn-appctl + utility itself. + + + + list-commands + +Lists the commands supported by the target. + + + version + +Displays the
Re: [ovs-dev] [PATCH ovn 1/2] Add ovn-appctl utility
Bleep bloop. Greetings Numan Siddique, 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 lacks whitespace around operator WARNING: Line lacks whitespace around operator #555 FILE: utilities/ovn-appctl.c:90: -t, --target=TARGET pidfile or socket to contact\n\ WARNING: Line lacks whitespace around operator #557 FILE: utilities/ovn-appctl.c:92: list-commands List commands supported by the target\n\ WARNING: Line lacks whitespace around operator #559 FILE: utilities/ovn-appctl.c:94: vlog/list List current logging levels\n\ WARNING: Line lacks whitespace around operator WARNING: Line lacks whitespace around operator #560 FILE: utilities/ovn-appctl.c:95: vlog/list-pattern List logging patterns for each destination.\n\ WARNING: Line lacks whitespace around operator #561 FILE: utilities/ovn-appctl.c:96: vlog/set [SPEC]\n\ WARNING: Line lacks whitespace around operator #566 FILE: utilities/ovn-appctl.c:101: vlog/reopenMake the program reopen its log file\n\ WARNING: Line lacks whitespace around operator WARNING: Line lacks whitespace around operator #568 FILE: utilities/ovn-appctl.c:103: --timeout=SECS wait at most SECS seconds for a response\n\ WARNING: Line lacks whitespace around operator #570 FILE: utilities/ovn-appctl.c:105: -V, --version Display ovs-appctl version information\n", WARNING: Line is 113 characters long (recommended limit is 79) #731 FILE: utilities/ovn-ctl:68: ovn-appctl -t $OVN_RUNDIR/ovnnb_db.ctl ovsdb-server/set-active-ovsdb-server `cat $ovnnb_active_conf_file` WARNING: Line is 87 characters long (recommended limit is 79) #732 FILE: utilities/ovn-ctl:69: ovn-appctl -t $OVN_RUNDIR/ovnnb_db.ctl ovsdb-server/connect-active-ovsdb-server WARNING: Line is 113 characters long (recommended limit is 79) #742 FILE: utilities/ovn-ctl:82: ovn-appctl -t $OVN_RUNDIR/ovnsb_db.ctl ovsdb-server/set-active-ovsdb-server `cat $ovnsb_active_conf_file` WARNING: Line is 87 characters long (recommended limit is 79) #743 FILE: utilities/ovn-ctl:83: ovn-appctl -t $OVN_RUNDIR/ovnsb_db.ctl ovsdb-server/connect-active-ovsdb-server WARNING: Line is 86 characters long (recommended limit is 79) #752 FILE: utilities/ovn-ctl:92: ovn-appctl -t $OVN_RUNDIR/ovnnb_db.ctl ovsdb-server/disconnect-active-ovsdb-server WARNING: Line is 86 characters long (recommended limit is 79) #758 FILE: utilities/ovn-ctl:97: ovn-appctl -t $OVN_RUNDIR/ovnsb_db.ctl ovsdb-server/disconnect-active-ovsdb-server WARNING: Line is 98 characters long (recommended limit is 79) #767 FILE: utilities/ovn-ctl:277: ovn-appctl -t $OVN_RUNDIR/ovn${1}_db.ctl ovsdb-server/sync-status | awk '{if(NR==1) print $2}' Lines checked: 773, Warnings: 18, Errors: 0 Please check this out. If you feel there has been an error, please email acon...@redhat.com Thanks, 0-day Robot ___ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
[ovs-dev] [PATCH ovn 1/2] Add ovn-appctl utility
From: Numan Siddique Now that OVN has it's own rundir, "ovs-appctl -t ovn-controller/ovn-northd" doesn't work. To fix this, ovn-appctl utility is added which looks for the OVN pid/ctl files in the ovn rundir. The code is taken from ovs-appctl.c and modified to use ovn_rundir() instead of ovs_rundir(). Signed-off-by: Numan Siddique --- rhel/ovn-fedora.spec.in| 2 + utilities/.gitignore | 2 + utilities/automake.mk | 13 +- utilities/ovn-appctl.8.xml | 352 + utilities/ovn-appctl.c | 239 + utilities/ovn-ctl | 18 +- 6 files changed, 615 insertions(+), 11 deletions(-) create mode 100644 utilities/ovn-appctl.8.xml create mode 100644 utilities/ovn-appctl.c diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in index 14035de9a..9ee807fab 100644 --- a/rhel/ovn-fedora.spec.in +++ b/rhel/ovn-fedora.spec.in @@ -430,6 +430,7 @@ fi %{_bindir}/ovn-sbctl %{_bindir}/ovn-trace %{_bindir}/ovn-detrace +%{_bindir}/ovn-appctl %{_datadir}/ovn/scripts/ovn-ctl %{_datadir}/ovn/scripts/ovn-lib %{_datadir}/ovn/scripts/ovndb-servers.ocf @@ -440,6 +441,7 @@ fi %{_mandir}/man8/ovn-nbctl.8* %{_mandir}/man8/ovn-trace.8* %{_mandir}/man1/ovn-detrace.1* +%{_mandir}/man8/ovn-appctl.8* #%{_mandir}/man7/ovn-architecture.7* - Uncomment this once the manpage is fixed %{_mandir}/man8/ovn-sbctl.8* #%{_mandir}/man5/ovn-nb.5* - Uncomment this once the manpage is fixed diff --git a/utilities/.gitignore b/utilities/.gitignore index 1d01e0b28..b319e8366 100644 --- a/utilities/.gitignore +++ b/utilities/.gitignore @@ -3,6 +3,8 @@ /ovn-nbctl.8 /ovn-sbctl /ovn-sbctl.8 +/ovn-appctl +/ovn-appctl.8 /ovn-trace /ovn-trace.8 /ovn-detrace diff --git a/utilities/automake.mk b/utilities/automake.mk index 21dd8ccdf..ab0f6003a 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -8,7 +8,8 @@ man_MANS += \ utilities/ovn-nbctl.8 \ utilities/ovn-sbctl.8 \ utilities/ovn-trace.8 \ -utilities/ovn-detrace.1 +utilities/ovn-detrace.1 \ +utilities/ovn-appctl.8 MAN_ROOTS += \ utilities/ovn-sbctl.8.in \ @@ -27,6 +28,7 @@ EXTRA_DIST += \ utilities/ovn-docker-overlay-driver.in \ utilities/ovn-docker-underlay-driver.in \ utilities/ovn-nbctl.8.xml \ +utilities/ovn-appctl.8.xml \ utilities/ovn-trace.8.xml \ utilities/ovn-detrace.in \ utilities/ovndb-servers.ocf \ @@ -49,7 +51,9 @@ CLEANFILES += \ utilities/ovn-sbctl.8 \ utilities/ovn-trace.8 \ utilities/ovn-detrace.1 \ -utilities/ovn-detrace +utilities/ovn-detrace \ +utilities/ovn-appctl.8 \ +utilities/ovn-appctl utilities/ovn-lib: $(top_builddir)/config.status @@ -68,4 +72,9 @@ bin_PROGRAMS += utilities/ovn-trace utilities_ovn_trace_SOURCES = utilities/ovn-trace.c utilities_ovn_trace_LDADD = lib/libovn.la $(OVSDB_LIBDIR)/libovsdb.la $(OVS_LIBDIR)/libopenvswitch.la +# ovn-nbctl +bin_PROGRAMS += utilities/ovn-appctl +utilities_ovn_appctl_SOURCES = utilities/ovn-appctl.c +utilities_ovn_appctl_LDADD = lib/libovn.la $(OVSDB_LIBDIR)/libovsdb.la $(OVS_LIBDIR)/libopenvswitch.la + include utilities/bugtool/automake.mk diff --git a/utilities/ovn-appctl.8.xml b/utilities/ovn-appctl.8.xml new file mode 100644 index 0..32a42a766 --- /dev/null +++ b/utilities/ovn-appctl.8.xml @@ -0,0 +1,352 @@ + + +Name +ovn-appctl -- utility for configuring running OVN daemons + +Synopsis + + ovn-appctl [--target=target | -t target] + [-T secs | --timeout=secs] command [arg...] + +ovn-appctl --help +ovn-appctl --version + +Description + + OVN daemons accept certain commands at runtime to control their behavior + and query their settings. Every daemon accepts a common set of commands + documented under COMMON COMMANDS below. Some daemons support additional + commands documented in their own manpages. + + + + The ovn-appctl program provides a simple way to invoke + these commands. The command to be sent is specified on + ovn-appctl's command line as non-option arguments. + ovn-appctl sends the command and prints the daemon's + response on standard output. + + + + ovn-ctl is exactly similar to Open vSwitch + ovs-appctl utility. + + +Command Commands + + Every OVN daemon supports a common set of commands, which are documented + in this section. + + +General Commands + + These commands display daemon-specific commands and the running version. + Note that these commands are different from the --help and --version + options that return information about the ovn-appctl + utility itself. + + + + list-commands + +Lists the commands supported by the target. + + + version + +Displays the version and compilation date of the target. + + + +Logging Commands + + OVN