Attention is currently required from: osmith, fixeria, msuraev.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29794 )
Change subject: jenkins-gerrit: add note for build fails/pkgs pass
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
I would really avoid clogging the comments with more and more text. It's clear that if something failed you want to go check the test execution log, so I only want that link and not tons of lines explaining what may be wrong (IMHO).
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29794
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I70027ec970a220c3ddfa766302faec7bd8752118
Gerrit-Change-Number: 29794
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 18 Oct 2022 12:39:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/29796 )
Change subject: vty: Make use of new mgcp_client_pool_config_write() API
......................................................................
vty: Make use of new mgcp_client_pool_config_write() API
Let's use the new API available in libosmo-mgcp-client to control more
consciously where the mgw pool config is printed.
Before this patch, the place where the node was printed was defined
based on implementation details on how the enum of nodes are defined and
installed.
Related: SYS#5987
Depends: osmo-mgw.git Change-Id I7a620cf47886d8ecab30ce369cf123d98ab842c5
Change-Id: Ic473fe05c55e8df3eddedf0260ec04b6fefc501f
---
M TODO-RELEASE
M src/libmsc/msc_vty.c
2 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/96/29796/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index d0852fc..502fff6 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public release: c:r:0.
#library what description / commit summary line
+libosmo-mgcp-client >1.10.0 mgcp_client_pool_config_write()
\ No newline at end of file
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 357b975..b28ed0d 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -390,6 +390,8 @@
if (!gsmnet->call_waiting)
vty_out(vty, " no call-waiting%s", VTY_NEWLINE);
+ mgcp_client_pool_config_write(vty, " ");
+
return CMD_SUCCESS;
}
@@ -2033,7 +2035,7 @@
install_element(GSMNET_NODE, &cfg_net_no_per_loc_upd_cmd);
install_element(GSMNET_NODE, &cfg_net_call_wait_cmd);
install_element(GSMNET_NODE, &cfg_net_no_call_wait_cmd);
- mgcp_client_pool_vty_init(GSMNET_NODE, MGW_NODE, " ", msc_network->mgw.mgw_pool);
+ mgcp_client_pool_vty_init(GSMNET_NODE, MGW_NODE, NULL, msc_network->mgw.mgw_pool);
install_element(CONFIG_NODE, &cfg_msc_cmd);
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29796
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ic473fe05c55e8df3eddedf0260ec04b6fefc501f
Gerrit-Change-Number: 29796
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29795 )
Change subject: mgcp-client: Introduce API mgcp_client_pool_config_write
......................................................................
Patch Set 1:
(1 comment)
File src/libosmo-mgcp-client/mgcp_client_vty.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-254):
https://gerrit.osmocom.org/c/osmo-mgw/+/29795/comment/533a6009_066ed81a
PS1, Line 333: /* Deprecated, used for backward compatiblity with older users which didn't call
'compatiblity' may be misspelled - perhaps 'compatibility'?
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29795
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I7a620cf47886d8ecab30ce369cf123d98ab842c5
Gerrit-Change-Number: 29795
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Tue, 18 Oct 2022 12:32:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29795 )
Change subject: mgcp-client: Introduce API mgcp_client_pool_config_write
......................................................................
mgcp-client: Introduce API mgcp_client_pool_config_write
It is not a good idea to use a personal write_config function for the
MGW node, since it's not meant to be a 1st level (top) node.
During write-config the node function will be called at an
implementation specific time (based on the order defined by the app in
the node type enum), so there's no real way to control that the output
of the MGW node will end up under the parent configured in
mgcp_client_pool_vty_init(). As mentioned the order can be tweaked based
on how the node enums are configured, installed, etc. but that's really
a nightmare, so let's better not rely on that.
Therefore, this patch introduces a new API which the users (apps such as
OsmoBSc and OsmoMSC) can use to write the config at the required time
(when writing its own parent node).
A hack is introduced internally to detect older versions of the users
which didn't call this function to still print stuff (up to to the app
if the order is correct).
Related: SYS#5987
Change-Id: I7a620cf47886d8ecab30ce369cf123d98ab842c5
---
M TODO-RELEASE
M include/osmocom/mgcp_client/mgcp_client_pool.h
M src/libosmo-mgcp-client/mgcp_client_vty.c
3 files changed, 42 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/95/29795/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 5fe3d53..3e10bf9 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -26,4 +26,4 @@
#library what description / commit summary line
libosmo-netif >1.2.0 OSMUX_DEFAULT_PORT, osmux_xfrm_output_*, osmux_xfrm_input_*
libosmocore >1.7.0 osmo_sockaddr_is_any()
-libmgcp-client NEW APIs mgcp_client_pool_member_...()
\ No newline at end of file
+libmgcp-client NEW APIs mgcp_client_pool_member_...(), mgcp_client_pool_config_write()
\ No newline at end of file
diff --git a/include/osmocom/mgcp_client/mgcp_client_pool.h b/include/osmocom/mgcp_client/mgcp_client_pool.h
index b547b78..46d7e90 100644
--- a/include/osmocom/mgcp_client/mgcp_client_pool.h
+++ b/include/osmocom/mgcp_client/mgcp_client_pool.h
@@ -9,6 +9,7 @@
struct mgcp_client_pool *mgcp_client_pool_alloc(void *talloc_ctx);
void mgcp_client_pool_vty_init(int parent_node, int mgw_node, const char *indent, struct mgcp_client_pool *pool);
+int mgcp_client_pool_config_write(struct vty *vty, const char *indent);
unsigned int mgcp_client_pool_connect(struct mgcp_client_pool *pool);
void mgcp_client_pool_register_single(struct mgcp_client_pool *pool, struct mgcp_client *mgcp_client);
diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c
index 1672f97..a0e547a 100644
--- a/src/libosmo-mgcp-client/mgcp_client_vty.c
+++ b/src/libosmo-mgcp-client/mgcp_client_vty.c
@@ -330,18 +330,41 @@
vty_init_common(talloc_ctx, node);
}
+/* Deprecated, used for backward compatiblity with older users which didn't call
+ * mgcp_client_pool_config_write(): */
+static bool mgcp_client_pool_config_write_called = false;
static int config_write_pool(struct vty *vty)
{
+ if (mgcp_client_pool_config_write_called)
+ return CMD_SUCCESS;
+ return mgcp_client_pool_config_write(vty, NULL);
+}
+
+/*! Write out MGCP client config to VTY.
+ * \param[in] vty VTY to which we should print.
+ * \param[in] indent string used for indentation (e.g. " ").
+ If NULL, indentation passed during mgcp_client_pool_vty_init() will be used.
+ * \returns CMD_SUCCESS on success, CMD_WARNING on error */
+int mgcp_client_pool_config_write(struct vty *vty, const char *indent)
+{
struct mgcp_client_pool *pool = global_mgcp_client_pool;
struct mgcp_client_pool_member *pool_member;
- unsigned int indent_buf_len = strlen(pool->vty_indent) + 1 + 1;
- char *indent = talloc_zero_size(vty, indent_buf_len);
+ unsigned int subindent_buf_len;
+ char *subindent;
- snprintf(indent, indent_buf_len, "%s ", pool->vty_indent);
+ /* Tell internal node write function that the user supports calling proper API: */
+ mgcp_client_pool_config_write_called = true;
+
+ if (!indent)
+ indent = pool->vty_indent ? : "";
+ subindent_buf_len = strlen(indent) + 1 + 1;
+ subindent = talloc_zero_size(vty, subindent_buf_len);
+
+ snprintf(subindent, subindent_buf_len, "%s ", indent);
llist_for_each_entry(pool_member, &pool->member_list, list) {
- vty_out(vty, "%smgw %u%s", pool->vty_indent, pool_member->nr, VTY_NEWLINE);
- config_write(vty, indent, &pool_member->conf);
+ vty_out(vty, "%smgw %u%s", indent, pool_member->nr, VTY_NEWLINE);
+ config_write(vty, subindent, &pool_member->conf);
}
/* MGW pool API is supported by user (global_mgcp_client_pool is set
@@ -350,11 +373,11 @@
* replacing it, then output the single MGW converted to the new MGW
* pool VTY. */
if (llist_empty(&pool->member_list) && pool->mgcp_client_single) {
- vty_out(vty, "%smgw 0%s", pool->vty_indent, VTY_NEWLINE);
- config_write(vty, indent, global_mgcp_client_conf);
+ vty_out(vty, "%smgw 0%s", indent, VTY_NEWLINE);
+ config_write(vty, subindent, global_mgcp_client_conf);
}
- talloc_free(indent);
+ talloc_free(subindent);
return CMD_SUCCESS;
}
@@ -495,7 +518,8 @@
* (called once at startup by the application process).
* \param[in] parent_node identifier of the parent node on which the mgw node appears.
* \param[in] mgw_node identifier that should be used with the newly installed MGW node.
- * \param[in] indent indentation string to match the indentation in the VTY config
+ * \param[in] indent indentation string to match the indentation in the VTY config.
+ If NULL, it must be passed explicitly each time mgcp_client_pool_config_write() is called.
* \param[in] pool user provided memory to store the configured MGCP client (MGW) pool. */
void mgcp_client_pool_vty_init(int parent_node, int mgw_node, const char *indent, struct mgcp_client_pool *pool)
{
@@ -503,11 +527,12 @@
OSMO_ASSERT(pool);
/* Never allow this function to be called twice on the same pool */
- OSMO_ASSERT(!pool->vty_indent);
OSMO_ASSERT(!pool->vty_node);
- pool->vty_indent = talloc_strdup(pool, indent);
- OSMO_ASSERT(pool->vty_indent);
+ if (indent) {
+ pool->vty_indent = talloc_strdup(pool, indent);
+ OSMO_ASSERT(pool->vty_indent);
+ }
pool->vty_node = talloc_zero(pool, struct cmd_node);
OSMO_ASSERT(pool->vty_node);
pool->vty_node->node = mgw_node;
@@ -517,6 +542,9 @@
install_lib_element(parent_node, &cfg_mgw_cmd);
install_lib_element(parent_node, &cfg_no_mgw_cmd);
+ /* Note: config_write_pool is deprecated and user is expected to
+ * manually call mgcp_client_pool_config_write() when printing the VTY
+ * config */
install_node(pool->vty_node, config_write_pool);
vty_init_common(pool, mgw_node);
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29795
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I7a620cf47886d8ecab30ce369cf123d98ab842c5
Gerrit-Change-Number: 29795
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin, fixeria, msuraev.
Hello Jenkins Builder, pespin, fixeria, msuraev,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/29794
to look at the new patch set (#2).
Change subject: jenkins-gerrit: add note for build fails/pkgs pass
......................................................................
jenkins-gerrit: add note for build fails/pkgs pass
One might be wondering what happened if the build job failed, but
building the binary packages succeeded. Since we run 'make check' in
all cases. Add this short explanation:
The build job(s) failed, but deb/rpm jobs passed.
We don't enable external/vty tests when building
packages, so maybe those failed. Check the logs.
Related: OS#2385
Change-Id: I70027ec970a220c3ddfa766302faec7bd8752118
---
M scripts/jenkins-gerrit/pipeline_summary.py
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/94/29794/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29794
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I70027ec970a220c3ddfa766302faec7bd8752118
Gerrit-Change-Number: 29794
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: newpatchset
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29794 )
Change subject: jenkins-gerrit: add note for build fails/pkgs pass
......................................................................
jenkins-gerrit: add note for build fails/pkgs pass
One might be wondering what happened if the build job failed, but
building the binary packages succeeded. Since we run 'make check' in
all cases. Add this short explanation:
The build job(s) failed, but rpm/deb jobs passed.
We don't enable external/vty tests when building
packages, so maybe those failed. Check the logs.
Related: OS#2385
Change-Id: I70027ec970a220c3ddfa766302faec7bd8752118
---
M scripts/jenkins-gerrit/pipeline_summary.py
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/94/29794/1
diff --git a/scripts/jenkins-gerrit/pipeline_summary.py b/scripts/jenkins-gerrit/pipeline_summary.py
index a47ab7c..e64fba2 100755
--- a/scripts/jenkins-gerrit/pipeline_summary.py
+++ b/scripts/jenkins-gerrit/pipeline_summary.py
@@ -156,6 +156,14 @@
summary += f"{len(jobs['passed'])} passed:\n"
summary += get_jobs_list_str(jobs["passed"])
+ if "build" in pipeline and "deb" in pipeline and "rpm" in pipeline and \
+ not pipeline["build"]["passed"] and pipeline["deb"]["passed"] \
+ and pipeline["rpm"]["passed"]:
+ summary += "\n"
+ summary += "The build job(s) failed, but rpm/deb jobs passed.\n"
+ summary += "We don't enable external/vty tests when building\n"
+ summary += "packages, so maybe those failed. Check the logs.\n"
+
if "lint" in pipeline and not pipeline["lint"]["passed"]:
summary += "\n"
summary += "Please fix the linting errors. More information:\n"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29794
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I70027ec970a220c3ddfa766302faec7bd8752118
Gerrit-Change-Number: 29794
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin, fixeria, daniel, dexter.
Hello osmith, Jenkins Builder, fixeria, daniel, dexter,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-msc/+/29782
to look at the new patch set (#7).
Change subject: Introduce support for libosmo-mgcp-client MGW pooling
......................................................................
Introduce support for libosmo-mgcp-client MGW pooling
Large RAN installations may benefit from distributing the RTP voice
stream load over multiple media gateways.
libosmo-mgcp-client supports MGW pooling since version 1.8.0 (more than
one year ago). OsmoBSC has already been making use of it since then (see
osmo-bsc.git 8d22e6870637ed6d392a8a77aeaebc51b23a8a50); lets use this
feature in osmo-msc too.
This commit is also part of a series of patches cleaning up
libosmo-mgcp-client and slowly getting rid of the old non-mgw-pooled VTY
configuration, in order to keep only 1 way to configure
libosmo-mgcp-client through VTY.
Related: SYS#5091
Related: SYS#5987
Change-Id: I7670ba56fe989706579224a364595fdd4b4708ff
---
M doc/examples/osmo-msc/osmo-msc.cfg
M doc/examples/osmo-msc/osmo-msc_custom-sccp.cfg
M doc/examples/osmo-msc/osmo-msc_multi-cs7.cfg
M doc/manuals/chapters/running.adoc
M include/osmocom/msc/gsm_data.h
M include/osmocom/msc/vty.h
M src/libmsc/call_leg.c
M src/libmsc/msc_vty.c
M src/osmo-msc/msc_main.c
M tests/msc_vlr/msc_vlr_tests.c
M tests/test_nodes.vty
11 files changed, 90 insertions(+), 28 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/29782/7
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29782
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I7670ba56fe989706579224a364595fdd4b4708ff
Gerrit-Change-Number: 29782
Gerrit-PatchSet: 7
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria, msuraev.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28865 )
Change subject: SMPP: use default port from libsmpp34
......................................................................
Patch Set 9: Code-Review-1
(1 comment)
File configure.ac:
https://gerrit.osmocom.org/c/osmo-msc/+/28865/comment/36cd85c8_056e69f9
PS9, Line 98: 1.14.1
> Do we have some kind of policy regarding release timeframe? I don't mind waiting for realease and bu […]
You don't need to update this now.
You have to add a line to TODO-RELEASE file in the root directory, stating a dependency towards libsmpp34 > 1.14.1 will be needed.
I will then update this line here during release procedure.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28865
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I2140ed57e64f17fb79130014eaf88f58b62d7a00
Gerrit-Change-Number: 28865
Gerrit-PatchSet: 9
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 18 Oct 2022 12:16:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: comment