aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/configure.ac6
-rw-r--r--src/plugins/l2e/l2e_api.c2
-rw-r--r--src/vpp-api/vom/Makefile.am93
-rw-r--r--src/vpp-api/vom/bridge_domain_arp_entry.cpp8
-rw-r--r--src/vpp-api/vom/nat_static.cpp8
5 files changed, 83 insertions, 34 deletions
diff --git a/src/configure.ac b/src/configure.ac
index 4bdfa8c6bde..c213454dbda 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -211,23 +211,23 @@ AC_SUBST(AR_FLAGS)
PLUGIN_ENABLED(acl)
PLUGIN_ENABLED(dpdk)
PLUGIN_ENABLED(flowprobe)
+PLUGIN_ENABLED(gbp)
PLUGIN_ENABLED(gtpu)
PLUGIN_ENABLED(ila)
PLUGIN_ENABLED(ioam)
PLUGIN_ENABLED(ixge)
PLUGIN_ENABLED(kubeproxy)
+PLUGIN_ENABLED(l2e)
PLUGIN_ENABLED(lb)
PLUGIN_ENABLED(marvell)
PLUGIN_ENABLED(memif)
PLUGIN_ENABLED(pppoe)
+PLUGIN_ENABLED(nat)
PLUGIN_ENABLED(sixrd)
PLUGIN_ENABLED(srv6ad)
PLUGIN_ENABLED(srv6am)
PLUGIN_ENABLED(srv6as)
-PLUGIN_ENABLED(nat)
PLUGIN_ENABLED(stn)
-PLUGIN_ENABLED(l2e)
-PLUGIN_ENABLED(gbp)
###############################################################################
# Dependency checks
diff --git a/src/plugins/l2e/l2e_api.c b/src/plugins/l2e/l2e_api.c
index 470427e8952..045bc7ddb96 100644
--- a/src/plugins/l2e/l2e_api.c
+++ b/src/plugins/l2e/l2e_api.c
@@ -48,7 +48,7 @@
/* Get the API version number */
#define vl_api_version(n,v) static u32 api_version=(v);
-#include <acl/acl_all_api_h.h>
+#include <l2e/l2e_all_api_h.h>
#undef vl_api_version
#include <vlibapi/api_helper_macros.h>
diff --git a/src/vpp-api/vom/Makefile.am b/src/vpp-api/vom/Makefile.am
index d2a3dde70c5..1d76c9daf8f 100644
--- a/src/vpp-api/vom/Makefile.am
+++ b/src/vpp-api/vom/Makefile.am
@@ -33,8 +33,9 @@ libvom_la_LIBADD = \
$(BOOST_ASIO_LIB) \
-lm -lrt
-libvom_la_SOURCES = \
- types.cpp \
+ACL_SOURCES =
+if ENABLE_ACL_PLUGIN
+ACL_SOURCES += \
acl_binding_cmds.cpp \
acl_binding.cpp \
acl_ethertype_cmds.cpp \
@@ -43,7 +44,36 @@ libvom_la_SOURCES = \
acl_l3_rule.cpp \
acl_list_cmds.cpp \
acl_list.cpp \
- acl_types.cpp \
+ acl_types.cpp
+endif
+
+NAT_SOURCES =
+if ENABLE_NAT_PLUGIN
+NAT_SOURCES += \
+ nat_static.cpp \
+ nat_static_cmds.cpp \
+ nat_binding.cpp \
+ nat_binding_cmds.cpp
+endif
+
+L2E_SOURCES =
+if ENABLE_L2E_PLUGIN
+L2E_SOURCES += \
+ l2_emulation_cmds.cpp \
+ l2_emulation.cpp
+endif
+
+GBP_SOURCES =
+if ENABLE_GBP_PLUGIN
+GBP_SOURCES += \
+ gbp_endpoint_cmds.cpp \
+ gbp_endpoint.cpp \
+ gbp_contract_cmds.cpp \
+ gbp_contract.cpp
+endif
+
+libvom_la_SOURCES = \
+ types.cpp \
arp_proxy_binding_cmds.cpp \
arp_proxy_binding.cpp \
arp_proxy_config_cmds.cpp \
@@ -59,10 +89,6 @@ libvom_la_SOURCES = \
connection.cpp \
dhcp_config_cmds.cpp \
dhcp_config.cpp \
- gbp_endpoint_cmds.cpp \
- gbp_endpoint.cpp \
- gbp_contract_cmds.cpp \
- gbp_contract.cpp \
hw_cmds.cpp \
hw.cpp \
inspect.cpp \
@@ -77,8 +103,6 @@ libvom_la_SOURCES = \
ip_unnumbered.cpp \
l2_binding_cmds.cpp \
l2_binding.cpp \
- l2_emulation_cmds.cpp \
- l2_emulation.cpp \
l3_binding_cmds.cpp \
l3_binding.cpp \
lldp_binding_cmds.cpp \
@@ -86,10 +110,6 @@ libvom_la_SOURCES = \
lldp_global_cmds.cpp \
lldp_global.cpp \
logger.cpp \
- nat_static.cpp \
- nat_static_cmds.cpp \
- nat_binding.cpp \
- nat_binding_cmds.cpp \
neighbour.cpp \
neighbour_cmds.cpp \
object_base.cpp \
@@ -106,17 +126,47 @@ libvom_la_SOURCES = \
tap_interface.cpp \
tap_interface_cmds.cpp \
vxlan_tunnel_cmds.cpp \
- vxlan_tunnel.cpp
+ vxlan_tunnel.cpp \
+ $(ACL_SOURCES) \
+ $(NAT_SOURCES) \
+ $(L2E_SOURCES) \
+ $(GBP_SOURCES)
+
vomincludedir = $(includedir)/vom
-vominclude_HEADERS = \
+ACL_INCLUDES =
+if ENABLE_ACL_PLUGIN
+ACL_INCLUDES += \
acl_binding.hpp \
acl_ethertype.hpp \
acl_l2_rule.hpp \
acl_l3_rule.hpp \
acl_list.hpp \
- acl_types.hpp \
+ acl_types.hpp
+endif
+
+NAT_INCLUDES =
+if ENABLE_NAT_PLUGIN
+NAT_INCLUDES += \
+ nat_static.hpp \
+ nat_binding.hpp
+endif
+
+L2E_INCLUDES =
+if ENABLE_L2E_PLUGIN
+L2E_INCLUDES += \
+ l2_emulation.hpp
+endif
+
+GBP_INCLUDES =
+if ENABLE_GBP_PLUGIN
+GBP_INCLUDES += \
+ gbp_endpoint.hpp \
+ gbp_contract.hpp
+endif
+
+vominclude_INCLUDES = \
arp_proxy_binding.hpp \
arp_proxy_config.hpp \
bridge_domain.hpp \
@@ -130,8 +180,6 @@ vominclude_HEADERS = \
dump_cmd.hpp \
enum_base.hpp \
event_cmd.hpp \
- gbp_endpoint.hpp \
- gbp_contract.hpp \
hw.hpp \
inspect.hpp \
interface.hpp \
@@ -140,13 +188,10 @@ vominclude_HEADERS = \
interface_span.hpp \
ip_unnumbered.hpp \
l2_binding.hpp \
- l2_emulation.hpp \
l3_binding.hpp \
lldp_binding.hpp \
lldp_global.hpp \
logger.hpp \
- nat_static.hpp \
- nat_binding.hpp \
neighbour.hpp \
object_base.hpp \
om.hpp \
@@ -160,6 +205,10 @@ vominclude_HEADERS = \
sub_interface.hpp \
tap_interface.hpp \
types.hpp \
- vxlan_tunnel.hpp
+ vxlan_tunnel.hpp \
+ $(ACL_INCLUDES) \
+ $(NAT_INCLUDES) \
+ $(L2E_INCLUDES) \
+ $(GBP_INCLUDES)
# vi:syntax=automake
diff --git a/src/vpp-api/vom/bridge_domain_arp_entry.cpp b/src/vpp-api/vom/bridge_domain_arp_entry.cpp
index e8ae30f7642..a3bfcddf00e 100644
--- a/src/vpp-api/vom/bridge_domain_arp_entry.cpp
+++ b/src/vpp-api/vom/bridge_domain_arp_entry.cpp
@@ -174,6 +174,14 @@ bridge_domain_arp_entry::event_handler::show(std::ostream& os)
{
m_db.dump(os);
}
+
+std::ostream&
+operator<<(std::ostream& os, const bridge_domain_arp_entry::key_t& key)
+{
+ os << "[" << key.first << ", " << key.second << "]";
+
+ return (os);
+}
}
/*
* fd.io coding-style-patch-verification: ON
diff --git a/src/vpp-api/vom/nat_static.cpp b/src/vpp-api/vom/nat_static.cpp
index a90b0bcfac9..b507a5191d4 100644
--- a/src/vpp-api/vom/nat_static.cpp
+++ b/src/vpp-api/vom/nat_static.cpp
@@ -139,14 +139,6 @@ nat_static::dump(std::ostream& os)
m_db.dump(os);
}
-std::ostream&
-operator<<(std::ostream& os, const nat_static::key_t& key)
-{
- os << "[" << key.first << ", " << key.second << "]";
-
- return (os);
-}
-
nat_static::event_handler::event_handler()
{
OM::register_listener(this);