pespin has uploaded this change for review.

View Change

vty: Support configuring local PFCP Node ID

Related: SYS#7719
Depends: libosmo-pfcp.git Change-Id Ibfb53fddb618a4480d873ceb783e56c0a0e5fead
Change-Id: Iaa6b0ca03f042c6d6538855559eff1353a6dc3ee
---
M TODO-RELEASE
M include/osmocom/hnbgw/hnbgw.h
M src/osmo-hnbgw/hnbgw_pfcp.c
M src/osmo-hnbgw/hnbgw_vty.c
M tests/pfcp_cfg.vty.with_pfcp
5 files changed, 36 insertions(+), 11 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/75/44075/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 5e970b9..f4443e1 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -9,3 +9,4 @@
#library what description / commit summary line
libosmo-sigtran >2.3.0 OSMO_SCCP_REL_REASON_NSU_*
libosmo-sigtran >2.3.0 OSMO_SCCP_RETURN_REASON_*, osmo_sccp_return_reason_name()
+libosmo-pfcp >0.7.0 osmo_pfcp_ie_node_id_from_str()
diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h
index 36e8943..6560adf 100644
--- a/include/osmocom/hnbgw/hnbgw.h
+++ b/include/osmocom/hnbgw/hnbgw.h
@@ -105,6 +105,7 @@
uint16_t local_port;
char *remote_addr;
uint16_t remote_port;
+ char *node_id;
struct {
char *access;
char *core;
diff --git a/src/osmo-hnbgw/hnbgw_pfcp.c b/src/osmo-hnbgw/hnbgw_pfcp.c
index 1f858e0..86efe19 100644
--- a/src/osmo-hnbgw/hnbgw_pfcp.c
+++ b/src/osmo-hnbgw/hnbgw_pfcp.c
@@ -163,18 +163,15 @@
}
LOGP(DLPFCP, LOGL_DEBUG, "%p cfg: pfcp remote-addr %s\n", g_hnbgw, g_hnbgw->config.pfcp.remote_addr);

- if (!g_hnbgw->config.pfcp.local_addr) {
- LOGP(DLPFCP, LOGL_ERROR, "Configuration error: missing local PFCP address, required for Node Id\n");
- return -1;
- }
-
cfg = (struct osmo_pfcp_endpoint_cfg){
.set_msg_ctx_cb = pfcp_set_msg_ctx,
.rx_msg_cb = pfcp_rx_msg,
};

/* Set up PFCP endpoint's local node id from local IP address. Parse address string into local_addr_str... */
- if (osmo_sockaddr_str_from_str(&local_addr_str, g_hnbgw->config.pfcp.local_addr, g_hnbgw->config.pfcp.local_port)) {
+ if (osmo_sockaddr_str_from_str(&local_addr_str,
+ g_hnbgw->config.pfcp.local_addr,
+ g_hnbgw->config.pfcp.local_port)) {
LOGP(DLPFCP, LOGL_ERROR, "Error in PFCP local IP: %s\n",
osmo_quote_str_c(OTC_SELECT, g_hnbgw->config.pfcp.local_addr, -1));
return -1;
@@ -185,11 +182,20 @@
osmo_quote_str_c(OTC_SELECT, g_hnbgw->config.pfcp.local_addr, -1));
return -1;
}
- /* also store the local addr as local Node ID */
- if (osmo_pfcp_ie_node_id_from_osmo_sockaddr(&cfg.local_node_id, &cfg.local_addr)) {
- LOGP(DLPFCP, LOGL_ERROR, "Error in PFCP local IP: %s\n",
- osmo_quote_str_c(OTC_SELECT, g_hnbgw->config.pfcp.local_addr, -1));
- return -1;
+
+ if (g_hnbgw->config.pfcp.node_id) {
+ /* Set up PFCP endpoint's Node ID from VTY config: */
+ if (osmo_pfcp_ie_node_id_from_str(&cfg.local_node_id, g_hnbgw->config.pfcp.node_id)) {
+ LOGP(DLPFCP, LOGL_ERROR, "Error in PFCP local Node ID %s\n",
+ g_hnbgw->config.pfcp.node_id);
+ return -1;
+ }
+ } else {
+ if (osmo_pfcp_ie_node_id_from_osmo_sockaddr(&cfg.local_node_id, &cfg.local_addr)) {
+ LOGP(DLPFCP, LOGL_ERROR, "Error in PFCP local IP: %s\n",
+ osmo_quote_str_c(OTC_SELECT, g_hnbgw->config.pfcp.local_addr, -1));
+ return -1;
+ }
}

/* Set up remote PFCP address to reach UPF at. First parse the string into upf_addr_str. */
diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c
index aec0bbe..2857e4d 100644
--- a/src/osmo-hnbgw/hnbgw_vty.c
+++ b/src/osmo-hnbgw/hnbgw_vty.c
@@ -1055,6 +1055,16 @@
return CMD_SUCCESS;
}

+DEFUN(cfg_pfcp_node_id, cfg_pfcp_node_id_cmd,
+ "node-id (IP_ADDR|FQDN)",
+ "Set the local Node ID to transmit over PFCP\n"
+ "IPv4 or IPv6 address\n"
+ "FQDN\n")
+{
+ osmo_talloc_replace_string(g_hnbgw, &g_hnbgw->config.pfcp.node_id, argv[0]);
+ return CMD_SUCCESS;
+}
+
DEFUN(cfg_pfcp_netinst, cfg_pfcp_netinst_cmd,
"netinst (access|core) NAME",
"Add a Network Instance IE to all outgoing PFCP rule sets,"
@@ -1209,6 +1219,8 @@
vty_out(vty, " local-port %u%s", g_hnbgw->config.pfcp.local_port, VTY_NEWLINE);
if (g_hnbgw->config.pfcp.remote_addr)
vty_out(vty, " remote-addr %s%s", g_hnbgw->config.pfcp.remote_addr, VTY_NEWLINE);
+ if (g_hnbgw->config.pfcp.node_id)
+ vty_out(vty, " node-id %s%s", g_hnbgw->config.pfcp.node_id, VTY_NEWLINE);
if (g_hnbgw->config.pfcp.netinst.access
&& *g_hnbgw->config.pfcp.netinst.access)
vty_out(vty, " netinst access %s%s", g_hnbgw->config.pfcp.netinst.access, VTY_NEWLINE);
@@ -1295,6 +1307,7 @@
install_element(PFCP_NODE, &cfg_pfcp_local_addr_cmd);
install_element(PFCP_NODE, &cfg_pfcp_local_port_cmd);
install_element(PFCP_NODE, &cfg_pfcp_remote_addr_cmd);
+ install_element(PFCP_NODE, &cfg_pfcp_node_id_cmd);
install_element(PFCP_NODE, &cfg_pfcp_netinst_cmd);
#endif

diff --git a/tests/pfcp_cfg.vty.with_pfcp b/tests/pfcp_cfg.vty.with_pfcp
index 50304f7..21a33ac 100644
--- a/tests/pfcp_cfg.vty.with_pfcp
+++ b/tests/pfcp_cfg.vty.with_pfcp
@@ -15,6 +15,7 @@
local-addr IP_ADDR
local-port <1-65535>
remote-addr IP_ADDR
+ node-id (IP_ADDR|FQDN)
netinst (access|core) NAME

OsmoHNBGW(config-hnbgw-pfcp)# local-addr?
@@ -32,6 +33,9 @@
OsmoHNBGW(config-hnbgw-pfcp)# remote-addr ?
IP_ADDR IP address

+OsmoHNBGW(config-hnbgw-pfcp)# node-id?
+ node-id Set the local Node ID to transmit over PFCP
+
OsmoHNBGW(config-hnbgw-pfcp)# netinst?
netinst Add a Network Instance IE to all outgoing PFCP rule sets, so that the UPF may choose the correct interface to open GTP tunnels on.
OsmoHNBGW(config-hnbgw-pfcp)# netinst ?

To view, visit change 44075. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: newchange
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Iaa6b0ca03f042c6d6538855559eff1353a6dc3ee
Gerrit-Change-Number: 44075
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin@sysmocom.de>