From patchwork Fri Oct 18 20:42:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Michelson X-Patchwork-Id: 1179686 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46vyjq4JTBz9sPK for ; Sat, 19 Oct 2019 07:46:07 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 79E38D67; Fri, 18 Oct 2019 20:43:11 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 3F261CF6 for ; Fri, 18 Oct 2019 20:43:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 097F25D3 for ; Fri, 18 Oct 2019 20:43:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A229F30224A8 for ; Fri, 18 Oct 2019 20:43:04 +0000 (UTC) Received: from monae.redhat.com (ovpn-122-41.rdu2.redhat.com [10.10.122.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A63C7E20 for ; Fri, 18 Oct 2019 20:43:03 +0000 (UTC) From: Mark Michelson To: dev@openvswitch.org Date: Fri, 18 Oct 2019 16:42:58 -0400 Message-Id: <20191018204259.1113-5-mmichels@redhat.com> In-Reply-To: <20191018204259.1113-1-mmichels@redhat.com> References: <20191018204259.1113-1-mmichels@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 18 Oct 2019 20:43:04 +0000 (UTC) X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [RFC ovn PATCH 4/5] Move ovn-pinctrl to its own directory. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: Mark Michelson --- Makefile.am | 1 + controller/automake.mk | 34 ---------------------------------- pinctrl/automake.mk | 25 +++++++++++++++++++++++++ pinctrl/ovn-pinctrl.8.xml | 35 +++++++++++++++++++++++++++++++++++ {controller => pinctrl}/ovn-pinctrl.c | 0 {controller => pinctrl}/pinctrl.c | 12 +++++------- {controller => pinctrl}/pinctrl.h | 0 tests/automake.mk | 2 +- 8 files changed, 67 insertions(+), 42 deletions(-) create mode 100644 pinctrl/automake.mk create mode 100644 pinctrl/ovn-pinctrl.8.xml rename {controller => pinctrl}/ovn-pinctrl.c (100%) rename {controller => pinctrl}/pinctrl.c (99%) rename {controller => pinctrl}/pinctrl.h (100%) diff --git a/Makefile.am b/Makefile.am index 33c18c5d8..47dd0c164 100644 --- a/Makefile.am +++ b/Makefile.am @@ -497,6 +497,7 @@ include xenserver/automake.mk include python/automake.mk include tutorial/automake.mk include selinux/automake.mk +include pinctrl/automake.mk include controller/automake.mk include controller-vtep/automake.mk include northd/automake.mk diff --git a/controller/automake.mk b/controller/automake.mk index d38ee927c..26f0c86d4 100644 --- a/controller/automake.mk +++ b/controller/automake.mk @@ -1,37 +1,3 @@ -bin_PROGRAMS += controller/ovn-pinctrl -controller_ovn_pinctrl_SOURCES = \ - controller/ovn-pinctrl.c \ - controller/pinctrl.c \ - controller/pinctrl.h \ - controller/bfd.c \ - controller/bfd.h \ - controller/binding.c \ - controller/binding.h \ - controller/chassis.c \ - controller/chassis.h \ - controller/encaps.c \ - controller/encaps.h \ - controller/ha-chassis.c \ - controller/ha-chassis.h \ - controller/ip-mcast.c \ - controller/ip-mcast.h \ - controller/lflow.c \ - controller/lflow.h \ - controller/lport.c \ - controller/lport.h \ - controller/ofctrl.c \ - controller/ofctrl.h \ - controller/patch.c \ - controller/patch.h \ - controller/controller-utils.c \ - controller/ovn-controller.h \ - controller/physical.c \ - controller/physical.h -controller_ovn_pinctrl_LDADD = lib/libovn.la $(OVS_LIBDIR)/libopenvswitch.la -man_MANS += controller/ovn-pinctrl.8 -EXTRA_DIST += controller/ovn-pinctrl.8.xml -CLEANFILES += controller/ovn-pinctrl.8 - bin_PROGRAMS += controller/ovn-controller controller_ovn_controller_SOURCES = \ controller/bfd.c \ diff --git a/pinctrl/automake.mk b/pinctrl/automake.mk new file mode 100644 index 000000000..e240d9b1f --- /dev/null +++ b/pinctrl/automake.mk @@ -0,0 +1,25 @@ +bin_PROGRAMS += pinctrl/ovn-pinctrl +pinctrl_ovn_pinctrl_SOURCES = \ + pinctrl/ovn-pinctrl.c \ + pinctrl/pinctrl.c \ + pinctrl/pinctrl.h \ + controller/bfd.c \ + controller/bfd.h \ + controller/binding.c \ + controller/binding.h \ + controller/encaps.c \ + controller/encaps.h \ + controller/ha-chassis.c \ + controller/ha-chassis.h \ + controller/ip-mcast.c \ + controller/ip-mcast.h \ + controller/lport.c \ + controller/lport.h \ + controller/patch.c \ + controller/patch.h \ + controller/controller-utils.c \ + controller/ovn-controller.h +pinctrl_ovn_pinctrl_LDADD = lib/libovn.la $(OVS_LIBDIR)/libopenvswitch.la +man_MANS += pinctrl/ovn-pinctrl.8 +EXTRA_DIST += pinctrl/ovn-pinctrl.8.xml +CLEANFILES += pinctrl/ovn-pinctrl.8 diff --git a/pinctrl/ovn-pinctrl.8.xml b/pinctrl/ovn-pinctrl.8.xml new file mode 100644 index 000000000..c0322cd4b --- /dev/null +++ b/pinctrl/ovn-pinctrl.8.xml @@ -0,0 +1,35 @@ + + +

Name

+

ovn-pinctrl -- Open Virtual Network packet-in controller

+ +

Synopsis

+

ovn-pinctrl [options] [ovs-database]

+ +

Description

+

+ stub +

+ +

Options

+ +

Daemon Options

+ + +

Logging Options

+ + +

PKI Options

+

+ PKI configuration is required in order to use SSL for the connections to + the Northbound and Southbound databases. +

+ + + + +

Other Options

+ + + + diff --git a/controller/ovn-pinctrl.c b/pinctrl/ovn-pinctrl.c similarity index 100% rename from controller/ovn-pinctrl.c rename to pinctrl/ovn-pinctrl.c diff --git a/controller/pinctrl.c b/pinctrl/pinctrl.c similarity index 99% rename from controller/pinctrl.c rename to pinctrl/pinctrl.c index edf6ccfb0..927ae0229 100644 --- a/controller/pinctrl.c +++ b/pinctrl/pinctrl.c @@ -22,12 +22,13 @@ #include "csum.h" #include "dirs.h" #include "dp-packet.h" -#include "encaps.h" #include "flow.h" -#include "ha-chassis.h" -#include "lport.h" #include "nx-match.h" -#include "ovn-controller.h" +#include "controller/ovn-controller.h" +#include "controller/lport.h" +#include "controller/lflow.h" +#include "controller/encaps.h" +#include "controller/ip-mcast.h" #include "latch.h" #include "lib/packets.h" #include "lib/sset.h" @@ -40,7 +41,6 @@ #include "openvswitch/vlog.h" #include "lib/dhcp.h" -#include "ovn-controller.h" #include "ovn/actions.h" #include "ovn/lex.h" #include "lib/acl-log.h" @@ -55,8 +55,6 @@ #include "seq.h" #include "timeval.h" #include "vswitch-idl.h" -#include "lflow.h" -#include "ip-mcast.h" VLOG_DEFINE_THIS_MODULE(pinctrl); diff --git a/controller/pinctrl.h b/pinctrl/pinctrl.h similarity index 100% rename from controller/pinctrl.h rename to pinctrl/pinctrl.h diff --git a/tests/automake.mk b/tests/automake.mk index e86a5273e..d367c2a61 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -52,7 +52,7 @@ SYSTEM_KMOD_TESTSUITE = $(srcdir)/tests/system-kmod-testsuite SYSTEM_USERSPACE_TESTSUITE = $(srcdir)/tests/system-userspace-testsuite DISTCLEANFILES += tests/atconfig tests/atlocal -AUTOTEST_PATH = $(ovs_builddir)/utilities:$(ovs_builddir)/vswitchd:$(ovs_builddir)/ovsdb:$(ovs_builddir)/vtep:tests:$(PTHREAD_WIN32_DIR_DLL):$(SSL_DIR):controller-vtep:northd:utilities:controller +AUTOTEST_PATH = $(ovs_builddir)/utilities:$(ovs_builddir)/vswitchd:$(ovs_builddir)/ovsdb:$(ovs_builddir)/vtep:tests:$(PTHREAD_WIN32_DIR_DLL):$(SSL_DIR):controller-vtep:northd:utilities:controller:pinctrl check-local: set $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) ovs_srcdir=$(ovs_srcdir); \