aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/gbp/CMakeLists.txt1
-rw-r--r--src/plugins/gbp/gbp.api28
-rw-r--r--src/plugins/gbp/gbp_all_api_h.h4
-rw-r--r--src/plugins/gbp/gbp_api_print.h349
-rw-r--r--src/plugins/gbp/gbp_bridge_domain.c11
5 files changed, 376 insertions, 17 deletions
diff --git a/src/plugins/gbp/CMakeLists.txt b/src/plugins/gbp/CMakeLists.txt
index 6789a9c1ade..6e6a1ee418a 100644
--- a/src/plugins/gbp/CMakeLists.txt
+++ b/src/plugins/gbp/CMakeLists.txt
@@ -52,5 +52,6 @@ add_vpp_plugin(gbp
INSTALL_HEADERS
gbp.h
gbp_all_api_h.h
+ gbp_api_print.h
gbp_msg_enum.h
)
diff --git a/src/plugins/gbp/gbp.api b/src/plugins/gbp/gbp.api
index ae45159d705..31bf3f28970 100644
--- a/src/plugins/gbp/gbp.api
+++ b/src/plugins/gbp/gbp.api
@@ -34,13 +34,13 @@ typedef gbp_bridge_domain
u32 bm_flood_sw_if_index;
};
-autoreply define gbp_bridge_domain_add
+manual_print autoreply define gbp_bridge_domain_add
{
u32 client_index;
u32 context;
vl_api_gbp_bridge_domain_t bd;
};
-autoreply define gbp_bridge_domain_del
+manual_print autoreply define gbp_bridge_domain_del
{
u32 client_index;
u32 context;
@@ -66,13 +66,13 @@ typedef gbp_route_domain
u32 ip6_uu_sw_if_index;
};
-autoreply define gbp_route_domain_add
+manual_print autoreply define gbp_route_domain_add
{
u32 client_index;
u32 context;
vl_api_gbp_route_domain_t rd;
};
-autoreply define gbp_route_domain_del
+manual_print autoreply define gbp_route_domain_del
{
u32 client_index;
u32 context;
@@ -120,7 +120,7 @@ typedef gbp_endpoint
vl_api_address_t ips[n_ips];
};
-define gbp_endpoint_add
+manual_print define gbp_endpoint_add
{
u32 client_index;
u32 context;
@@ -134,7 +134,7 @@ define gbp_endpoint_add_reply
u32 handle;
};
-autoreply define gbp_endpoint_del
+manual_print autoreply define gbp_endpoint_del
{
u32 client_index;
u32 context;
@@ -170,13 +170,13 @@ typeonly define gbp_endpoint_group
vl_api_gbp_endpoint_retention_t retention;
};
-autoreply define gbp_endpoint_group_add
+manual_print autoreply define gbp_endpoint_group_add
{
u32 client_index;
u32 context;
vl_api_gbp_endpoint_group_t epg;
};
-autoreply define gbp_endpoint_group_del
+manual_print autoreply define gbp_endpoint_group_del
{
u32 client_index;
u32 context;
@@ -202,7 +202,7 @@ typeonly define gbp_recirc
u8 is_ext;
};
-autoreply define gbp_recirc_add_del
+manual_print autoreply define gbp_recirc_add_del
{
u32 client_index;
u32 context;
@@ -239,7 +239,7 @@ typeonly define gbp_subnet
vl_api_prefix_t prefix;
};
-autoreply define gbp_subnet_add_del
+manual_print autoreply define gbp_subnet_add_del
{
u32 client_index;
u32 context;
@@ -305,7 +305,7 @@ typedef gbp_contract
vl_api_gbp_rule_t rules[n_rules];
};
-autoreply define gbp_contract_add_del
+manual_print autoreply define gbp_contract_add_del
{
u32 client_index;
u32 context;
@@ -345,7 +345,7 @@ typedef gbp_vxlan_tunnel
vl_api_ip4_address_t src;
};
-define gbp_vxlan_tunnel_add
+manual_print define gbp_vxlan_tunnel_add
{
u32 client_index;
u32 context;
@@ -359,7 +359,7 @@ define gbp_vxlan_tunnel_add_reply
u32 sw_if_index;
};
-autoreply define gbp_vxlan_tunnel_del
+manual_print autoreply define gbp_vxlan_tunnel_del
{
u32 client_index;
u32 context;
@@ -385,7 +385,7 @@ typeonly define gbp_ext_itf
u32 rd_id;
};
-autoreply define gbp_ext_itf_add_del
+manual_print autoreply define gbp_ext_itf_add_del
{
u32 client_index;
u32 context;
diff --git a/src/plugins/gbp/gbp_all_api_h.h b/src/plugins/gbp/gbp_all_api_h.h
index 3093309e80f..dd78bc1d3ab 100644
--- a/src/plugins/gbp/gbp_all_api_h.h
+++ b/src/plugins/gbp/gbp_all_api_h.h
@@ -15,3 +15,7 @@
/* Include the generated file, see BUILT_SOURCES in Makefile.am */
#include <gbp/gbp.api.h>
+#ifdef vl_printfun
+#include <gbp/gbp_api_print.h>
+#endif
+
diff --git a/src/plugins/gbp/gbp_api_print.h b/src/plugins/gbp/gbp_api_print.h
new file mode 100644
index 00000000000..21b351984b8
--- /dev/null
+++ b/src/plugins/gbp/gbp_api_print.h
@@ -0,0 +1,349 @@
+/*
+ * Copyright (c) 2019 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __GBP_API_PRINT_H__
+#define __GBP_API_PRINT_H__
+
+#include <vpp/api/types.h>
+
+/* Macro to finish up custom dump fns */
+#define PRINT_S \
+ vec_add1 (s, 0); \
+ vl_print (handle, (char *)s); \
+ vec_free (s);
+
+static inline void *
+vl_api_gbp_bridge_domain_add_t_print (vl_api_gbp_bridge_domain_add_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_bridge_domain_add ");
+ s = format (s, "bd_id %d ", ntohl (a->bd.bd_id));
+ s = format (s, "flags %d ", ntohl (a->bd.flags));
+ s = format (s, "uu-fwd %d ", ntohl (a->bd.uu_fwd_sw_if_index));
+ s = format (s, "bvi %d ", ntohl (a->bd.bvi_sw_if_index));
+ s = format (s, "bm-flood %d", ntohl (a->bd.bm_flood_sw_if_index));
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_bridge_domain_del_t_print (vl_api_gbp_bridge_domain_del_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_bridge_domain_del ");
+ s = format (s, "bd_id %d ", ntohl (a->bd_id));
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_route_domain_add_t_print (vl_api_gbp_route_domain_add_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_route_domain_add ");
+ s = format (s, "rd_id %d ", ntohl (a->rd.rd_id));
+ s = format (s, "ip4_table_id %d ", ntohl (a->rd.ip4_table_id));
+ s = format (s, "ip6_table_id %d ", ntohl (a->rd.ip6_table_id));
+ s = format (s, "ip4_uu_sw_if_index %d ", ntohl (a->rd.ip4_uu_sw_if_index));
+ s = format (s, "ip6_uu_sw_if_index %d", ntohl (a->rd.ip6_uu_sw_if_index));
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_route_domain_del_t_print (vl_api_gbp_route_domain_del_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_route_domain_del ");
+ s = format (s, "rd_id %d", ntohl (a->rd_id));
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_endpoint_add_t_print (vl_api_gbp_endpoint_add_t * a, void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_endpoint_add ");
+ s = format (s, "sw_if_index %d ", ntohl (a->endpoint.sw_if_index));
+ s = format (s, "sclass %d ", ntohs (a->endpoint.sclass));
+ s = format (s, "flags %x ", ntohl (a->endpoint.flags));
+ s = format (s, "mac %U ", format_vl_api_mac_address, a->endpoint.mac);
+ s =
+ format (s, "\n\ttun\n\t\t src %U", format_vl_api_address,
+ &a->endpoint.tun.src);
+ s =
+ format (s, "\n\t\t dst %U ", format_vl_api_address, &a->endpoint.tun.dst);
+
+ if (a->endpoint.n_ips)
+ s = format (s, "\n\t ips");
+ for (int i = 0; i < a->endpoint.n_ips; i++)
+ s = format (s, "\n\t\t %U", format_vl_api_address, &a->endpoint.ips[i]);
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_endpoint_del_t_print (vl_api_gbp_endpoint_del_t * a, void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_endpoint_del ");
+ s = format (s, "handle %d", ntohl (a->handle));
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_endpoint_group_add_t_print (vl_api_gbp_endpoint_group_add_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_endpoint_group_add ");
+ s = format (s, "vnid %d ", ntohl (a->epg.vnid));
+ s = format (s, "sclass %d ", ntohs (a->epg.sclass));
+ s = format (s, "bd_id %d ", ntohl (a->epg.bd_id));
+ s = format (s, "rd_id %d ", ntohl (a->epg.rd_id));
+ s = format (s, "uplink_sw_if_index %d ", ntohl (a->epg.uplink_sw_if_index));
+ s =
+ format (s, "remote_ep_timeout %d",
+ ntohl (a->epg.retention.remote_ep_timeout));
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_endpoint_group_del_t_print (vl_api_gbp_endpoint_group_del_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_endpoint_group_del ");
+ s = format (s, "sclass %d ", ntohs (a->sclass));
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_recirc_add_del_t_print (vl_api_gbp_recirc_add_del_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_recirc_add_del ");
+
+ if (a->is_add)
+ s = format (s, "add ");
+ else
+ s = format (s, "del ");
+ s = format (s, "sw_if_index %d ", ntohl (a->recirc.sw_if_index));
+ s = format (s, "sclass %d ", ntohs (a->recirc.sclass));
+ s = format (s, "is_ext %d ", a->recirc.is_ext);
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_subnet_add_del_t_print (vl_api_gbp_subnet_add_del_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_subnet_add_del ");
+ if (a->is_add)
+ s = format (s, "add ");
+ else
+ s = format (s, "del ");
+ s = format (s, "rd_id %d ", ntohl (a->subnet.rd_id));
+ s = format (s, "sw_if_index %d ", ntohl (a->subnet.sw_if_index));
+ s = format (s, "sclass %d ", ntohs (a->subnet.sclass));
+ s = format (s, "type %d ", ntohl (a->subnet.type));
+ s =
+ format (s, "prefix %U/%d", format_vl_api_address,
+ &a->subnet.prefix.address, a->subnet.prefix.address_length);
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_contract_add_del_t_print (vl_api_gbp_contract_add_del_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_contract_add_del ");
+ if (a->is_add)
+ s = format (s, "add ");
+ else
+ s = format (s, "del ");
+ s = format (s, "sclass %d ", ntohs (a->contract.sclass));
+ s = format (s, "dclass %d ", ntohs (a->contract.dclass));
+ s = format (s, "acl_index %d \n", ntohl (a->contract.acl_index));
+ for (int i = 0; i < a->contract.n_rules; i++)
+ {
+ s = format (s, "\t action %d\n", ntohl (a->contract.rules[i].action));
+ s =
+ format (s, "\t hash_mode %d",
+ ntohl (a->contract.rules[i].nh_set.hash_mode));
+ for (int j = 0; j < a->contract.rules[i].nh_set.n_nhs; j++)
+ {
+ s =
+ format (s, "\n\t \t nhs ip %U ", format_vl_api_address,
+ &a->contract.rules[i].nh_set.nhs[j].ip);
+ s =
+ format (s, "nhs mac %U ", format_vl_api_mac_address,
+ a->contract.rules[i].nh_set.nhs[j].mac);
+ s =
+ format (s, "nhs bd_id %d ",
+ ntohl (a->contract.rules[i].nh_set.nhs[j].bd_id));
+ s =
+ format (s, "nhs rd_id %d",
+ ntohl (a->contract.rules[i].nh_set.nhs[j].rd_id));
+ }
+ s = format (s, "\n");
+ }
+
+ if (a->contract.n_ether_types)
+ s = format (s, "\tethertypes");
+ for (int i = 0; i < a->contract.n_ether_types; i++)
+ {
+ s = format (s, " %d ", ntohs (a->contract.allowed_ethertypes[i]));
+ }
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_vxlan_tunnel_add_t_print (vl_api_gbp_vxlan_tunnel_add_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_vxlan_tunnel_add ");
+
+ s = format (s, "vni %d ", ntohl (a->tunnel.vni));
+ s = format (s, "mode %d ", ntohl (a->tunnel.mode));
+ s = format (s, "bd_rd_id %d ", ntohl (a->tunnel.bd_rd_id));
+ s = format (s, "src %U ", format_vl_api_ip4_address, a->tunnel.src);
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_vxlan_tunnel_del_t_print (vl_api_gbp_vxlan_tunnel_del_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_vxlan_tunnel_del ");
+ s = format (s, "vni %d ", ntohl (a->vni));
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+static inline void *
+vl_api_gbp_ext_itf_add_del_t_print (vl_api_gbp_ext_itf_add_del_t * a,
+ void *handle)
+{
+ u8 *s = 0;
+
+ s = format (s, "SCRIPT: gbp_ext_itf_add_del ");
+ if (a->is_add)
+ s = format (s, "add ");
+ else
+ s = format (s, "del ");
+
+ s = format (s, "sw_if_index %d ", ntohl (a->ext_itf.sw_if_index));
+ s = format (s, "bd_id %d ", ntohl (a->ext_itf.bd_id));
+ s = format (s, "rd_id %d ", ntohl (a->ext_itf.rd_id));
+
+ s = format (s, "\n");
+
+ PRINT_S;
+
+ return handle;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
+
+#endif /* __GBP_API_PRINT_H__ */
diff --git a/src/plugins/gbp/gbp_bridge_domain.c b/src/plugins/gbp/gbp_bridge_domain.c
index 02ed97d7452..17ccc345b66 100644
--- a/src/plugins/gbp/gbp_bridge_domain.c
+++ b/src/plugins/gbp/gbp_bridge_domain.c
@@ -319,12 +319,15 @@ gbp_bridge_domain_cli (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
vnet_main_t *vnm = vnet_get_main ();
+ gbp_bridge_domain_flags_t flags;
u32 bm_flood_sw_if_index = ~0;
u32 uu_fwd_sw_if_index = ~0;
u32 bvi_sw_if_index = ~0;
u32 bd_id = ~0;
u8 add = 1;
+ flags = GBP_BD_FLAG_NONE;
+
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
if (unformat (input, "bvi %U", unformat_vnet_sw_interface,
@@ -340,6 +343,8 @@ gbp_bridge_domain_cli (vlib_main_t * vm,
add = 1;
else if (unformat (input, "del"))
add = 0;
+ else if (unformat (input, "flags &d", &flags))
+ add = 0;
else if (unformat (input, "bd %d", &bd_id))
;
else
@@ -347,14 +352,14 @@ gbp_bridge_domain_cli (vlib_main_t * vm,
}
if (~0 == bd_id)
- return clib_error_return (0, "EPG-ID must be specified");
+ return clib_error_return (0, "BD-ID must be specified");
if (add)
{
if (~0 == bvi_sw_if_index)
return clib_error_return (0, "interface must be specified");
- gbp_bridge_domain_add_and_lock (bd_id, GBP_BD_FLAG_NONE,
+ gbp_bridge_domain_add_and_lock (bd_id, flags,
bvi_sw_if_index,
uu_fwd_sw_if_index,
bm_flood_sw_if_index);
@@ -375,7 +380,7 @@ gbp_bridge_domain_cli (vlib_main_t * vm,
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (gbp_bridge_domain_cli_node, static) = {
.path = "gbp bridge-domain",
- .short_help = "gbp bridge-domain [del] epg bd <ID> bvi <interface> uu-flood <interface>",
+ .short_help = "gbp bridge-domain [del] bd <ID> bvi <interface> uu-flood <interface>",
.function = gbp_bridge_domain_cli,
};