- Make outport optional in 'nf-add'.
- Accept 'vtap' mode in 'nfg-add'.
Signed-off-by: Naveen Yerramneni <[email protected]>
Acked-by: Sragdhara Datta Chaudhuri <[email protected]>
Acked-by: Aditya Mehakare <[email protected]>
---
tests/ovn-nbctl.at | 16 ++++++++++++++++
utilities/ovn-nbctl.c | 20 ++++++++++++--------
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at
index dccf30758..94c73e8fc 100644
--- a/tests/ovn-nbctl.at
+++ b/tests/ovn-nbctl.at
@@ -3338,6 +3338,22 @@ AT_CHECK([ovn-nbctl nf-list | uuidfilt], [0], [dnl
])
AT_CHECK([ovn-nbctl nf-del nf2])
AT_CHECK([ovn-nbctl nf-list | uuidfilt], [0], [])
+
+
+# Create network-function with only inport.
+AT_CHECK([ovn-nbctl nf-add nf0 svc-port0])
+AT_CHECK([ovn-nbctl nf-list | uuidfilt], [0], [dnl
+<0> (nf0) in:svc-port0 out:<not_set>
+])
+
+# Create a network-function-group in vtap mode.
+AT_CHECK([ovn-nbctl nfg-add nfg0 1 vtap nf0])
+AT_CHECK([ovn-nbctl nfg-list | uuidfilt], [0], [dnl
+<0> (nfg0)
+])
+AT_CHECK([ovn-nbctl nfg-del nfg0])
+AT_CHECK([ovn-nbctl nf-del nf0])
+
])
AT_SETUP([ovn-nbctl - TLS server name indication (SNI) with --ssl-server-name])
diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c
index cdf6b578a..d9ed232f9 100644
--- a/utilities/ovn-nbctl.c
+++ b/utilities/ovn-nbctl.c
@@ -393,7 +393,7 @@ Network function group commands:\n\
network-function-group\n\
\n\
Network function commands:\n\
- nf-add NETWORK-FUNCTION PORT-IN PORT-OUT\n\
+ nf-add NETWORK-FUNCTION PORT-IN [PORT-OUT]\n\
create a network-function\n\
nf-del NETWORK-FUNCTION delete a network-function\n\
nf-list print all network-functions\n\
@@ -2300,9 +2300,9 @@ nbctl_nf_group_add(struct ctl_context *ctx)
/* Validate and set mode */
const char *nfg_mode = ctx->argv[3];
- if (strcmp(nfg_mode, "inline")) {
+ if (strcmp(nfg_mode, "inline") && strcmp(nfg_mode, "vtap")) {
ctl_error(ctx, "Unsupported mode provided for "
- "network-function-group:%s, supported values: inline",
+ "network-function-group:%s, supported values: inline, vtap",
nfg_name);
return;
}
@@ -2500,10 +2500,14 @@ nbctl_nf_add(struct ctl_context *ctx)
ctx->error = error;
return;
}
- error = lsp_by_name_or_uuid(ctx, ctx->argv[3], true, &lsp_out);
- if (error) {
- ctx->error = error;
- return;
+ if (ctx->argc == 4) {
+ error = lsp_by_name_or_uuid(ctx, ctx->argv[3], true, &lsp_out);
+ if (error) {
+ ctx->error = error;
+ return;
+ }
+ } else {
+ lsp_out = NULL;
}
const char *nf_name = ctx->argv[1];
@@ -8877,7 +8881,7 @@ static const struct ctl_command_syntax nbctl_commands[] =
{
nbctl_nf_group_del_network_function, NULL, "--if-exists", RW },
/* network-function commands. */
- { "nf-add", 3, 3, "NETWORK-FUNCTION PORT-IN PORT-OUT",
+ { "nf-add", 2, 3, "NETWORK-FUNCTION PORT-IN [PORT-OUT]",
nbctl_pre_nf_add,
nbctl_nf_add,
NULL, "--may-exist", RW },
--
2.43.5
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
