[ovs-dev,RFC,ovn,4/5] Move ovn-pinctrl to its own directory.
diff mbox series

Message ID 20191018204259.1113-5-mmichels@redhat.com
State New
Headers show
Series
  • Separate pinctrl to its own process
Related show

Commit Message

Mark Michelson Oct. 18, 2019, 8:42 p.m. UTC
Signed-off-by: Mark Michelson <mmichels@redhat.com>
---
 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%)

Patch
diff mbox series

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 @@ 
+<?xml version="1.0" encoding="utf-8"?>
+<manpage program="ovn-controller" section="8" title="ovn-controller">
+    <h1>Name</h1>
+    <p>ovn-pinctrl -- Open Virtual Network packet-in controller</p>
+
+    <h1>Synopsis</h1>
+    <p><code>ovn-pinctrl</code> [<var>options</var>] [<var>ovs-database</var>]</p>
+
+    <h1>Description</h1>
+    <p>
+        stub
+    </p>
+
+    <h1>Options</h1>
+
+    <h2>Daemon Options</h2>
+    <xi:include href="lib/daemon.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+
+    <h2>Logging Options</h2>
+    <xi:include href="lib/vlog.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+
+    <h2>PKI Options</h2>
+    <p>
+      PKI configuration is required in order to use SSL for the connections to
+      the Northbound and Southbound databases.
+    </p>
+    <xi:include href="lib/ssl.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+    <xi:include href="lib/ssl-bootstrap.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+    <xi:include href="lib/ssl-peer-ca-cert.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+
+    <h2>Other Options</h2>
+
+    <xi:include href="lib/common.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+
+</manpage>
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); \