From 3844da98f8aaad34f325307080ef106f36e2062d Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Sun, 27 Dec 2020 18:14:39 +0100 Subject: 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 --- include/osmocom/sgsn/gb_proxy.h | 4 ++++ src/gbproxy/gb_proxy_peer.c | 8 +++++++- src/gbproxy/gb_proxy_vty.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h index dd45c2f89..ad5bb27f3 100644 --- a/include/osmocom/sgsn/gb_proxy.h +++ b/include/osmocom/sgsn/gb_proxy.h @@ -60,6 +60,10 @@ struct gbproxy_config { /* NRI bitlen and usable NULL-NRI ranges */ uint8_t nri_bitlen; struct osmo_nri_ranges *null_nri_ranges; + + /* Used for testing: If not NULL then this SGSN is returned by + * gbproxy_sgsn_by_tlli() */ + struct gbproxy_sgsn *nsf_override; } pool; /* hash table of all BSS side Gb peers */ diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c index 88b71be47..94f9c03a6 100644 --- a/src/gbproxy/gb_proxy_peer.c +++ b/src/gbproxy/gb_proxy_peer.c @@ -507,9 +507,15 @@ struct gbproxy_sgsn *gbproxy_sgsn_by_tlli(struct gbproxy_config *cfg, struct gbp { 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_DEBUG, "Node selection 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 4d0fa3d9d..fb9e87a56 100644 --- a/src/gbproxy/gb_proxy_vty.c +++ b/src/gbproxy/gb_proxy_vty.c @@ -648,6 +648,36 @@ DEFUN(delete_gb_nsei, delete_gb_nsei_cmd, 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); @@ -659,6 +689,8 @@ int gbproxy_vty_init(void) 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); -- cgit v1.2.3