Introducing new query calling practice: - single line query called directly from plugin xml - multiple line query saved as script and the script is called from plugin xml
Signed-off-by: David Patrik Pinter <[email protected]> --- utilities/bugtool/automake.mk | 12 +----------- utilities/bugtool/ovs-bugtool-bfd-show | 19 ------------------- utilities/bugtool/ovs-bugtool-bond-show | 19 ------------------- utilities/bugtool/ovs-bugtool-cfm-show | 19 ------------------- utilities/bugtool/ovs-bugtool-conntrack-dump | 19 ------------------- utilities/bugtool/ovs-bugtool-coverage-show | 19 ------------------- utilities/bugtool/ovs-bugtool-lacp-show | 19 ------------------- utilities/bugtool/ovs-bugtool-list-dbs | 19 ------------------- utilities/bugtool/ovs-bugtool-memory-show | 19 ------------------- utilities/bugtool/ovs-bugtool-ovsdb-dump | 19 ------------------- utilities/bugtool/ovs-bugtool-vsctl-show | 19 ------------------- .../bugtool/plugins/network-status/openvswitch.xml | 20 ++++++++++---------- 12 files changed, 11 insertions(+), 211 deletions(-) delete mode 100755 utilities/bugtool/ovs-bugtool-bfd-show delete mode 100755 utilities/bugtool/ovs-bugtool-bond-show delete mode 100755 utilities/bugtool/ovs-bugtool-cfm-show delete mode 100644 utilities/bugtool/ovs-bugtool-conntrack-dump delete mode 100755 utilities/bugtool/ovs-bugtool-coverage-show delete mode 100755 utilities/bugtool/ovs-bugtool-lacp-show delete mode 100755 utilities/bugtool/ovs-bugtool-list-dbs delete mode 100755 utilities/bugtool/ovs-bugtool-memory-show delete mode 100755 utilities/bugtool/ovs-bugtool-ovsdb-dump delete mode 100755 utilities/bugtool/ovs-bugtool-vsctl-show diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk index 5097f2b..f9776a0 100644 --- a/utilities/bugtool/automake.mk +++ b/utilities/bugtool/automake.mk @@ -14,21 +14,11 @@ bugtool_plugins = \ utilities/bugtool/plugins/system-configuration/openvswitch.xml bugtool_scripts = \ - utilities/bugtool/ovs-bugtool-bfd-show \ - utilities/bugtool/ovs-bugtool-cfm-show \ - utilities/bugtool/ovs-bugtool-coverage-show \ utilities/bugtool/ovs-bugtool-fdb-show \ - utilities/bugtool/ovs-bugtool-lacp-show \ - utilities/bugtool/ovs-bugtool-list-dbs \ - utilities/bugtool/ovs-bugtool-memory-show \ utilities/bugtool/ovs-bugtool-tc-class-show \ - utilities/bugtool/ovs-bugtool-vsctl-show \ - utilities/bugtool/ovs-bugtool-ovsdb-dump \ utilities/bugtool/ovs-bugtool-daemons-ver \ utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \ - utilities/bugtool/ovs-bugtool-ovs-appctl-dpif \ - utilities/bugtool/ovs-bugtool-bond-show \ - utilities/bugtool/ovs-bugtool-conntrack-dump + utilities/bugtool/ovs-bugtool-ovs-appctl-dpif scripts_SCRIPTS += $(bugtool_scripts) diff --git a/utilities/bugtool/ovs-bugtool-bfd-show b/utilities/bugtool/ovs-bugtool-bfd-show deleted file mode 100755 index 0173595..0000000 --- a/utilities/bugtool/ovs-bugtool-bfd-show +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2013 Nicira, Inc. - -ovs-appctl bfd/show diff --git a/utilities/bugtool/ovs-bugtool-bond-show b/utilities/bugtool/ovs-bugtool-bond-show deleted file mode 100755 index 86ec97f..0000000 --- a/utilities/bugtool/ovs-bugtool-bond-show +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2012 Nicira, Inc. - -ovs-appctl bond/show diff --git a/utilities/bugtool/ovs-bugtool-cfm-show b/utilities/bugtool/ovs-bugtool-cfm-show deleted file mode 100755 index ccc058b..0000000 --- a/utilities/bugtool/ovs-bugtool-cfm-show +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2011 Nicira, Inc. - -ovs-appctl cfm/show diff --git a/utilities/bugtool/ovs-bugtool-conntrack-dump b/utilities/bugtool/ovs-bugtool-conntrack-dump deleted file mode 100644 index 2a72c5a..0000000 --- a/utilities/bugtool/ovs-bugtool-conntrack-dump +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2016 Nicira, Inc. - -ovs-appctl dpctl/dump-conntrack diff --git a/utilities/bugtool/ovs-bugtool-coverage-show b/utilities/bugtool/ovs-bugtool-coverage-show deleted file mode 100755 index b94fd96..0000000 --- a/utilities/bugtool/ovs-bugtool-coverage-show +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2012 Nicira, Inc. - -ovs-appctl coverage/show diff --git a/utilities/bugtool/ovs-bugtool-lacp-show b/utilities/bugtool/ovs-bugtool-lacp-show deleted file mode 100755 index 4c1728c..0000000 --- a/utilities/bugtool/ovs-bugtool-lacp-show +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2011 Nicira, Inc. - -ovs-appctl lacp/show diff --git a/utilities/bugtool/ovs-bugtool-list-dbs b/utilities/bugtool/ovs-bugtool-list-dbs deleted file mode 100755 index 28775fa..0000000 --- a/utilities/bugtool/ovs-bugtool-list-dbs +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2013 Nicira, Inc. - -ovs-appctl -t ovsdb-server ovsdb-server/list-dbs diff --git a/utilities/bugtool/ovs-bugtool-memory-show b/utilities/bugtool/ovs-bugtool-memory-show deleted file mode 100755 index 3bad754..0000000 --- a/utilities/bugtool/ovs-bugtool-memory-show +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2012 Nicira, Inc. - -ovs-appctl memory/show diff --git a/utilities/bugtool/ovs-bugtool-ovsdb-dump b/utilities/bugtool/ovs-bugtool-ovsdb-dump deleted file mode 100755 index 4eef6f5..0000000 --- a/utilities/bugtool/ovs-bugtool-ovsdb-dump +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2011 Nicira, Inc. - -ovsdb-client -f csv dump unix:/var/run/openvswitch/db.sock Open_vSwitch diff --git a/utilities/bugtool/ovs-bugtool-vsctl-show b/utilities/bugtool/ovs-bugtool-vsctl-show deleted file mode 100755 index 26e46e5..0000000 --- a/utilities/bugtool/ovs-bugtool-vsctl-show +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2012, 2013 Nicira, Inc. - -ovs-vsctl show diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml index e3143c6..e5ee2a8 100644 --- a/utilities/bugtool/plugins/network-status/openvswitch.xml +++ b/utilities/bugtool/plugins/network-status/openvswitch.xml @@ -18,18 +18,18 @@ <collect> <command label="tc-class-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show</command> - <command label="ovs-vsctl-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-vsctl-show</command> - <command label="dump-ovsdb" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovsdb-dump</command> + <command label="ovs-vsctl-show" filters="ovs">ovs-vsctl show</command> + <command label="dump-ovsdb" filters="ovs">ovsdb-client -f csv dump unix:/var/run/openvswitch/db.sock Open_vSwitch</command> <command label="ovs-appctl-fdb-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-fdb-show</command> - <command label="ovs-appctl-lacp-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-lacp-show</command> - <command label="ovs-appctl-cfm-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-cfm-show</command> - <command label="ovs-appctl-bfd-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-bfd-show</command> - <command label="ovs-appctl-conntrack-dump" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-conntrack-dump</command> - <command label="ovs-appctl-coverage-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-coverage-show</command> - <command label="ovs-appctl-bond-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-bond-show</command> - <command label="ovs-appctl-memory-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-memory-show</command> + <command label="ovs-appctl-lacp-show" filters="ovs">ovs-appctl lacp/show</command> + <command label="ovs-appctl-cfm-show" filters="ovs">ovs-appctl cfm/show</command> + <command label="ovs-appctl-bfd-show" filters="ovs">ovs-appctl bfd/show</command> + <command label="ovs-appctl-conntrack-dump" filters="ovs">ovs-appctl dpctl/dump-conntrack</command> + <command label="ovs-appctl-coverage-show" filters="ovs">ovs-appctl coverage/show</command> + <command label="ovs-appctl-bond-show" filters="ovs">ovs-appctl bond/show</command> + <command label="ovs-appctl-memory-show" filters="ovs">ovs-appctl memory/show</command> <command label="ovs-ofctl-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges "show"</command> <command label="ovs-ofctl-dump-flows" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges "dump-flows"</command> <command label="ovs-appctl-dpif" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-appctl-dpif</command> - <command label="ovs-appctl-list-dbs" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-list-dbs</command> + <command label="ovs-appctl-list-dbs" filters="ovs">ovs-appctl -t ovsdb-server ovsdb-server/list-dbs</command> </collect> -- 2.7.4 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
