@@ -503,7 +503,7 @@ include xenserver/automake.mk
include tutorial/automake.mk
include selinux/automake.mk
include controller/automake.mk
-include controller-vtep/automake.mk
+include controller-ramp/automake.mk
include northd/automake.mk
include ic/automake.mk
include build-aux/automake.mk
@@ -2,6 +2,7 @@ Post-v20.03.0
--------------------------
- "VTEP" gateways and switches have been renamed "ramp" gateways and
switches, to better distinguish them from everyday use of VXLAN.
+ - "ovn-controller-vtep" has been renamed to "ovn-controller-ramp".
OVN v20.03.0 - xx xxx xxxx
new file mode 100644
@@ -0,0 +1,2 @@
+/ovn-controller-ramp
+/ovn-controller-ramp.8
new file mode 100644
@@ -0,0 +1,14 @@
+bin_PROGRAMS += controller-ramp/ovn-controller-ramp
+controller_ramp_ovn_controller_ramp_SOURCES = \
+ controller-ramp/binding.c \
+ controller-ramp/binding.h \
+ controller-ramp/gateway.c \
+ controller-ramp/gateway.h \
+ controller-ramp/ovn-controller-ramp.c \
+ controller-ramp/ovn-controller-ramp.h \
+ controller-ramp/ramp.c \
+ controller-ramp/ramp.h
+controller_ramp_ovn_controller_ramp_LDADD = lib/libovn.la $(OVS_LIBDIR)/libopenvswitch.la $(OVSBUILDDIR)/vtep/libvtep.la
+man_MANS += controller-ramp/ovn-controller-ramp.8
+EXTRA_DIST += controller-ramp/ovn-controller-ramp.8.xml
+CLEANFILES += controller-ramp/ovn-controller-ramp.8
similarity index 98%
rename from controller-vtep/binding.c
rename to controller-ramp/binding.c
@@ -20,7 +20,7 @@
#include "lib/smap.h"
#include "lib/util.h"
#include "openvswitch/vlog.h"
-#include "ovn-controller-vtep.h"
+#include "ovn-controller-ramp.h"
#include "lib/ovn-sb-idl.h"
#include "vtep/vtep-idl.h"
@@ -117,7 +117,7 @@ update_pb_chassis(const struct sbrec_port_binding *port_binding_rec,
/* Checks and updates logical port to vtep logical switch bindings for each
* physical switch in VTEP. */
void
-binding_run(struct controller_vtep_ctx *ctx)
+binding_run(struct controller_ramp_ctx *ctx)
{
if (!ctx->ovnsb_idl_txn) {
return;
@@ -229,7 +229,7 @@ binding_run(struct controller_vtep_ctx *ctx)
* Returns true when done (i.e. there is no change made to 'ctx->ovnsb_idl'),
* otherwise returns false. */
bool
-binding_cleanup(struct controller_vtep_ctx *ctx)
+binding_cleanup(struct controller_ramp_ctx *ctx)
{
if (!ctx->ovnsb_idl_txn) {
return false;
similarity index 84%
rename from controller-vtep/binding.h
rename to controller-ramp/binding.h
@@ -19,9 +19,9 @@
#include <stdbool.h>
-struct controller_vtep_ctx;
+struct controller_ramp_ctx;
-void binding_run(struct controller_vtep_ctx *);
-bool binding_cleanup(struct controller_vtep_ctx *);
+void binding_run(struct controller_ramp_ctx *);
+bool binding_cleanup(struct controller_ramp_ctx *);
#endif /* ovn/controller-gw/binding.h */
similarity index 97%
rename from controller-vtep/gateway.c
rename to controller-ramp/gateway.c
@@ -23,7 +23,7 @@
#include "openvswitch/vlog.h"
#include "lib/ovn-sb-idl.h"
#include "vtep/vtep-idl.h"
-#include "ovn-controller-vtep.h"
+#include "ovn-controller-ramp.h"
VLOG_DEFINE_THIS_MODULE(gateway);
@@ -72,7 +72,7 @@ create_chassis_rec(struct ovsdb_idl_txn *txn, const char *name,
*
* */
static void
-revalidate_gateway(struct controller_vtep_ctx *ctx)
+revalidate_gateway(struct controller_ramp_ctx *ctx)
{
const struct vteprec_physical_switch *pswitch;
@@ -147,7 +147,7 @@ revalidate_gateway(struct controller_vtep_ctx *ctx)
/* Updates the 'vtep_logical_switches' column in the Chassis table based
* on vtep database configuration. */
static void
-update_vtep_logical_switches(struct controller_vtep_ctx *ctx)
+update_vtep_logical_switches(struct controller_ramp_ctx *ctx)
{
const struct vteprec_physical_switch *pswitch;
@@ -185,7 +185,7 @@ update_vtep_logical_switches(struct controller_vtep_ctx *ctx)
void
-gateway_run(struct controller_vtep_ctx *ctx)
+gateway_run(struct controller_ramp_ctx *ctx)
{
if (!ctx->ovnsb_idl_txn) {
return;
@@ -199,7 +199,7 @@ gateway_run(struct controller_vtep_ctx *ctx)
* Returns true when done (i.e. there is no change made to 'ctx->ovnsb_idl'),
* otherwise returns false. */
bool
-gateway_cleanup(struct controller_vtep_ctx *ctx)
+gateway_cleanup(struct controller_ramp_ctx *ctx)
{
static bool simap_destroyed = false;
const struct vteprec_physical_switch *pswitch;
similarity index 84%
rename from controller-vtep/gateway.h
rename to controller-ramp/gateway.h
@@ -18,9 +18,9 @@
#include <stdbool.h>
-struct controller_vtep_ctx;
+struct controller_ramp_ctx;
-void gateway_run(struct controller_vtep_ctx *);
-bool gateway_cleanup(struct controller_vtep_ctx *);
+void gateway_run(struct controller_ramp_ctx *);
+bool gateway_cleanup(struct controller_ramp_ctx *);
#endif /* ovn/controller-gw/gateway.h */
similarity index 85%
rename from controller-vtep/ovn-controller-vtep.8.xml
rename to controller-ramp/ovn-controller-ramp.8.xml
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
-<manpage program="ovn-controller-vtep" section="8" title="ovn-controller-vtep">
+<manpage program="ovn-controller-ramp" section="8" title="ovn-controller-ramp">
<h1>Name</h1>
- <p>ovn-controller-vtep -- Open Virtual Network local controller for
+ <p>ovn-controller-ramp -- Open Virtual Network local controller for
vtep enabled physical switches.
</p>
<h1>Synopsis</h1>
- <p><code>ovn-controller-vtep</code> [<var>options</var>]
- [<var>--vtep-db=vtep-database</var>] [<var>--ovnsb-db=ovnsb-database</var>]
+ <p><code>ovn-controller-ramp</code> [<var>options</var>]
+ [<var>--ramp-db=ramp-database</var>] [<var>--ovnsb-db=ovnsb-database</var>]
</p>
<h1>Description</h1>
<p>
- <code>ovn-controller-vtep</code> is the local controller daemon in
+ <code>ovn-controller-ramp</code> is the local controller daemon in
OVN, the Open Virtual Network, for VTEP enabled physical switches.
It connects up to the OVN Southbound database (see
<code>ovn-sb</code>(5)) over the OVSDB protocol, and down to the VTEP
- database (see <code>vtep</code>(5)) over the OVSDB protocol.
+ database (see <code>ramp</code>(5)) over the OVSDB protocol.
</p>
<h2>PKI Options</h2>
@@ -30,7 +30,7 @@
<h1>Configuration</h1>
<p>
- <code>ovn-controller-vtep</code> retrieves its configuration
+ <code>ovn-controller-ramp</code> retrieves its configuration
information from both the ovnsb and the vtep database. If the
database locations are not given from command line, the default
is the <code>db.sock</code> in local OVSDB's 'run' directory.
similarity index 94%
rename from controller-vtep/ovn-controller-vtep.c
rename to controller-ramp/ovn-controller-ramp.c
@@ -40,10 +40,10 @@
#include "binding.h"
#include "gateway.h"
-#include "vtep.h"
-#include "ovn-controller-vtep.h"
+#include "ramp.h"
+#include "ovn-controller-ramp.h"
-static unixctl_cb_func ovn_controller_vtep_exit;
+static unixctl_cb_func ovn_controller_ramp_exit;
static void parse_options(int argc, char *argv[]);
OVS_NO_RETURN static void usage(void);
@@ -71,7 +71,7 @@ main(int argc, char *argv[])
if (retval) {
exit(EXIT_FAILURE);
}
- unixctl_command_register("exit", "", 0, 0, ovn_controller_vtep_exit,
+ unixctl_command_register("exit", "", 0, 0, ovn_controller_ramp_exit,
&exiting);
daemonize_complete();
@@ -89,7 +89,7 @@ main(int argc, char *argv[])
/* Main loop. */
exiting = false;
while (!exiting) {
- struct controller_vtep_ctx ctx = {
+ struct controller_ramp_ctx ctx = {
.vtep_idl = vtep_idl_loop.idl,
.vtep_idl_txn = ovsdb_idl_loop_run(&vtep_idl_loop),
.ovnsb_idl = ovnsb_idl_loop.idl,
@@ -98,7 +98,7 @@ main(int argc, char *argv[])
gateway_run(&ctx);
binding_run(&ctx);
- vtep_run(&ctx);
+ ramp_run(&ctx);
unixctl_server_run(unixctl);
unixctl_server_wait(unixctl);
@@ -116,7 +116,7 @@ main(int argc, char *argv[])
/* It's time to exit. Clean up the databases. */
bool done = false;
while (!done) {
- struct controller_vtep_ctx ctx = {
+ struct controller_ramp_ctx ctx = {
.vtep_idl = vtep_idl_loop.idl,
.vtep_idl_txn = ovsdb_idl_loop_run(&vtep_idl_loop),
.ovnsb_idl = ovnsb_idl_loop.idl,
@@ -127,7 +127,7 @@ main(int argc, char *argv[])
* We're done if all of them return true. */
done = binding_cleanup(&ctx);
done = gateway_cleanup(&ctx) && done;
- done = vtep_cleanup(&ctx) && done;
+ done = ramp_cleanup(&ctx) && done;
if (done) {
poll_immediate_wake();
}
@@ -262,7 +262,7 @@ Options:\n\
static void
-ovn_controller_vtep_exit(struct unixctl_conn *conn, int argc OVS_UNUSED,
+ovn_controller_ramp_exit(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[] OVS_UNUSED, void *exiting_)
{
bool *exiting = exiting_;
similarity index 97%
rename from controller-vtep/ovn-controller-vtep.h
rename to controller-ramp/ovn-controller-ramp.h
@@ -22,7 +22,7 @@
struct ovsdb_idl;
struct ovsdb_idl_txn;
-struct controller_vtep_ctx {
+struct controller_ramp_ctx {
struct ovsdb_idl *ovnsb_idl;
struct ovsdb_idl_txn *ovnsb_idl_txn;
similarity index 99%
rename from controller-vtep/vtep.c
rename to controller-ramp/ramp.c
@@ -15,7 +15,7 @@
#include <config.h>
-#include "vtep.h"
+#include "ramp.h"
#include "lib/hash.h"
#include "openvswitch/hmap.h"
@@ -23,7 +23,7 @@
#include "lib/smap.h"
#include "lib/sset.h"
#include "lib/util.h"
-#include "ovn-controller-vtep.h"
+#include "ovn-controller-ramp.h"
#include "openvswitch/vlog.h"
#include "lib/ovn-sb-idl.h"
#include "vtep/vtep-idl.h"
@@ -475,7 +475,7 @@ vtep_mcast_macs_cleanup(struct ovsdb_idl *vtep_idl)
/* Updates vtep logical switch tunnel keys. */
void
-vtep_run(struct controller_vtep_ctx *ctx)
+ramp_run(struct controller_ramp_ctx *ctx)
{
if (!ctx->vtep_idl_txn) {
return;
@@ -578,10 +578,10 @@ vtep_run(struct controller_vtep_ctx *ctx)
shash_destroy(&non_vtep_pbs);
}
-/* Cleans up all related entries in vtep. Returns true when done (i.e. there
+/* Cleans up all related entries in ramp. Returns true when done (i.e. there
* is no change made to 'ctx->vtep_idl'), otherwise returns false. */
bool
-vtep_cleanup(struct controller_vtep_ctx *ctx)
+ramp_cleanup(struct controller_ramp_ctx *ctx)
{
if (!ctx->vtep_idl_txn) {
return false;
similarity index 85%
rename from controller-vtep/vtep.h
rename to controller-ramp/ramp.h
@@ -19,9 +19,9 @@
#include <stdbool.h>
-struct controller_vtep_ctx;
+struct controller_ramp_ctx;
-void vtep_run(struct controller_vtep_ctx *);
-bool vtep_cleanup(struct controller_vtep_ctx *);
+void ramp_run(struct controller_ramp_ctx *);
+bool ramp_cleanup(struct controller_ramp_ctx *);
#endif /* ovn/controller-vtep/vtep.h */
deleted file mode 100644
@@ -1,2 +0,0 @@
-/ovn-controller-vtep
-/ovn-controller-vtep.8
deleted file mode 100644
@@ -1,14 +0,0 @@
-bin_PROGRAMS += controller-vtep/ovn-controller-vtep
-controller_vtep_ovn_controller_vtep_SOURCES = \
- controller-vtep/binding.c \
- controller-vtep/binding.h \
- controller-vtep/gateway.c \
- controller-vtep/gateway.h \
- controller-vtep/ovn-controller-vtep.c \
- controller-vtep/ovn-controller-vtep.h \
- controller-vtep/vtep.c \
- controller-vtep/vtep.h
-controller_vtep_ovn_controller_vtep_LDADD = lib/libovn.la $(OVS_LIBDIR)/libopenvswitch.la $(OVSBUILDDIR)/vtep/libvtep.la
-man_MANS += controller-vtep/ovn-controller-vtep.8
-EXTRA_DIST += controller-vtep/ovn-controller-vtep.8.xml
-CLEANFILES += controller-vtep/ovn-controller-vtep.8
@@ -12,7 +12,7 @@ EXTRA_DIST += \
rhel/ovn-fedora.spec \
rhel/ovn-fedora.spec.in \
rhel/usr_lib_systemd_system_ovn-controller.service \
- rhel/usr_lib_systemd_system_ovn-controller-vtep.service \
+ rhel/usr_lib_systemd_system_ovn-controller-ramp.service \
rhel/usr_lib_systemd_system_ovn-northd.service \
rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \
rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml \
@@ -95,15 +95,15 @@ Provides: openvswitch-ovn-host = %{?epoch:%{epoch}:}%{version}-%{release}
%description host
OVN controller running on each host.
-%package vtep
+%package ramp
Summary: Open Virtual Network support
License: ASL 2.0
Requires: ovn
-Obsoletes: openvswitch-ovn-vtep
-Provides: openvswitch-ovn-vtep = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: openvswitch-ovn-vtep ovn-vtep
+Provides: openvswitch-ovn-vtep = %{?epoch:%{epoch}:}%{version}-%{release} ovn-vtep
-%description vtep
-OVN vtep controller
+%description ramp
+OVN ramp controller
%package docker
Summary: Open Virtual Network support
@@ -161,7 +161,7 @@ install -p -D -m 0644 \
rhel/usr_share_ovn_scripts_systemd_sysconfig.template \
$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/ovn
-for service in ovn-controller ovn-controller-vtep ovn-northd; do
+for service in ovn-controller ovn-controller-ramp ovn-northd; do
install -p -D -m 0644 \
rhel/usr_lib_systemd_system_${service}.service \
$RPM_BUILD_ROOT%{_unitdir}/${service}.service
@@ -247,20 +247,6 @@ if [ $1 -eq 1 ] ; then
fi
fi
-%pre vtep
-if [ $1 -eq 1 ] ; then
- # Package install.
- /bin/systemctl status ovn-controller-vtep.service >/dev/null
- ovn_status=$?
- rpm -ql openvswitch-ovn-vtep > /dev/null
- if [[ "$?" = "0" && "$ovn_status" = "0" ]]; then
- # ovn-controller-vtep service is running which means old
- # openvswitch-ovn-vtep is installed and it will be cleaned up. So
- # start ovn-controller-vtep service when posttrans host is called.
- touch %{_localstatedir}/lib/rpm-state/ovn-controller-vtep
- fi
-fi
-
%preun central
%if 0%{?systemd_preun:1}
%systemd_preun ovn-northd.service
@@ -283,17 +269,6 @@ fi
fi
%endif
-%preun vtep
-%if 0%{?systemd_preun:1}
- %systemd_preun ovn-controller-vtep.service
-%else
- if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable ovn-controller-vtep.service >/dev/null 2>&1 || :
- /bin/systemctl stop ovn-controller-vtep.service >/dev/null 2>&1 || :
- fi
-%endif
-
%post
%if %{with libcapng}
if [ $1 -eq 1 ]; then
@@ -322,16 +297,6 @@ fi
fi
%endif
-%post vtep
-%if 0%{?systemd_post:1}
- %systemd_post ovn-controller-vtep.service
-%else
- # Package install, not upgrade
- if [ $1 -eq 1 ]; then
- /bin/systemctl daemon-reload >dev/null || :
- fi
-%endif
-
%postun
%postun central
@@ -356,17 +321,6 @@ fi
fi
%endif
-%postun vtep
-%if 0%{?systemd_postun_with_restart:1}
- %systemd_postun_with_restart ovn-controller-vtep.service
-%else
- /bin/systemctl daemon-reload >/dev/null 2>&1 || :
- if [ "$1" -ge "1" ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart ovn-controller-vtep.service >/dev/null 2>&1 || :
- fi
-%endif
-
%posttrans central
if [ $1 -eq 1 ]; then
# Package install, not upgrade
@@ -386,15 +340,6 @@ if [ $1 -eq 1 ]; then
fi
fi
-%posttrans vtep
-if [ $1 -eq 1 ]; then
- # Package install, not upgrade
- if [ -e %{_localstatedir}/lib/rpm-state/ovn-controller-vtep ]; then
- rm %{_localstatedir}/lib/rpm-state/ovn-controller-vtep
- /bin/systemctl start ovn-controller-vtep.service >/dev/null 2>&1 || :
- fi
-fi
-
%files
%config(noreplace) %{_sysconfdir}/sysconfig/ovn
%{_bindir}/ovn-nbctl
@@ -448,10 +393,10 @@ fi
%{_unitdir}/ovn-controller.service
%{_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml
-%files vtep
-%{_bindir}/ovn-controller-vtep
-%{_mandir}/man8/ovn-controller-vtep.8*
-%{_unitdir}/ovn-controller-vtep.service
+%files ramp
+%{_bindir}/ovn-controller-ramp
+%{_mandir}/man8/ovn-controller-ramp.8*
+%{_unitdir}/ovn-controller-ramp.service
%changelog
* Thu Dec 20 2018 Numan Siddique <nusiddiq@redhat.com>
similarity index 67%
rename from rhel/usr_lib_systemd_system_ovn-controller-vtep.service
rename to rhel/usr_lib_systemd_system_ovn-controller-ramp.service
@@ -1,33 +1,33 @@
-# See ovn-controller-vtep(8) for details about ovn-controller-vtep.
+# See ovn-controller-ramp(8) for details about ovn-controller-ramp.
#
# You may override the following variables to customize ovn-controller-vtep
# behavior:
#
# OVN_DB - Set this variable to the location of the ovsdb server that is
# serving the OVN_Southbound database. See the manpage for
-# ovn-controller-vtep for more details on the format for the db
+# ovn-controller-ramp for more details on the format for the db
# location.
#
# VTEP_DB - Set this variable to the location of the ovsdb server that is
# serving the hardware_vtep database. See the manpage for
-# ovn-controller-vtep for more details on the format for the db
+# ovn-controller-ramp for more details on the format for the db
# location.
#
# To override these variables, you may create a configuration file
-# in the /etc/systemd/system/ovn-controller-vtep.d/ directory. For example,
+# in the /etc/systemd/system/ovn-controller-ramp.d/ directory. For example,
# you could place the following contents in
-# /etc/systemd/system/ovn-controller-vtep.d/local.conf:
+# /etc/systemd/system/ovn-controller-ramp.d/local.conf:
#
# [System]
# Environment="OVN_DB=unix:/usr/local/var/run/ovn/db.sock" "VTEP_DB=unix:/usr/local/var/run/ovn/vtep.sock"
#
-# Alternatively, you may specify environment variables in the file /etc/sysconfig/ovn-controller-vtep:
+# Alternatively, you may specify environment variables in the file /etc/sysconfig/ovn-controller-ramp:
#
# OVN_DB="unix:/usr/local/var/run/ovn/db.sock"
# VTEP_DB="unix:/usr/local/var/run/ovn/vtep.sock"
[Unit]
-Description=OVN VTEP gateway controller daemon
+Description=OVN RAMP gateway controller daemon
After=syslog.target
Requires=openvswitch.service
After=openvswitch.service
@@ -40,11 +40,11 @@ Environment=OVN_RUNDIR=%t/ovn
Environment=OVN_DB=unix:%t/ovn/ovnsb_db.sock
EnvironmentFile=-/etc/sysconfig/ovn
Environment=VTEP_DB=unix:%t/openvswitch/db.sock
-EnvironmentFile=-/etc/sysconfig/ovn-controller-vtep
-ExecStart=/usr/bin/ovn-controller-vtep -vconsole:emer -vsyslog:err -vfile:info \
- --log-file=/var/log/ovn/ovn-controller-vtep.log \
+EnvironmentFile=-/etc/sysconfig/ovn-controller-ramp
+ExecStart=/usr/bin/ovn-controller-ramp -vconsole:emer -vsyslog:err -vfile:info \
+ --log-file=/var/log/ovn/ovn-controller-ramp.log \
--ovn-user=${OVN_USER_ID} \
- --no-chdir --pidfile=${OVN_RUNDIR}/ovn-controller-vtep.pid \
+ --no-chdir --pidfile=${OVN_RUNDIR}/ovn-controller-ramp.pid \
--ovnsb-db=${OVN_DB} --vtep-db=${VTEP_DB}
[Install]
@@ -27,7 +27,7 @@ TESTSUITE_AT = \
tests/ovn-ic-nbctl.at \
tests/ovn-ic-sbctl.at \
tests/ovn-controller.at \
- tests/ovn-controller-vtep.at \
+ tests/ovn-controller-ramp.at \
tests/ovn-ic.at \
tests/ovn-macros.at \
tests/ovn-performance.at
@@ -55,7 +55,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:ic
+AUTOTEST_PATH = $(ovs_builddir)/utilities:$(ovs_builddir)/vswitchd:$(ovs_builddir)/ovsdb:$(ovs_builddir)/vtep:tests:$(PTHREAD_WIN32_DIR_DLL):$(SSL_DIR):controller-ramp:northd:utilities:controller:ic
export ovs_srcdir
similarity index 92%
rename from tests/ovn-controller-vtep.at
rename to tests/ovn-controller-ramp.at
@@ -1,6 +1,6 @@
-AT_BANNER([ovn_controller_vtep])
+AT_BANNER([ovn_controller_ramp])
-# OVN_CONTROLLER_VTEP_START
+# OVN_CONTROLLER_RAMP_START
#
# Starts the test with a setup with vtep device. Each test case must first
# call this macro.
@@ -11,7 +11,7 @@ AT_BANNER([ovn_controller_vtep])
# Configures ovn-nb with a logical switch 'br-test'.
#
#
-m4_define([OVN_CONTROLLER_VTEP_START],
+m4_define([OVN_CONTROLLER_RAMP_START],
[
AT_KEYWORDS([ovn])
# this will cause skip when 'make check' using Windows setup.
@@ -69,24 +69,24 @@ m4_define([OVN_CONTROLLER_VTEP_START],
/vlog|INFO|opened log file/d']])
AT_CAPTURE_FILE([ovn-northd.log])
- dnl Start ovn-controllger-vtep.
- AT_CHECK([ovn-controller-vtep --detach --no-chdir --pidfile --log-file --vtep-db=unix:$OVS_RUNDIR/db.sock --ovnsb-db=unix:$OVS_RUNDIR/ovnsb_db.sock], [0], [], [stderr])
- AT_CAPTURE_FILE([ovn-controller-vtep.log])
- on_exit "kill `cat ovn-controller-vtep.pid`"
+ dnl Start ovn-controller-ramp.
+ AT_CHECK([ovn-controller-ramp --detach --no-chdir --pidfile --log-file --vtep-db=unix:$OVS_RUNDIR/db.sock --ovnsb-db=unix:$OVS_RUNDIR/ovnsb_db.sock], [0], [], [stderr])
+ AT_CAPTURE_FILE([ovn-controller-ramp.log])
+ on_exit "kill `cat ovn-controller-ramp.pid`"
AT_CHECK([[sed < stderr '
/vlog|INFO|opened log file/d
/reconnect|INFO|/d']])
])
-# OVN_CONTROLLER_VTEP_STOP
+# OVN_CONTROLLER_RAMP_STOP
#
# So many exits... Yeah, we started a lot daemons~
#
-m4_define([OVN_CONTROLLER_VTEP_STOP],
+m4_define([OVN_CONTROLLER_RAMP_STOP],
[AT_CHECK([check_logs "$1"])
OVS_APP_EXIT_AND_WAIT([ovs-vtep])
OVS_APP_EXIT_AND_WAIT([ovn-northd])
- OVS_APP_EXIT_AND_WAIT([ovn-controller-vtep])
+ OVS_APP_EXIT_AND_WAIT([ovn-controller-ramp])
OVS_APP_EXIT_AND_WAIT([ovsdb-server])
OVS_APP_EXIT_AND_WAIT([ovs-vswitchd])])
@@ -106,8 +106,8 @@ AT_CHECK([ovn-nbctl lsp-set-options $2 vtep-physical-switch=$3 vtep-logical-swit
##############################################
# tests chassis related updates.
-AT_SETUP([ovn-controller-vtep - chassis])
-OVN_CONTROLLER_VTEP_START
+AT_SETUP([ovn-controller-ramp - chassis])
+OVN_CONTROLLER_RAMP_START
# verifies the initial ovn-sb db configuration.
OVS_WAIT_UNTIL([test -n "`ovn-sbctl show | grep Chassis`"])
@@ -121,8 +121,8 @@ Chassis br-vtep
# deletes the chassis via ovn-sbctl and check that it is readded back
# with the log.
AT_CHECK([ovn-sbctl chassis-del br-vtep])
-OVS_WAIT_UNTIL([test -n "`grep WARN ovn-controller-vtep.log`"])
-AT_CHECK([sed -n 's/^.*\(|WARN|.*\)$/\1/p' ovn-controller-vtep.log], [0], [dnl
+OVS_WAIT_UNTIL([test -n "`grep WARN ovn-controller-ramp.log`"])
+AT_CHECK([sed -n 's/^.*\(|WARN|.*\)$/\1/p' ovn-controller-ramp.log], [0], [dnl
|WARN|Chassis for VTEP physical switch (br-vtep) disappears, maybe deleted by ovn-sbctl, adding it back
])
@@ -169,13 +169,13 @@ AT_CHECK([ovn-sbctl --columns=vtep_logical_switches list Chassis | cut -d ':' -f
[[]]
])
-OVN_CONTROLLER_VTEP_STOP([/Chassis for VTEP physical switch (br-vtep) disappears/d])
+OVN_CONTROLLER_RAMP_STOP([/Chassis for VTEP physical switch (br-vtep) disappears/d])
AT_CLEANUP
# Tests binding updates.
-AT_SETUP([ovn-controller-vtep - binding 1])
-OVN_CONTROLLER_VTEP_START
+AT_SETUP([ovn-controller-ramp - binding 1])
+OVN_CONTROLLER_RAMP_START
# adds logical switch 'lswitch0' and vlan_bindings.
AT_CHECK([vtep-ctl add-ls lswitch0 -- bind-ls br-vtep p0 100 lswitch0 -- bind-ls br-vtep p1 300 lswitch0])
@@ -215,7 +215,7 @@ ${chassis_uuid}
${chassis_uuid}
])
# confirms the warning log.
-AT_CHECK([sed -n 's/^.*\(|WARN|.*\)$/\1/p' ovn-controller-vtep.log | sed 's/([[-_0-9a-z]][[-_0-9a-z]]*)/()/g' | uniq], [0], [dnl
+AT_CHECK([sed -n 's/^.*\(|WARN|.*\)$/\1/p' ovn-controller-ramp.log | sed 's/([[-_0-9a-z]][[-_0-9a-z]]*)/()/g' | uniq], [0], [dnl
|WARN|logical switch (), on vtep gateway chassis () has already been associated with logical port (), ignore logical port ()
])
@@ -233,14 +233,14 @@ AT_CHECK_UNQUOTED([ovn-sbctl --columns=chassis list Port_Binding | cut -d ':' -f
[[]]
])
-OVN_CONTROLLER_VTEP_STOP([/has already been associated with logical port/d])
+OVN_CONTROLLER_RAMP_STOP([/has already been associated with logical port/d])
AT_CLEANUP
# Tests corner case: Binding the vtep logical switch from two different
# datapath.
-AT_SETUP([ovn-controller-vtep - binding 2])
-OVN_CONTROLLER_VTEP_START
+AT_SETUP([ovn-controller-ramp - binding 2])
+OVN_CONTROLLER_RAMP_START
# adds logical switch 'lswitch0' and vlan_bindings.
AT_CHECK([vtep-ctl add-ls lswitch0 -- bind-ls br-vtep p0 100 lswitch0])
@@ -256,9 +256,9 @@ AT_CHECK([vtep-ctl add-ps br-vtep-void -- add-port br-vtep-void p0-void -- bind-
# are bound to the same logical switch, but they are on different datapath).
OVN_NB_ADD_VTEP_PORT([br-void], [br-vtep-void_lswitch0], [br-vtep-void], [lswitch0])
ovn-sbctl --timeout=10 wait-until Port_Binding br-vtep_lswitch0
-OVS_WAIT_UNTIL([test -n "`grep WARN ovn-controller-vtep.log`"])
+OVS_WAIT_UNTIL([test -n "`grep WARN ovn-controller-ramp.log`"])
# confirms the warning log.
-AT_CHECK([sed -n 's/^.*\(|WARN|.*\)$/\1/p' ovn-controller-vtep.log | sed 's/([[-_0-9a-z]][[-_0-9a-z]]*)/()/g;s/(with tunnel key [[0-9]][[0-9]]*)/()/g' | uniq], [0], [dnl
+AT_CHECK([sed -n 's/^.*\(|WARN|.*\)$/\1/p' ovn-controller-ramp.log | sed 's/([[-_0-9a-z]][[-_0-9a-z]]*)/()/g;s/(with tunnel key [[0-9]][[0-9]]*)/()/g' | uniq], [0], [dnl
|WARN|logical switch (), on vtep gateway chassis () has already been associated with logical datapath (), ignore logical port () which belongs to logical datapath ()
])
@@ -273,13 +273,13 @@ AT_CHECK_UNQUOTED([ovn-sbctl --columns=chassis list Port_Binding br-vtep_lswitch
${chassis_uuid}
])
-OVN_CONTROLLER_VTEP_STOP([/has already been associated with logical datapath/d])
+OVN_CONTROLLER_RAMP_STOP([/has already been associated with logical datapath/d])
AT_CLEANUP
# Tests vtep module vtep logical switch tunnel key update.
-AT_SETUP([ovn-controller-vtep - vtep-lswitch])
-OVN_CONTROLLER_VTEP_START
+AT_SETUP([ovn-controller-ramp - vtep-lswitch])
+OVN_CONTROLLER_RAMP_START
# creates the logical switch in vtep and adds the corresponding logical
# port to 'br-test'.
@@ -325,13 +325,13 @@ AT_CHECK([vtep-ctl --columns=tunnel_key list Logical_Switch | cut -d ':' -f2 | t
0
])
-OVN_CONTROLLER_VTEP_STOP
+OVN_CONTROLLER_RAMP_STOP
AT_CLEANUP
# Tests vtep module 'Ucast_Macs_Remote's.
-AT_SETUP([ovn-controller-vtep - vtep-macs 1])
-OVN_CONTROLLER_VTEP_START
+AT_SETUP([ovn-controller-ramp - vtep-macs 1])
+OVN_CONTROLLER_RAMP_START
# creates a simple logical network with the vtep device and a fake hv chassis
# 'ch0'.
@@ -397,13 +397,13 @@ OVS_WAIT_UNTIL([test -z "`vtep-ctl --columns=MAC list Ucast_Macs_Remote | grep 0
AT_CHECK([vtep-ctl --columns=MAC list Ucast_Macs_Remote | cut -d ':' -f2- | tr -d ' ' | sort], [0], [dnl
])
-OVN_CONTROLLER_VTEP_STOP
+OVN_CONTROLLER_RAMP_STOP
AT_CLEANUP
# Tests vtep module 'Ucast_Macs_Remote's (corner cases).
-AT_SETUP([ovn-controller-vtep - vtep-macs 2])
-OVN_CONTROLLER_VTEP_START
+AT_SETUP([ovn-controller-ramp - vtep-macs 2])
+OVN_CONTROLLER_RAMP_START
# creates a simple logical network with the vtep device and a fake hv chassis
# 'ch0'.
@@ -432,8 +432,8 @@ AT_CHECK([vtep-ctl --columns=MAC list Ucast_Macs_Remote | cut -d ':' -f2- | tr -
"f0:ab:cd:ef:01:02"
])
# confirms the warning log.
-OVS_WAIT_UNTIL([test -n "`grep WARN ovn-controller-vtep.log`"])
-AT_CHECK([sed -n 's/^.*\(|WARN|.*\)$/\1/p' ovn-controller-vtep.log | sed 's/([[-_:0-9a-z]][[-_:0-9a-z]]*)/()/g' | uniq], [0], [dnl
+OVS_WAIT_UNTIL([test -n "`grep WARN ovn-controller-ramp.log`"])
+AT_CHECK([sed -n 's/^.*\(|WARN|.*\)$/\1/p' ovn-controller-ramp.log | sed 's/([[-_:0-9a-z]][[-_:0-9a-z]]*)/()/g' | uniq], [0], [dnl
|WARN|MAC address () has already been known to be on logical port () in the same logical datapath, so just ignore this logical port ()
])
@@ -465,5 +465,5 @@ AT_CHECK([vtep-ctl --columns=MAC list Ucast_Macs_Remote | cut -d ':' -f2- | tr -
"f0:ab:cd:ef:01:02"
])
-OVN_CONTROLLER_VTEP_STOP([/has already been known to be on logical port/d])
+OVN_CONTROLLER_RAMP_STOP([/has already been known to be on logical port/d])
AT_CLEANUP
@@ -12,12 +12,12 @@ m4_define([OVN_CLEANUP_VSWITCH],[
#
# Gracefully terminate OVN daemons in the specified
# sandbox instance. The sandbox name "vtep" is treated
-# as a special case, and is assumed to have ovn-controller-vtep
+# as a special case, and is assumed to have ovn-controller-ramp
# and ovs-vtep daemons running instead of ovn-controller.
m4_define([OVN_CLEANUP_SBOX],[
as $1
if test "$1" = "vtep"; then
- OVS_APP_EXIT_AND_WAIT([ovn-controller-vtep])
+ OVS_APP_EXIT_AND_WAIT([ovn-controller-ramp])
OVS_APP_EXIT_AND_WAIT([ovs-vtep])
else
OVS_APP_EXIT_AND_WAIT([ovn-controller])
@@ -2438,8 +2438,8 @@ OVN_CLEANUP([hv1],[hv2])
AT_CLEANUP
-AT_SETUP([ovn -- vtep: 3 HVs, 1 VIFs/HV, 1 GW, 1 LS])
-AT_KEYWORDS([vtep])
+AT_SETUP([ovn -- ramp: 3 HVs, 1 VIFs/HV, 1 GW, 1 LS])
+AT_KEYWORDS([ramp])
ovn_start
# Configure the Northbound database
@@ -2506,7 +2506,7 @@ vtep-ctl set Physical_Switch br-vtep tunnel_ips=192.168.0.3
vtep-ctl add-ls lsw0
start_daemon ovs-vtep br-vtep
-start_daemon ovn-controller-vtep --vtep-db=unix:"$ovs_base"/vtep/db.sock --ovnsb-db=unix:"$ovs_base"/ovn-sb/ovn-sb.sock
+start_daemon ovn-controller-ramp --vtep-db=unix:"$ovs_base"/vtep/db.sock --ovnsb-db=unix:"$ovs_base"/ovn-sb/ovn-sb.sock
OVS_WAIT_UNTIL([vtep-ctl bind-ls br-vtep br-vtep_n2 0 lsw0])
@@ -29,6 +29,6 @@ m4_include([tests/ovn-sbctl.at])
m4_include([tests/ovn-ic-nbctl.at])
m4_include([tests/ovn-ic-sbctl.at])
m4_include([tests/ovn-controller.at])
-m4_include([tests/ovn-controller-vtep.at])
+m4_include([tests/ovn-controller-ramp.at])
m4_include([tests/ovn-ic.at])
m4_include([tests/checkpatch.at])