Change in osmo-sgsn[master]: gbproxy: Add VTY command to override the node selection function

[daniel]

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21883 )


Change subject: gbproxy: Add VTY command to override the node selection function
......................................................................

gbproxy: Add VTY command to override the node selection function

This is mainly useful when testing SGSN pooling

Change-Id: I2894320413dbd0b9aec9a9bc9b88ce7cdeed206b
Related: SYS#5115, OS#4472
---
M src/gbproxy/gb_proxy_peer.c
M src/gbproxy/gb_proxy_vty.c
2 files changed, 39 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/83/21883/1

diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c
index 3958de9..2c32587 100644
--- a/src/gbproxy/gb_proxy_peer.c
+++ b/src/gbproxy/gb_proxy_peer.c
@@ -507,9 +507,15 @@
 {
 	uint32_t i = 0;
 	uint32_t index, num_sgsns;
-	struct gbproxy_sgsn *sgsn;
 	OSMO_ASSERT(cfg);
 
+	struct gbproxy_sgsn *sgsn = cfg->pool.nsf_override;
+
+	if (sgsn) {
+		LOGPSGSN(sgsn, LOGL_ERROR, "Node select function is overridden by config\n");
+		return sgsn;
+	}
+
 	// TODO: We should keep track of count in cfg
 	num_sgsns = llist_count(&cfg->sgsns);
 
diff --git a/src/gbproxy/gb_proxy_vty.c b/src/gbproxy/gb_proxy_vty.c
index adcdf70..bdf85e7 100644
--- a/src/gbproxy/gb_proxy_vty.c
+++ b/src/gbproxy/gb_proxy_vty.c
@@ -649,6 +649,36 @@
 	return CMD_SUCCESS;
 }
 
+/* Only for ttcn3 testing */
+DEFUN_HIDDEN(sgsn_pool_nsf_fixed, sgsn_pool_nsf_fixed_cmd,
+	     "sgsn-pool nsf fixed NAME",
+	     "SGSN pooling: load balancing across multiple SGSNs.\n"
+	     "Customize the Network Selection Function.\n"
+	     "Set a fixed SGSN to use (for testing).\n"
+	     "The name of the SGSN to use.\n")
+{
+	const char *name = argv[0];
+	struct gbproxy_sgsn *sgsn = gbproxy_sgsn_by_name(g_cfg, name);
+
+	if (!sgsn) {
+		vty_out(vty, "%% Could not find SGSN with name %s%s", name, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	g_cfg->pool.nsf_override = sgsn;
+	return CMD_SUCCESS;
+}
+
+DEFUN_HIDDEN(sgsn_pool_nsf_normal, sgsn_pool_nsf_normal_cmd,
+	     "sgsn-pool nsf normal",
+	     "SGSN pooling: load balancing across multiple SGSNs.\n"
+	     "Customize the Network Selection Function.\n"
+	     "Reset the NSF back to regular operation (for testing).\n")
+{
+	g_cfg->pool.nsf_override = NULL;
+	return CMD_SUCCESS;
+}
+
 int gbproxy_vty_init(void)
 {
 	install_element_ve(&show_gbproxy_bvc_cmd);
@@ -660,6 +690,8 @@
 
 	install_element(ENABLE_NODE, &delete_gb_bvci_cmd);
 	install_element(ENABLE_NODE, &delete_gb_nsei_cmd);
+	install_element(ENABLE_NODE, &sgsn_pool_nsf_fixed_cmd);
+	install_element(ENABLE_NODE, &sgsn_pool_nsf_normal_cmd);
 
 	install_element(CONFIG_NODE, &cfg_gbproxy_cmd);
 	install_node(&gbproxy_node, config_write_gbproxy);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21883
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I2894320413dbd0b9aec9a9bc9b88ce7cdeed206b
Gerrit-Change-Number: 21883
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201228/f7079b99/attachment.htm>