May 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: smscb: fix meaningless condition in etws_primary_to_bts()

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28088 ) Change subject: smscb: fix meaningless condition in etws_primary_to_bts() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id369bb3676ba279bafc234378fbe21dbc7b0614b Gerrit-Change-Number: 28088 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 11 May 2022 11:39:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: smscb: fix meaningless condition in etws_primary_to_bts()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28088 ) Change subject: smscb: fix meaningless condition in etws_primary_to_bts() ...................................................................... smscb: fix meaningless condition in etws_primary_to_bts() Found by GCC 12.1.0: smscb.c: In function 'etws_primary_to_bts': smscb.c:537:13: warning: the comparison will always evaluate as 'true' for the address of 'warning_sec_info' will never be NULL [-Waddress] 537 | if (wrepl->u.emergency.warning_sec_info) { | ^~~~~ In file included from smscb.c:31: /usr/local/include/osmocom/gsm/cbsp.h:99:33: note: 'warning_sec_info' declared here 99 | uint8_t warning_sec_info[50]; | ^~~~~~~~~~~~~~~~ Indeed, address of &warning_sec_info[0] is always not NULL. Change-Id: Id369bb3676ba279bafc234378fbe21dbc7b0614b --- M src/osmo-bsc/smscb.c 1 file changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/28088/1 diff --git a/src/osmo-bsc/smscb.c b/src/osmo-bsc/smscb.c index 8a6a705..b614852 100644 --- a/src/osmo-bsc/smscb.c +++ b/src/osmo-bsc/smscb.c @@ -534,11 +534,9 @@ bes->input.msg_id = wrepl->msg_id; bes->input.serial_nr = wrepl->new_serial_nr; bes->input.warn_type = wrepl->u.emergency.warning_type; - if (wrepl->u.emergency.warning_sec_info) { - bes->input.sec_info = talloc_named_const(bts, ETWS_SEC_INFO_SIZE, "etws_sec_info"); - if (bes->input.sec_info) - memcpy(bes->input.sec_info, wrepl->u.emergency.warning_sec_info, ETWS_SEC_INFO_SIZE); - } + bes->input.sec_info = talloc_named_const(bts, ETWS_SEC_INFO_SIZE, "etws_sec_info"); + if (bes->input.sec_info) + memcpy(bes->input.sec_info, wrepl->u.emergency.warning_sec_info, ETWS_SEC_INFO_SIZE); /* generate the encoded ETWS PN */ gen_etws_primary_notification(bes->primary, bes->input.serial_nr, bes->input.msg_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id369bb3676ba279bafc234378fbe21dbc7b0614b Gerrit-Change-Number: 28088 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: e1oip: Make batching-factor and prefill-frame-count configurable

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/28066 ) Change subject: e1oip: Make batching-factor and prefill-frame-count configurable ...................................................................... e1oip: Make batching-factor and prefill-frame-count configurable This adds VTY commands at the 'account' level to configure those settings. They will only become active on the next [re]connect of the line. Change-Id: Ic455ef0ef82867db512e2ffdff24d9dd42d47eeb --- M include/osmocom/octoi/octoi.h M src/octoi/e1oip.c M src/octoi/e1oip.h M src/octoi/octoi_clnt_fsm.c M src/octoi/octoi_clnt_vty.c M src/octoi/octoi_srv_fsm.c M src/octoi/octoi_srv_vty.c M src/octoi/octoi_vty.h 8 files changed, 64 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified manawyrm: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/octoi/octoi.h b/include/osmocom/octoi/octoi.h index e7ebcaa..c9fa3d5 100644 --- a/include/osmocom/octoi/octoi.h +++ b/include/osmocom/octoi/octoi.h @@ -21,6 +21,8 @@ struct llist_head list; /* member in octoi_server.cfg.accounts */ char *user_id; /* user ID (IMSI) */ enum octoi_account_mode mode; + uint8_t batching_factor; /* E1 frames per UDP packet (Tx) */ + uint32_t prefill_frame_count; /* FIFO prefill/preseed count (Rx) */ union { struct { char *usb_serial; /* USB serial string (ASCII) of icE1usb */ diff --git a/src/octoi/e1oip.c b/src/octoi/e1oip.c index a577a92..c4bf054 100644 --- a/src/octoi/e1oip.c +++ b/src/octoi/e1oip.c @@ -313,6 +313,13 @@ return iline; } +void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor, + uint32_t prefill_frame_count) +{ + iline->cfg.batching_factor = batching_factor; + iline->cfg.prefill_frame_count = prefill_frame_count; +} + void e1oip_line_reset(struct e1oip_line *iline) { frame_fifo_init(&iline->e1o.fifo, iline->cfg.batching_factor, fifo_threshold_cb, iline); diff --git a/src/octoi/e1oip.h b/src/octoi/e1oip.h index 2c88346..ccdebd5 100644 --- a/src/octoi/e1oip.h +++ b/src/octoi/e1oip.h @@ -83,6 +83,8 @@ struct e1oip_line *e1oip_line_alloc(struct octoi_peer *peer); void e1oip_line_set_name(struct e1oip_line *line, const char *name); void e1oip_line_reset(struct e1oip_line *iline); +void e1oip_line_configure(struct e1oip_line *iline, uint8_t batching_factor, + uint32_t prefill_frame_count); void e1oip_line_destroy(struct e1oip_line *iline); int e1oip_rcvmsg_tdm_data(struct e1oip_line *iline, struct msgb *msg); diff --git a/src/octoi/octoi_clnt_fsm.c b/src/octoi/octoi_clnt_fsm.c index c4117d2..2ec5c8c 100644 --- a/src/octoi/octoi_clnt_fsm.c +++ b/src/octoi/octoi_clnt_fsm.c @@ -122,6 +122,8 @@ { struct clnt_state *st = fi->priv; + e1oip_line_configure(st->peer->iline, st->acc->batching_factor, + st->acc->prefill_frame_count); /* reset RIFO/FIFO etc. */ e1oip_line_reset(st->peer->iline); iline_ctr_add(st->peer->iline, LINE_CTR_E1oIP_CONNECT_ACCEPT, 1); diff --git a/src/octoi/octoi_clnt_vty.c b/src/octoi/octoi_clnt_vty.c index 756cc9a..ff50ddb 100644 --- a/src/octoi/octoi_clnt_vty.c +++ b/src/octoi/octoi_clnt_vty.c @@ -242,6 +242,7 @@ llist_for_each_entry(clnt, &g_octoi->clients, list) { struct octoi_sock *sock = clnt->sock; + octoi_vty_show_one_account(vty, "", clnt->cfg.account); vty_show_octoi_sock(vty, sock); } @@ -278,6 +279,8 @@ install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_ice1_serno_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_ice1_line_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_mode_cmd); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_batching_factor_cmd); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_prefill_frame_count_cmd); install_node(&clnt_node, config_write_octoi_clnt); install_element(CONFIG_NODE, &cfg_client_cmd); diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index 1af3805..469436e 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -174,6 +174,8 @@ { struct srv_state *st = fi->priv; + e1oip_line_configure(st->peer->iline, st->acc->batching_factor, + st->acc->prefill_frame_count); /* reset RIFO/FIFO etc. */ e1oip_line_reset(st->peer->iline); iline_ctr_add(st->peer->iline, LINE_CTR_E1oIP_CONNECT_ACCEPT, 1); diff --git a/src/octoi/octoi_srv_vty.c b/src/octoi/octoi_srv_vty.c index f616af5..58d18bc 100644 --- a/src/octoi/octoi_srv_vty.c +++ b/src/octoi/octoi_srv_vty.c @@ -34,6 +34,7 @@ #include <osmocom/vty/stats.h> #include <osmocom/vty/misc.h> +#include "e1oip.h" #include "octoi.h" #include "octoi_sock.h" #include "octoi_fsm.h" @@ -63,6 +64,9 @@ return NULL; } + ac->batching_factor = DEFAULT_BATCHING_FACTOR; + ac->prefill_frame_count = DEFAULT_PREFILL_FRAME_COUNT; + return ac; } @@ -367,6 +371,35 @@ return CMD_SUCCESS; } +gDEFUN(cfg_account_batching_factor, cfg_account_batching_factor_cmd, + "batching-factor <1-256>", + "E1oIP batching factor (E1 frames per Tx UDP packet)\n" + "E1oIP batching factor (E1 frames per Tx UDP packet)\n") +{ + struct octoi_account *acc = vty->index; + + acc->batching_factor = atoi(argv[0]); + return CMD_SUCCESS; +} + +gDEFUN(cfg_account_prefill_frame_count, cfg_account_prefill_frame_count_cmd, + "prefill-frame-count <0-8000>", + "Number of E1 frames to pre-fill/pre-seed in Rx RIFO\n" + "Number of E1 frames to pre-fill/pre-seed in Rx RIFO\n") +{ + struct octoi_account *acc = vty->index; + + acc->prefill_frame_count = atoi(argv[0]); + return CMD_SUCCESS; +} + +void octoi_vty_show_one_account(struct vty *vty, const char *pfx, struct octoi_account *acc) +{ + vty_out(vty, "%sAccount '%s': Mode=%s, Batching=%u, Prefill=%u%s", pfx, + acc->user_id, get_value_string(octoi_account_mode_name, acc->mode), + acc->batching_factor, acc->prefill_frame_count, VTY_NEWLINE); +} + void octoi_vty_write_one_account(struct vty *vty, const struct octoi_account *acc) { if (!acc) @@ -375,6 +408,10 @@ vty_out(vty, " account %s%s", acc->user_id, VTY_NEWLINE); vty_out(vty, " mode %s%s", get_value_string(octoi_account_mode_name, acc->mode), VTY_NEWLINE); + if (acc->batching_factor != DEFAULT_BATCHING_FACTOR) + vty_out(vty, " batching-factor %u%s", acc->batching_factor, VTY_NEWLINE); + if (acc->prefill_frame_count != DEFAULT_PREFILL_FRAME_COUNT) + vty_out(vty, " prefill-frame-count %u%s", acc->prefill_frame_count, VTY_NEWLINE); switch (acc->mode) { case ACCOUNT_MODE_NONE: @@ -425,6 +462,7 @@ SHOW_STR "Display information about the OCTOI Server\n") { struct octoi_server *srv = g_octoi->server; + struct octoi_account *acc; if (!srv) { vty_out(vty, "%% No OCTOI server present%s", VTY_NEWLINE); @@ -433,6 +471,9 @@ vty_show_octoi_sock(vty, srv->sock); + llist_for_each_entry(acc, &srv->cfg.accounts, list) + octoi_vty_show_one_account(vty, "", acc); + return CMD_SUCCESS; } @@ -446,6 +487,8 @@ install_element(OCTOI_ACCOUNT_NODE, &cfg_account_ice1_serno_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_ice1_line_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_redir_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_batching_factor_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_prefill_frame_count_cmd); install_node(&srv_node, config_write_octoi_srv); install_element(CONFIG_NODE, &cfg_server_cmd); diff --git a/src/octoi/octoi_vty.h b/src/octoi/octoi_vty.h index 6f18802..16c5337 100644 --- a/src/octoi/octoi_vty.h +++ b/src/octoi/octoi_vty.h @@ -7,9 +7,12 @@ extern struct cmd_element cfg_account_mode_cmd; extern struct cmd_element cfg_account_ice1_serno_cmd; extern struct cmd_element cfg_account_ice1_line_cmd; +extern struct cmd_element cfg_account_batching_factor_cmd; +extern struct cmd_element cfg_account_prefill_frame_count_cmd; struct octoi_account *octoi_client_account_create(struct octoi_client *clnt, const char *user_id); +void octoi_vty_show_one_account(struct vty *vty, const char *pfx, struct octoi_account *acc); void octoi_vty_write_one_account(struct vty *vty, const struct octoi_account *acc); void vty_show_octoi_sock(struct vty *vty, struct octoi_sock *sock); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/28066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic455ef0ef82867db512e2ffdff24d9dd42d47eeb Gerrit-Change-Number: 28066 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-e1d[master]: e1oip: Make batching-factor and prefill-frame-count configurable

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/28066 ) Change subject: e1oip: Make batching-factor and prefill-frame-count configurable ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/28066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic455ef0ef82867db512e2ffdff24d9dd42d47eeb Gerrit-Change-Number: 28066 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Tue, 10 May 2022 18:09:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: stats: don't try to save unknown stats reporter types

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28069 ) Change subject: stats: don't try to save unknown stats reporter types ...................................................................... stats: don't try to save unknown stats reporter types The point of having a public API to register further stats reporters is to enable applications or other libraries to do so. As we in libosmocore don't know anything about the parameters of such a stats reporter, don't try to do a partial save of them when saving the config file. Change-Id: I2986313375daec1c4959a6a914e3fb2980a5d7ca --- M src/vty/stats_vty.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index a4e4fce..e5acfa2 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -671,6 +671,11 @@ case OSMO_STATS_REPORTER_LOG: type = "log"; break; + default: + /* don't try to save unknown stats reporters to the VTY. Imagine some + * application registering a new application specific stats reporter that + * this VTY code knows nothing about! */ + return 0; } vty_out(vty, "stats reporter %s", type); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2986313375daec1c4959a6a914e3fb2980a5d7ca Gerrit-Change-Number: 28069 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: stats: don't try to save unknown stats reporter types

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28069 ) Change subject: stats: don't try to save unknown stats reporter types ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2986313375daec1c4959a6a914e3fb2980a5d7ca Gerrit-Change-Number: 28069 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 May 2022 18:08:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmo-sccp[master]: M3UA/SUA: Implement handling of SCON (signaling congestion)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/28054 ) Change subject: M3UA/SUA: Implement handling of SCON (signaling congestion) ...................................................................... M3UA/SUA: Implement handling of SCON (signaling congestion) If we receive any M3UA/SUA SNM SCON mesasages, distribute them to any other active ASP to make everyone aware of the congestion situation. This makes STP_Tests_M3UA.TC_ssnm_distribution_scon pass and hence should turn the entire osmo-stp test suite "green" Change-Id: Iac7aeba980fbbd8b58f8872a29ba10745eb0a730 --- M src/m3ua.c M src/sua.c M src/xua_internal.h M src/xua_snm.c 4 files changed, 139 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/m3ua.c b/src/m3ua.c index 741063c..63297fe 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -864,6 +864,40 @@ xua_msg_free(xua); } +/*! Transmit SSNM SCON message indicating congestion + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] concerned_dpc optional concerned DPC (can be NULL) + * \param[in] cong_level optional congestion level (can be NULL) + * \param[in] info_string optional information string (can be NULL). */ +void m3ua_tx_snm_congestion(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *concerned_dpc, const uint8_t *cong_level, + const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + + xua->hdr = XUA_HDR(M3UA_MSGC_SNM, M3UA_SNM_SCON); + xua->hdr.version = M3UA_VERSION; + if (rctx) + xua_msg_add_data(xua, M3UA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); + + xua_msg_add_data(xua, M3UA_IEI_AFFECTED_PC, num_aff_pc * sizeof(*aff_pc), (const uint8_t *) aff_pc); + + if (concerned_dpc) + xua_msg_add_u32(xua, M3UA_IEI_CONC_DEST, *concerned_dpc & 0xffffff); + if (cong_level) + xua_msg_add_u32(xua, M3UA_IEI_CONG_IND, *cong_level & 0xff); + if (info_string) + xua_msg_add_data(xua, M3UA_IEI_INFO_STRING, strlen(info_string)+1, (const uint8_t *) info_string); + + m3ua_tx_xua_asp(asp, xua); + xua_msg_free(xua); +} + /*! Transmit SSNM DUPU message indicating user unavailability. * \param[in] asp ASP through which to transmit message. Must be ACTIVE. * \param[in] rctx array of Routing Contexts in network byte order. @@ -903,6 +937,8 @@ xua_snm_rx_dupu(asp, as, xua); break; case M3UA_SNM_SCON: + xua_snm_rx_scon(asp, as, xua); + break; case M3UA_SNM_DRST: LOGPASP(asp, DLM3UA, LOGL_NOTICE, "Received unsupported M3UA SNM message type %u\n", xua->hdr.msg_type); diff --git a/src/sua.c b/src/sua.c index 000f064..bd51005 100644 --- a/src/sua.c +++ b/src/sua.c @@ -875,6 +875,35 @@ sua_tx_xua_asp(asp, xua); } + +/*! Transmit SSNM SCON message indicating congestion + * \param[in] asp ASP through which to transmit message. Must be ACTIVE. + * \param[in] rctx array of Routing Contexts in network byte order. + * \param[in] num_rctx number of rctx + * \param[in] aff_pc array of 'Affected Point Code' in network byte order. + * \param[in] num_aff_pc number of aff_pc + * \param[in] ssn optional SSN (can be NULL) + * \param[in] cong_level optional congestion level (can be NULL) + * \param[in] info_string optional information string (can be NULL). */ +void sua_tx_snm_congestion(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *ssn, + const uint8_t cong_level, const char *info_string) +{ + struct xua_msg *xua = xua_msg_alloc(); + + xua->hdr = XUA_HDR(SUA_MSGC_SNM, SUA_SNM_SCON); + xua->hdr.version = SUA_VERSION; + if (rctx) + xua_msg_add_data(xua, SUA_IEI_ROUTE_CTX, num_rctx * sizeof(*rctx), (const uint8_t *)rctx); + xua_msg_add_data(xua, SUA_IEI_AFFECTED_PC, num_aff_pc * sizeof(*aff_pc), (const uint8_t *) aff_pc); + if (ssn) + xua_msg_add_u32(xua, SUA_IEI_SSN, *ssn); + xua_msg_add_u32(xua, SUA_IEI_CONG_LEVEL, cong_level); + if (info_string) + xua_msg_add_data(xua, SUA_IEI_INFO_STRING, strlen(info_string)+1, (const uint8_t *) info_string); +} + + /*! Transmit SSNM DUPU message indicating user unavailability. * \param[in] asp ASP through which to transmit message. Must be ACTIVE. * \param[in] rctx array of Routing Contexts in network byte order. diff --git a/src/xua_internal.h b/src/xua_internal.h index 4c6bb29..5dd7066 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -21,6 +21,9 @@ void sua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *aff_ssn, const uint32_t *smi, const char *info_string, bool available); +void sua_tx_snm_congestion(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, const uint32_t *ssn, + const uint8_t cong_level, const char *info_string); void sua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str); @@ -30,12 +33,18 @@ void m3ua_tx_snm_available(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_string, bool available); +void m3ua_tx_snm_congestion(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *concerned_dpc, const uint8_t *cong_level, + const char *info_string); void m3ua_tx_dupu(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, uint32_t dpc, uint16_t user, uint16_t cause, const char *info_str); + void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua); void xua_snm_rx_duna(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); void xua_snm_rx_dava(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); void xua_snm_rx_dupu(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); +void xua_snm_rx_scon(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua); int m3ua_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg); struct msgb *m3ua_msgb_alloc(const char *name); diff --git a/src/xua_snm.c b/src/xua_snm.c index 0c14964..1212162 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -115,6 +115,24 @@ } } +static void xua_tx_scon(struct osmo_ss7_asp *asp, const uint32_t *rctx, unsigned int num_rctx, + const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *concerned_dpc, const uint8_t *cong_level, + const char *info_string) +{ + switch (asp->cfg.proto) { + case OSMO_SS7_ASP_PROT_M3UA: + m3ua_tx_snm_congestion(asp, rctx, num_rctx, aff_pc, num_aff_pc, + concerned_dpc, cong_level, info_string); + break; + case OSMO_SS7_ASP_PROT_SUA: + sua_tx_snm_congestion(asp, rctx, num_rctx, aff_pc, num_aff_pc, NULL, + cong_level ? *cong_level : 0, info_string); + break; + default: + break; + } +} /* generate MTP-PAUSE / MTP-RESUME towards local SCCP users */ static void xua_snm_pc_available_to_sccp(struct osmo_sccp_instance *sccp, @@ -257,6 +275,36 @@ } } +static void xua_snm_scon(struct osmo_ss7_as *as, const uint32_t *aff_pc, unsigned int num_aff_pc, + const uint32_t *concerned_dpc, const uint8_t *cong_level, const char *info_string) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_asp *asp; + uint32_t rctx[32]; + unsigned int num_rctx; + + /* TODO: How to translate to MTP and towards SCCP (create N-PCSTATE.ind to SCU) */ + + /* inform remote ASPs via SCON */ + llist_for_each_entry(asp, &s7i->asp_list, list) { + /* SSNM is only permitted for ASPs in ACTIVE state */ + if (!osmo_ss7_asp_active(asp)) + continue; + + /* only send SCON if we locally are the SG and the remote is ASP */ + if (asp->cfg.role != OSMO_SS7_ASP_ROLE_SG) + continue; + + num_rctx = get_all_rctx_for_asp(rctx, ARRAY_SIZE(rctx), asp, as); + /* this can happen if the given ASP is only in the AS that reports the change, + * which shall be excluded */ + if (num_rctx == 0) + continue; + + xua_tx_scon(asp, rctx, num_rctx, aff_pc, num_aff_pc, concerned_dpc, cong_level, info_string); + } +} + /* receive DAUD from ASP; pc is 'affected PC' IE with mask in network byte order! */ void xua_snm_rx_daud(struct osmo_ss7_asp *asp, struct xua_msg *xua) { @@ -405,3 +453,20 @@ xua_snm_upu(as, aff_pc, user, cause, info_str); } + +/* an incoming SUA/M3UA SCON was received from a remote SG */ +void xua_snm_rx_scon(struct osmo_ss7_asp *asp, struct osmo_ss7_as *as, struct xua_msg *xua) +{ + struct xua_msg_part *ie_aff_pc = xua_msg_find_tag(xua, M3UA_IEI_AFFECTED_PC); + const char *info_str = xua_msg_get_str(xua, M3UA_IEI_INFO_STRING); + uint32_t _concerned_dpc, _cong_level; + const uint32_t *concerned_dpc = xua_msg_get_u32p(xua, M3UA_IEI_CONC_DEST, &_concerned_dpc); + const uint32_t *cong_level = xua_msg_get_u32p(xua, M3UA_IEI_CONG_IND, &_cong_level); + int log_ss = osmo_ss7_asp_get_log_subsys(asp); + + LOGPASP(asp, log_ss, LOGL_NOTICE, "RX SCON(%s) for %s level=%u\n", info_str ? info_str : "", + format_affected_pcs_c(xua, asp->inst, ie_aff_pc), cong_level ? *cong_level : 0); + + xua_snm_scon(as, (const uint32_t *) ie_aff_pc->dat, ie_aff_pc->len / sizeof(uint32_t), + concerned_dpc, (const uint8_t *) cong_level, info_str); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/28054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iac7aeba980fbbd8b58f8872a29ba10745eb0a730 Gerrit-Change-Number: 28054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in libosmo-sccp[master]: M3UA/SUA: Implement handling of SCON (signaling congestion)

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/28054 ) Change subject: M3UA/SUA: Implement handling of SCON (signaling congestion) ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: nobody could be bothered to provide feedback within 5 days, merging. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/28054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iac7aeba980fbbd8b58f8872a29ba10745eb0a730 Gerrit-Change-Number: 28054 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 10 May 2022 18:08:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-ci[master]: New osmocom-obs-worker role for our OBS workers

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28087 ) Change subject: New osmocom-obs-worker role for our OBS workers ...................................................................... New osmocom-obs-worker role for our OBS workers Related: OS#5556 Change-Id: I7a6d82e89e3a840739f71b90cdebe89bf8383c4a --- M ansible/hosts A ansible/roles/osmocom-obs-worker/files/obs-ca.crt A ansible/roles/osmocom-obs-worker/files/obs.conf A ansible/roles/osmocom-obs-worker/tasks/main.yml A ansible/roles/osmocom-obs-worker/tasks/obs.yml A ansible/roles/osmocom-obs-worker/tasks/openvpn.yml A ansible/roles/osmocom-obs-worker/templates/obs-server A ansible/setup-obs-worker.yml A ansible/vars/Suse-15.yml 9 files changed, 585 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/28087/1 diff --git a/ansible/hosts b/ansible/hosts index ef0d055..f9ed7a2 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -20,3 +20,7 @@ [simtester] simtest ansible_host=10.9.25.80 + +[obs-workers] +build3-obsworker1 ansible_host=2a01:4f8:212:3762::1:2 obs_worker_instances=8 obs_worker_jobs=8 +epyc1-obsworker1 ansible_host=2a02:8106:13:1e34:581e:abff:fe43:da45 obs_worker_instances=2 obs_worker_jobs=4 obs_vm_type=emulator:armv7l diff --git a/ansible/roles/osmocom-obs-worker/files/obs-ca.crt b/ansible/roles/osmocom-obs-worker/files/obs-ca.crt new file mode 100644 index 0000000..271d168 --- /dev/null +++ b/ansible/roles/osmocom-obs-worker/files/obs-ca.crt @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDSzCCAjOgAwIBAgIUcLDeyxhcMpcccZ1i7AIKqvwTJ2gwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAwwLRWFzeS1SU0EgQ0EwHhcNMjIwNTEwMDkzMjQwWhcNNDIw +NTA1MDkzMjQwWjAWMRQwEgYDVQQDDAtFYXN5LVJTQSBDQTCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBALUsvHoy4oqpOHuzyoIG3qyoTGQW8Zpse7RaYAWJ +CLgcAGelXWrOhPy40xAWHpLzAnAIxYR4ZSlD2Ebaj08esz4VQs2CKQ0mJEVZA7oq +84YO3WK02HzoYFLee4ySvI967FCn6BwVZQVdz/A8wOIlAbe7Hmucx6dNLTLTR+Pw +YwHMSdnj+OlC2oX2UO+ZIR7jFbSYp7jGF9V8zk74NoAFAuv5rs1UeP01ZF9xgXll +KHUajaUKMKs+6KTo4d2l9ha45LHcoAuDUURzf4GMvO7zVVGw4mFwy/YsPoLV5+vX +YT4GqkBgk9iZXirgTk6xCkiP0NUw5UNhtarUDKvR/U8wLw8CAwEAAaOBkDCBjTAd +BgNVHQ4EFgQUHdDZVpUSwtRrSKp+PuMRK12TlQYwUQYDVR0jBEowSIAUHdDZVpUS +wtRrSKp+PuMRK12TlQahGqQYMBYxFDASBgNVBAMMC0Vhc3ktUlNBIENBghRwsN7L +GFwylxxxnWLsAgqq/BMnaDAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjANBgkq +hkiG9w0BAQsFAAOCAQEAPGqIfE172P1NaQGRIHdsRJRot9NnJzZih3q9m+T/YIE8 +8T3uoxhEsMPLzP19w8wAbRy+CjpLwTuYO44kOIVLYhFdx3BTVRhw+YU2RH4PSttE +JDVyYTFPGzjxwprpfui1aGom8u0oPL5MeutMWrPH6qVlIv7JGR3EbDG0iYwE5MZJ +6kW8VW6o5fL02uT+75vNkHTipLUO6S4l6h9NrrgR0ijZ5dhyKC0FZnLnowtMCXXl +2rfHSnGKjMGcq8Jlrwo6eMVPbZM6rrU/tvrjJkqESZY0jMktd0fV903XJ6+X4U9U +stu/HUtKUQC8d3wua1PuI1uPvpr8AQDcf5LuA/STHg== +-----END CERTIFICATE----- diff --git a/ansible/roles/osmocom-obs-worker/files/obs.conf b/ansible/roles/osmocom-obs-worker/files/obs.conf new file mode 100644 index 0000000..7dc2a84 --- /dev/null +++ b/ansible/roles/osmocom-obs-worker/files/obs.conf @@ -0,0 +1,15 @@ +client +remote 2a01:4f8:201:344a::1:4 1194 +ca "/etc/openvpn/obs-ca.crt" +cert "/etc/openvpn/obs.crt" +key "/etc/openvpn/obs.key" +comp-lzo yes +cipher AES-256-CBC +dev tun +proto udp6 +nobind +auth-nocache +script-security 2 +persist-key +persist-tun +remote-cert-tls server diff --git a/ansible/roles/osmocom-obs-worker/tasks/main.yml b/ansible/roles/osmocom-obs-worker/tasks/main.yml new file mode 100644 index 0000000..b350163 --- /dev/null +++ b/ansible/roles/osmocom-obs-worker/tasks/main.yml @@ -0,0 +1,8 @@ +--- + +- name: install OBS + include_tasks: obs.yml + +- name: install openvpn + include_tasks: openvpn.yml + diff --git a/ansible/roles/osmocom-obs-worker/tasks/obs.yml b/ansible/roles/osmocom-obs-worker/tasks/obs.yml new file mode 100644 index 0000000..08367ac --- /dev/null +++ b/ansible/roles/osmocom-obs-worker/tasks/obs.yml @@ -0,0 +1,52 @@ +- name: add OBS rpm repository + zypper_repository: + repo: https://download.opensuse.org/repositories/OBS:/Server:/2.10/15.3/OBS:Serve… + autorefresh: yes + auto_import_keys: yes + +- name: install obs-worker + zypper: + name: + - obs-worker + +- name: Make sure an entry in /etc/hosts exists + lineinfile: + path: /etc/hosts + regexp: "^172.16.31.1" + line: "172.16.31.1 obs-backend.osmocom.org obs obs.osmocom.org" + state: present + +- name: Create /srv/obs/cache + file: + path: /srv/obs/cache + owner: obsrun + group: obsrun + recurse: yes + +- name: generate obs-server config file + template: + src: obs-server + dest: /etc/sysconfig/obs-server + +- name: install lxc + when: obs_vm_type == "lxc" + zypper: + name: + - lxc + +- name: install qemu + when: obs_vm_type != "lxc" + zypper: + name: + - qemu-arm + +- name: install qemu-arm + when: obs_vm_type == "emulator:armv7l" or obs_vm_type == "emulator:aarch64" + zypper: + name: + - qemu-arm + +- name: ensure the systemd service is installed + systemd: + name: obsworker.service + enabled: yes diff --git a/ansible/roles/osmocom-obs-worker/tasks/openvpn.yml b/ansible/roles/osmocom-obs-worker/tasks/openvpn.yml new file mode 100644 index 0000000..da53fa5 --- /dev/null +++ b/ansible/roles/osmocom-obs-worker/tasks/openvpn.yml @@ -0,0 +1,21 @@ +- name: Install openvpn + zypper: + name: + - openvpn + +- name: copy openvpn config + copy: + src: obs.conf + dest: /etc/openvpn/ + mode: 0600 + +- name: copy openvpn CA certificate + copy: + src: obs-ca.crt + dest: /etc/openvpn/ + mode: 0600 + +- name: ensure the systemd service is installed + systemd: + name: openvpn(a)obs.service + enabled: yes diff --git a/ansible/roles/osmocom-obs-worker/templates/obs-server b/ansible/roles/osmocom-obs-worker/templates/obs-server new file mode 100644 index 0000000..f042cd1 --- /dev/null +++ b/ansible/roles/osmocom-obs-worker/templates/obs-server @@ -0,0 +1,442 @@ +# +# NOTE: all these options can be also declared in /etc/buildhost.config on each worker differently. +# + +## Path: Applications/OBS +## Description: The OBS backend code directory +## Type: string +## Default: "" +## Config: OBS +# +# An empty dir will lead to the fall back directory, typically /usr/lib/obs/server/ +# +OBS_BACKENDCODE_DIR="" + +## Path: Applications/OBS +## Description: The base for OBS communication directory +## Type: string +## Default: "" +## Config: OBS +# +# An empty dir will lead to the fall back directory, typically /srv/obs/run +# +OBS_RUN_DIR="" + +## Path: Applications/OBS +## Description: The base for OBS logging directory +## Type: string +## Default: "" +## Config: OBS +# +# An empty dir will lead to the fall back directory, typically /srv/obs/log +# +OBS_LOG_DIR="" + +## Path: Applications/OBS +## Description: The base directory for OBS +## Type: string +## Default: "" +## Config: OBS +# +# An empty dir will lead to the fall back directory, typically /srv/obs +# +OBS_BASE_DIR="" + +## Path: Applications/OBS +## Description: Automatically setup api and webui for OBS server, be warned, this will replace config files ! +## Type: ("yes" | "no") +## Default: "no" +## Config: OBS +# +# This is usally only enabled on the OBS Appliance +# +OBS_API_AUTOSETUP="no" +# +# NOTE: all these options can be also declared in /etc/buildhost.config on each worker differently. +# + +## Path: Applications/OBS +## Description: define source server host to be used +## Type: string +## Default: "" +## Config: OBS +# +# An empty setting will point to localhost:5352 by default +# +OBS_SRC_SERVER="obs-backend.osmocom.org:5352" + +## Path: Applications/OBS +## Description: define repository server host to be used +## Type: string +## Default: "" +## Config: OBS +# +# An empty setting will point to localhost:5252 by default +# +OBS_REPO_SERVERS="obs-backend.osmocom.org:5252" + +## Path: Applications/OBS +## Description: define number of build instances +## Type: integer +## Default: 0 +## Config: OBS +# +# 0 instances will automatically use the number of CPU's +# +OBS_WORKER_INSTANCES="{{obs_worker_instances}}" + +## Path: Applications/OBS +## Description: define names of build instances for z/VM +## Type: string +## Default: "" +## Config: OBS +# +# The names of the workers as defined in z/VM. These must have two minidisks +# assigned, and have a secondary console configured to the local machine: +# 0150 is the root device +# 0250 is the swap device +# +#OBS_WORKER_INSTANCE_NAMES="LINUX075 LINUX076 LINUX077" +OBS_WORKER_INSTANCE_NAMES="" + +## Path: Applications/OBS +## Description: The base directory, where sub directories for each worker will get created +## Type: string +## Default: "" +## Config: OBS +# +# +OBS_WORKER_DIRECTORY="" + +## Path: Applications/OBS +## Description: The base for port numbers used by worker instances +## Type: integer +## Default: "0" +## Config: OBS +# +# 0 means let the operating system assign a port number +# +OBS_WORKER_PORTBASE="0" + +## Path: Applications/OBS +## Description: Number of parallel compile jobs per worker +## Type: integer +## Default: "1" +## Config: OBS +# +# this maps usually to "make -j1" during build +# +OBS_WORKER_JOBS="{{obs_worker_jobs}}" + +## Path: Applications/OBS +## Description: Run in test mode (build results will be ignore, no job blocking) +## Type: ("yes" | "") +## Default: "" +## Config: OBS +# +OBS_WORKER_TEST_MODE="" + +## Path: Applications/OBS +## Description: define one or more labels for the build host. +## Type: string +## Default: "" +## Config: OBS +# +# A label can be used to build specific packages only on dedicated hosts. +# For example for benchmarking. +# +OBS_WORKER_HOSTLABELS="" + +## Path: Applications/OBS +## Description: can be used to define a security level of the worker +## Type: string +## Default: "" +## Config: OBS +# +# This will extend the hostlabels and can be used to limit the workers +# to the hosts which have all security fixes deployed. +# +OBS_WORKER_SECURITY_LEVEL="" + +## Path: Applications/OBS +## Description: Register in SLP server +## Type: ("yes" | "no") +## Default: "yes" +## Config: OBS +# +# +OBS_USE_SLP="yes" + +## Path: Applications/OBS +## Description: Use a common cache directory for downloaded packages +## Type: string +## Default: "" +## Config: OBS +# +# Enable caching requires a given directory here. Be warned, content will be +# removed there ! +# +OBS_CACHE_DIR="/srv/obs/cache" + +## Path: Applications/OBS +## Description: Defines the package cache size +## Type: size in MB +## Default: "" +## Config: OBS +# +# Set the size to 50% of the maximum usable size of this partition +# +OBS_CACHE_SIZE="100000" + +## Path: Applications/OBS +## Description: Defines the nice level of running workers +## Type: integer +## Default: 18 +## Config: OBS +# +# Nicenesses range from -20 (most favorable scheduling) to 19 (least +# favorable). +# Default to 18 as some testsuites depend on being able to switch to +# one priority below (19) _and_ having changed the numeric level +# (so going from 19->19 makes them fail). +# +OBS_WORKER_NICE_LEVEL=18 + +## Path: Applications/OBS +## Description: Set used VM type by worker +## Type: ("auto" | "xen" | "kvm" | "lxc" | "zvm" | "emulator:$arch" | "emulator:$arch:$script" | "none" | "openstack") +## Default: "auto" +## Config: OBS +# +# +OBS_VM_TYPE="{{obs_vm_type}}" + +## Path: Applications/OBS +## Description: Set kernel used by worker (kvm) +## Type: ("none" | "/boot/vmlinuz" | "/foo/bar/vmlinuz) +## Default: "none" +## Config: OBS +# +# For z/VM this is normally /boot/image +# +OBS_VM_KERNEL="none" + +## Path: Applications/OBS +## Description: Set initrd used by worker (kvm) +## Type: ("none" | "/boot/initrd" | "/foo/bar/initrd-foo) +## Default: "none" +## Config: OBS +# +# for KVM, you have to create with (example for openSUSE 11.2): +# +# export rootfstype="ext4" +# mkinitrd -d /dev/null -m "ext4 binfmt_misc virtio_pci virtio_blk" -k vmlinuz-2.6.31.12-0.2-default -i initrd-2.6.31.12-0.2-default-obs_worker +# +# a working initrd file which includes virtio and binfmt_misc for OBS in order to work fine +# +# for z/VM, the build script will create a initrd at the given location if +# it does not yet exist. +# +OBS_VM_INITRD="none" + +## Path: Applications/OBS +## Description: Autosetup for XEN/KVM/TMPFS disk (root) - Filesize in MB +## Type: integer +## Default: "4096" +## Config: OBS +# +# +OBS_VM_DISK_AUTOSETUP_ROOT_FILESIZE="4096" + +## Path: Applications/OBS +## Description: Autosetup for XEN/KVM disk (swap) - Filesize in MB +## Type: integer +## Default: "1024" +## Config: OBS +# +# +OBS_VM_DISK_AUTOSETUP_SWAP_FILESIZE="1024" + +## Path: Applications/OBS +## Description: Default filesystem to use for autosetup. +## Type: ("ext2" | "ext3" | "ext4" | "reiserfs" | "btrfs" | "xfs") +## Default: "ext3" +## Config: OBS +# +# +# Buildflag vmfstype may overwrite this for a specific job. +OBS_VM_DISK_AUTOSETUP_FILESYSTEM="ext3" + +## Path: Applications/OBS +## Description: Filesystem mount options to use for autosetup +## Type: string +## Default: "" +## Config: OBS +# +# +OBS_VM_DISK_AUTOSETUP_MOUNT_OPTIONS="" + +## Path: Applications/OBS +## Description: Enable build in memory +## Type: ("yes" | "") +## Default: "" +## Config: OBS +# +# WARNING: this requires much memory! +# +OBS_VM_USE_TMPFS="yes" + +## Path: Applications/OBS +## Description: Specify custom options for VM handler +## Type: string +## Default: "" +## Config: OBS +# +# Can be used to workaround problems with VM handler and should not be needed usually +# +OBS_VM_CUSTOM_OPTION="" + +## Path: Applications/OBS +## Description: Memory allocated for each VM (512) if not set +## Type: integer +## Default: "" +## Config: OBS +# +# +OBS_INSTANCE_MEMORY="" + +## Path: Applications/OBS +## Description: Enable storage auto configuration +## Type: ("yes" | "") +## Default: "" +## Config: OBS +# +# WARNING: this may destroy data on your hard disk ! +# This is usually only used on mass deployed worker instances +# +OBS_STORAGE_AUTOSETUP="" + +## Path: Applications/OBS +## Description: Setup LVM via obsstoragesetup +## Type: ("take_all" | "use_obs_vg" | "none") +## Default: "use_obs_vg" +## Config: OBS +# +# take_all: WARNING: all LVM partitions will be used and all data erased ! +# use_obs_vg: A lvm volume group named "OBS" will be re-setup for the workers. +# +OBS_SETUP_WORKER_PARTITIONS="use_obs_vg" + +## Path: Applications/OBS +## Description: Size in MB when creating LVM partition for cache partition +## Type: integer +## Default: "" +## Config: OBS +# +# +OBS_WORKER_CACHE_SIZE="" + +## Path: Applications/OBS +## Description: Size in MB when creating LVM partition for each worker root partition +## Type: integer +## Default: "" +## Config: OBS +# +# +OBS_WORKER_ROOT_SIZE="" + +## Path: Applications/OBS +## Description: Size in MB when creating LVM partition for each worker swap partition +## Type: integer +## Default: "" +## Config: OBS +# +# +OBS_WORKER_SWAP_SIZE="" + +## Path: Applications/OBS +## Description: URL to a proxy service for caching binaries used by worker +## Type: string +## Default: "" +## Config: OBS +# +# +OBS_WORKER_BINARIES_PROXY="" + +## Path: Applications/OBS +## Description: URL to a ssh pub key to allow root user login +## Type: string +## Default: "" +## Config: OBS +# +# This is usually used on mass (PXE) deployed workers) +# +OBS_ROOT_SSHD_KEY_URL="" + +## Path: Applications/OBS +## Description: URL to a script to be downloaded and executed +## Type: string +## Default: "" +## Config: OBS +# +# This is a hook for doing special things in your setup at boot time +# +OBS_WORKER_SCRIPT_URL="" + +## Path: Applications/OBS +## Description: If chroot/lxc is used for build, empty it after build is finished +## Type: ("yes" | "") +## Default: "" +## Config: OBS +# +# +OBS_WORKER_CLEANUP_CHROOT="" + +##Path: Application/OBS +## Description: wipes the build environment of the worker after the build +## Type: ("yes" | "") +## Default: "" +## Config: OBS +# +# +OBS_WORKER_WIPE_AFTER_BUILD="" + +##Path: Application/OBS +## Description: name or id of openstack instance that controls the worker (building) instances +## Type: ("yes" | "") +## Default: "" +## Config: OBS +# +# +OBS_WORKER_CONTROL_INSTANCE="" + +##Path: Application/OBS +## Description: name or id flavor to create openstack worker (building) instance +## Type: ("yes" | "") +## Default: "" +## Config: OBS +# +# +OBS_WORKER_OS_FLAVOR="" + +##Path: Application/OBS +## Description: openstack environment variables. Only used when OBS_VM_TYPE=openstack +## Type: ("yes" | "") +## Default: "" +## Config: OBS +# +# +OS_AUTH_URL="" + +OS_PROJECT_ID="" +OS_PROJECT_NAME="" +OS_USER_DOMAIN_NAME="" +OS_USERNAME="" +OS_PASSWORD="" +OS_REGION_NAME="" + +OBS_WORKER_PREFIX="" + +OBS_OPENSTACK_DISK_SIZE="" +OBS_OPENSTACK_SWAP_SIZE="" +OBS_OPENSTACK_MEMORY_SIZE="" diff --git a/ansible/setup-obs-worker.yml b/ansible/setup-obs-worker.yml new file mode 100644 index 0000000..c742a19 --- /dev/null +++ b/ansible/setup-obs-worker.yml @@ -0,0 +1,21 @@ +--- +- name: setup OBS worker + hosts: obs-workers + user: root + vars_files: + - "vars/{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_major_version']}}.yml" + tasks: + - name: install common utilities + zypper: + name: + - vim + - tmux + - screen + - tcpdump + - strace + - ltrace + + roles: + - name: osmocom-obs-worker + tags: + - obs-worker diff --git a/ansible/vars/Suse-15.yml b/ansible/vars/Suse-15.yml new file mode 100644 index 0000000..0cf00c2 --- /dev/null +++ b/ansible/vars/Suse-15.yml @@ -0,0 +1,2 @@ +--- +obs_distro: fixme -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28087 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7a6d82e89e3a840739f71b90cdebe89bf8383c4a Gerrit-Change-Number: 28087 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Build failure of network:osmocom:latest/osmo-hnbgw in openSUSE_Factory_ARM/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/os… Package network:osmocom:latest/osmo-hnbgw failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:latest osmo-hnbgw Last lines of build log: [ 22s] checking for a race-free mkdir -p... /usr/bin/mkdir -p [ 22s] checking for gawk... gawk [ 22s] checking whether make sets $(MAKE)... yes [ 22s] checking whether make supports nested variables... yes [ 22s] checking whether make supports nested variables... (cached) yes [ 22s] checking whether make sets $(MAKE)... (cached) yes [ 22s] checking for armv7hl-suse-linux-gnueabi-gcc... no [ 22s] checking for gcc... no [ 22s] checking for armv7hl-suse-linux-gnueabi-cc... no [ 22s] checking for cc... no [ 22s] checking for armv7hl-suse-linux-gnueabi-cl.exe... no [ 22s] checking for cl.exe... no [ 22s] checking for armv7hl-suse-linux-gnueabi-clang... no [ 22s] checking for clang... no [ 22s] configure: error: in `/home/abuild/rpmbuild/BUILD/osmo-hnbgw-1.2.1': [ 22s] configure: error: no acceptable C compiler found in $PATH [ 22s] See `config.log' for more details [ 22s] error: Bad exit status from /var/tmp/rpm-tmp.5kcb3B (%build) [ 22s] [ 22s] [ 22s] RPM build errors: [ 22s] Bad exit status from /var/tmp/rpm-tmp.5kcb3B (%build) [ 22s] ### VM INTERACTION START ### [ 23s] [ 17.232571][ T1] sysrq: Power Off [ 23s] [ 17.232863][ T8] reboot: Power down [ 23s] ### VM INTERACTION END ### [ 23s] [ 23s] obs-arm-10 failed "build osmo-hnbgw.spec" at Tue May 10 17:48:23 UTC 2022. [ 23s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022