Change in osmo-upf[master]: osmo-pfcp-tool VTY: rename 'endecaps' to 'tunend'

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30233 ) Change subject: osmo-pfcp-tool VTY: rename 'endecaps' to 'tunend' ...................................................................... osmo-pfcp-tool VTY: rename 'endecaps' to 'tunend' We're establishing 'tunend' as short name for encapsulation/decapsulation, also do this in osmo-pfcp-tool. Keep a hidden "session endecaps" VTY cmd as backwards compat alias. Related: SYS#6192 Change-Id: I0b44429cd6762fe401a4dced22ae2a3fd9bbe93b --- M contrib/osmo-pfcp-tool-scripts/session_est_without_assoc.vty R contrib/osmo-pfcp-tool-scripts/tunend_plus_tunmap.vty R contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty M src/osmo-pfcp-tool/pfcp_tool_vty.c 4 files changed, 18 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified diff --git a/contrib/osmo-pfcp-tool-scripts/session_est_without_assoc.vty b/contrib/osmo-pfcp-tool-scripts/session_est_without_assoc.vty index 2472292..4ca669a 100644 --- a/contrib/osmo-pfcp-tool-scripts/session_est_without_assoc.vty +++ b/contrib/osmo-pfcp-tool-scripts/session_est_without_assoc.vty @@ -1,4 +1,4 @@ timer pfcp x23 0 pfcp-peer 127.0.0.1 - session endecaps + session tunend tx session-est-req diff --git a/contrib/osmo-pfcp-tool-scripts/encaps_plus_tunmap.vty b/contrib/osmo-pfcp-tool-scripts/tunend_plus_tunmap.vty similarity index 97% rename from contrib/osmo-pfcp-tool-scripts/encaps_plus_tunmap.vty rename to contrib/osmo-pfcp-tool-scripts/tunend_plus_tunmap.vty index e84deee..1cfcd6d 100644 --- a/contrib/osmo-pfcp-tool-scripts/encaps_plus_tunmap.vty +++ b/contrib/osmo-pfcp-tool-scripts/tunend_plus_tunmap.vty @@ -11,7 +11,7 @@ pfcp-peer 127.0.0.11 tx assoc-setup-req sleep 1 - session endecaps 42 + session tunend 42 ue ip 192.168.100.42 gtp access ip 127.0.0.12 gtp access teid local 42 remote 142 diff --git a/contrib/osmo-pfcp-tool-scripts/endecaps_session_est.vty b/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty similarity index 87% rename from contrib/osmo-pfcp-tool-scripts/endecaps_session_est.vty rename to contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty index 9a19d8c..3862c15 100644 --- a/contrib/osmo-pfcp-tool-scripts/endecaps_session_est.vty +++ b/contrib/osmo-pfcp-tool-scripts/tunend_session_est.vty @@ -2,7 +2,7 @@ pfcp-peer 127.0.0.1 tx assoc-setup-req sleep 1 - session endecaps + session tunend tx session-est-req forw sleep 5 tx session-del-req diff --git a/src/osmo-pfcp-tool/pfcp_tool_vty.c b/src/osmo-pfcp-tool/pfcp_tool_vty.c index 4b402a3..70bca18 100644 --- a/src/osmo-pfcp-tool/pfcp_tool_vty.c +++ b/src/osmo-pfcp-tool/pfcp_tool_vty.c @@ -250,12 +250,14 @@ 1, }; +#define SESSION_STR "Enter the 'session' node for the given SEID\n" +#define TUNEND_STR "Set up GTP tunnel encapsulation/decapsulation (default)\n" +#define TUNMAP_STR "Set up GTP tunnel mapping\n" +#define SEID_STR "local Session Endpoint ID\n" + DEFUN(session, session_cmd, - "session [(endecaps|tunmap)] [<0-18446744073709551615>]", - "Enter the 'session' node for the given SEID\n" - "Set up GTP tunnel encapsulation/decapsulation (default)\n" - "Set up GTP tunnel mapping\n" - "local Session Endpoint ID\n") + "session [(tunend|tunmap)] [<0-18446744073709551615>]", + SESSION_STR TUNEND_STR TUNMAP_STR SEID_STR) { struct pfcp_tool_peer *peer = vty->index; struct pfcp_tool_session *session; @@ -275,6 +277,11 @@ return CMD_SUCCESS; } +/* legacy compat: "tunend" was originally named "endecaps" */ +DEFUN_CMD_ELEMENT(session, session_endecaps_cmd, + "session (endecaps) [<0-18446744073709551615>]", + SESSION_STR TUNEND_STR SEID_STR, CMD_ATTR_HIDDEN, 0); + DEFUN(s_ue, s_ue_cmd, "ue ip A.B.C.D", "Setup the UE as it appears towards the Core network in plain IP traffic\n" @@ -332,7 +339,7 @@ return CMD_SUCCESS; } -int session_endecaps_tx_est_req(struct vty *vty, const char **argv, int argc) +int session_tunend_tx_est_req(struct vty *vty, const char **argv, int argc) { struct pfcp_tool_session *session = vty->index; struct pfcp_tool_peer *peer = session->peer; @@ -655,7 +662,7 @@ struct pfcp_tool_session *session = vty->index; switch (session->gtp_action) { case UP_GTP_U_ENDECAPS: - return session_endecaps_tx_est_req(vty, argv, argc); + return session_tunend_tx_est_req(vty, argv, argc); case UP_GTP_U_TUNMAP: return session_tunmap_tx_est_req(vty, argv, argc); default: @@ -776,6 +783,7 @@ install_element(PEER_NODE, &peer_retrans_req_cmd); install_element(PEER_NODE, &session_cmd); + install_element(PEER_NODE, &session_endecaps_cmd); install_node(&session_node, NULL); install_element(SESSION_NODE, &c_sleep_cmd); install_element(SESSION_NODE, &session_tx_est_req_cmd); null-- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I0b44429cd6762fe401a4dced22ae2a3fd9bbe93b Gerrit-Change-Number: 30233 Gerrit-PatchSet: 1 Gerrit-Owner: neels &lt;nhofmeyr(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged