Build failure of network:osmocom:nightly/osmo-msc in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 445s] tmsi |= GSM23003_TMSI_SGSN_MASK; [ 445s] ^~~ [ 445s] vlr.c:339:12: note: each undeclared identifier is reported only once for each function it appears in [ 445s] Makefile:442: recipe for target 'vlr.o' failed [ 445s] make[4]: *** [vlr.o] Error 1 [ 445s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libvlr' [ 445s] Makefile:422: recipe for target 'all-recursive' failed [ 445s] make[3]: *** [all-recursive] Error 1 [ 445s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 445s] Makefile:462: recipe for target 'all-recursive' failed [ 445s] make[2]: *** [all-recursive] Error 1 [ 445s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 445s] Makefile:394: recipe for target 'all' failed [ 445s] make[1]: *** [all] Error 2 [ 445s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 445s] dh_auto_build: make -j1 returned exit code 2 [ 445s] debian/rules:45: recipe for target 'build' failed [ 445s] make: *** [build] Error 2 [ 445s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 445s] [ 445s] armbuild01 failed "build osmo-msc_1.3.1.171.718f32.dsc" at Thu Jun 20 06:34:18 UTC 2019. [ 445s] [ 445s] ### VM INTERACTION START ### [ 448s] [ 415.584524] sysrq: SysRq : Power Off [ 448s] [ 415.593562] reboot: Power down [ 448s] ### VM INTERACTION END ### [ 448s] [ 448s] armbuild01 failed "build osmo-msc_1.3.1.171.718f32.dsc" at Thu Jun 20 06:34:21 UTC 2019. [ 448s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-sgsn in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-sgsn failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 662s] bss_ptmsi = bss_ptmsi | GSM23003_TMSI_SGSN_MASK; [ 662s] ^~~ [ 662s] gb_proxy.c:246:28: note: each undeclared identifier is reported only once for each function it appears in [ 662s] Makefile:615: recipe for target 'gb_proxy.o' failed [ 662s] make[4]: *** [gb_proxy.o] Error 1 [ 662s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/gprs' [ 662s] Makefile:391: recipe for target 'all-recursive' failed [ 662s] make[3]: *** [all-recursive] Error 1 [ 663s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 663s] Makefile:453: recipe for target 'all-recursive' failed [ 663s] make[2]: *** [all-recursive] Error 1 [ 663s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 663s] Makefile:385: recipe for target 'all' failed [ 663s] make[1]: *** [all] Error 2 [ 663s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 663s] dh_auto_build: make -j1 returned exit code 2 [ 663s] debian/rules:45: recipe for target 'build' failed [ 663s] make: *** [build] Error 2 [ 663s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 663s] [ 663s] armbuild14 failed "build osmo-sgsn_1.4.0.27.43c5.dsc" at Thu Jun 20 06:29:37 UTC 2019. [ 663s] [ 663s] ### VM INTERACTION START ### [ 666s] [ 613.896583] sysrq: SysRq : Power Off [ 666s] [ 613.898719] reboot: Power down [ 666s] ### VM INTERACTION END ### [ 666s] [ 666s] armbuild14 failed "build osmo-sgsn_1.4.0.27.43c5.dsc" at Thu Jun 20 06:29:40 UTC 2019. [ 666s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-bts in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-bts failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 541s] ../../src/common/libbts.a(bts.o): In function `lchan_init_lapdm': [ 541s] ./src/common/bts.c:423: undefined reference to `lapdm_channel_init2' [ 541s] collect2: error: ld returned 1 exit status [ 541s] Makefile:421: recipe for target 'osmo-bts-virtual' failed [ 541s] make[4]: *** [osmo-bts-virtual] Error 1 [ 541s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/osmo-bts-virtual' [ 541s] Makefile:385: recipe for target 'all-recursive' failed [ 541s] make[3]: *** [all-recursive] Error 1 [ 541s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 541s] Makefile:434: recipe for target 'all-recursive' failed [ 541s] make[2]: *** [all-recursive] Error 1 [ 541s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 541s] Makefile:366: recipe for target 'all' failed [ 541s] make[1]: *** [all] Error 2 [ 541s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 541s] dh_auto_build: make -j1 returned exit code 2 [ 541s] debian/rules:12: recipe for target 'build' failed [ 541s] make: *** [build] Error 2 [ 541s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 541s] [ 541s] armbuild16 failed "build osmo-bts_0.8.1.327.876e.dsc" at Thu Jun 20 05:26:20 UTC 2019. [ 541s] [ 541s] ### VM INTERACTION START ### [ 544s] [ 478.157106] sysrq: SysRq : Power Off [ 544s] [ 478.159259] reboot: Power down [ 544s] ### VM INTERACTION END ### [ 544s] [ 544s] armbuild16 failed "build osmo-bts_0.8.1.327.876e.dsc" at Thu Jun 20 05:26:23 UTC 2019. [ 544s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmocore in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/Raspbian_9.0/armv7l Package network:osmocom:nightly/libosmocore failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 533s] | This file was extended by libosmocore config.status 1.1.0.71-18e0, which was [ 533s] | generated by GNU Autoconf 2.69. Invocation command line was [ 533s] | [ 533s] | CONFIG_FILES= [ 533s] | CONFIG_HEADERS = [ 533s] | CONFIG_LINKS= [ 533s] | CONFIG_COMMANDS = [ 533s] | $ ./config.status Doxyfile.core [ 533s] | [ 533s] | on armbuild21 [ 533s] | [ 533s] | config.status:1200: creating Doxyfile.core [ 533s] [ 533s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 533s] make[1]: *** [override_dh_auto_test] Error 1 [ 533s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 533s] debian/rules:15: recipe for target 'build' failed [ 533s] make: *** [build] Error 2 [ 533s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 533s] [ 533s] armbuild21 failed "build libosmocore_1.1.0.71.18e0.dsc" at Thu Jun 20 03:07:48 UTC 2019. [ 533s] [ 533s] ### VM INTERACTION START ### [ 535s] [ 517.813486] sysrq: SysRq : Power Off [ 535s] [ 517.851267] reboot: Power down [ 536s] ### VM INTERACTION END ### [ 536s] [ 536s] armbuild21 failed "build libosmocore_1.1.0.71.18e0.dsc" at Thu Jun 20 03:07:52 UTC 2019. [ 536s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-ttcn3-hacks[master]: library/RAN_Emulation.ttcnpp: fix: properly handle SAPI / DLCI for RANAP
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14551 ) Change subject: library/RAN_Emulation.ttcnpp: fix: properly handle SAPI / DLCI for RANAP .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14551/1/library/RAN_Emulation.ttcnpp File library/RAN_Emulation.ttcnpp: https://gerrit.osmocom.org/#/c/14551/1/library/RAN_Emulation.ttcnpp@1099 PS1, Line 1099: sapi_0 Hmm, I think omit would be better as default value. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6199fd5f26774fb1ec419bc1ef9e1caeca3a0d35 Gerrit-Change-Number: 14551 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 19 Jun 2019 23:59:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: MSC_Tests_Iu.ttcn: fix TC_iu_lu_and_mo_ussd_mo_release(): use proper ...
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14553
Change subject: MSC_Tests_Iu.ttcn: fix TC_iu_lu_and_mo_ussd_mo_release(): use
proper BSC number
..
MSC_Tests_Iu.ttcn: fix TC_iu_lu_and_mo_ussd_mo_release(): use proper BSC number
Change-Id: I58149f0e9cbae9684a8a899bfee81b0de609ccac
---
M msc/MSC_Tests_Iu.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/53/14553/1
diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn
index e592573..6491e27 100644
--- a/msc/MSC_Tests_Iu.ttcn
+++ b/msc/MSC_Tests_Iu.ttcn
@@ -383,7 +383,7 @@
testcase TC_iu_lu_and_mo_ussd_mo_release() runs on MTC_CT {
var BSC_ConnHdlr vc_conn;
- f_init();
+ f_init(3);
vc_conn := f_start_handler(refers(f_tc_lu_and_mo_ussd_mo_release),
1050, ran_idx := 2, ran_is_geran := false);
vc_conn.done;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14553
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I58149f0e9cbae9684a8a899bfee81b0de609ccac
Gerrit-Change-Number: 14553
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: libmsc/ran_msg_iu.c: fix: properly handle SAPI IE of RANAP_DirectTran...
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/14552
Change subject: libmsc/ran_msg_iu.c: fix: properly handle SAPI IE of
RANAP_DirectTransfer
..
libmsc/ran_msg_iu.c: fix: properly handle SAPI IE of RANAP_DirectTransfer
The RANAP DirectTransfer message may contain an optional SAPI IE.
Thanks to our TTCN-3 tests (and Wireshark!), it was discovered
that this IE is ignored, so even if the MO SMS related messages
arrive on SAPI 3 (as per GSM TS 04.11, section 2.3) OsmoMSC sends
MT messages on SAPI 0.
In ran_iu_decode_l3() we need to check if the SAPI IE is present,
and tag the NAS PDU message buffer with a proper DLCI value.
This change makes the failing SMS related test cases pass.
Change-Id: I728b55b04e87fc23be6d4f8735e8cad82b6f640e
---
M src/libmsc/ran_msg_iu.c
1 file changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/52/14552/1
diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c
index f443944..d5b9143 100644
--- a/src/libmsc/ran_msg_iu.c
+++ b/src/libmsc/ran_msg_iu.c
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
/* Implement the extern talloc_asn1_ctx from libasn1c as talloc ctx for ASN.1
message composition */
void *talloc_asn1_ctx = NULL;
@@ -92,8 +93,11 @@
msgb_free(ran);
}
-static void ran_iu_decode_l3(struct ran_dec *ran_iu_decode, const
RANAP_NAS_PDU_t *nas_pdu, const char *msg_name)
+static void ran_iu_decode_l3(struct ran_dec *ran_iu_decode,
+const RANAP_DirectTransferIEs_t *ies,
+const char *msg_name)
{
+ const RANAP_NAS_PDU_t *nas_pdu = &ies->nas_pdu;
struct msgb *ran = msgb_alloc(256, msg_name);
struct ran_msg ran_dec_msg;
@@ -101,6 +105,12 @@
ran->l3h = msgb_put(ran, nas_pdu->size);
memcpy(ran->l3h, nas_pdu->buf, nas_pdu->size);
+ /* Handle optional SAPI IE */
+ if (ies->presenceMask & DIRECTTRANSFERIES_RANAP_SAPI_PRESENT) {
+ if (ies->sapi == RANAP_SAPI_sapi_3)
+ OMSC_LINKID_CB(ran) = UM_SAPI_SMS;
+ }
+
ran_dec_msg = (struct ran_msg){
.msg_type = RAN_MSG_DTAP,
.msg_name = msg_name,
@@ -266,7 +276,7 @@
return;
case RANAP_ProcedureCode_id_DirectTransfer:
- ran_iu_decode_l3(ran_iu_decode,
&message->msg.directTransferIEs.nas_pdu, "RANAP DirectTransfer RAN PDU");
+ ran_iu_decode_l3(ran_iu_decode,
&message->msg.directTransferIEs, "RANAP DirectTransfer RAN PDU");
return;
case RANAP_ProcedureCode_id_SecurityModeControl:
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14552
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I728b55b04e87fc23be6d4f8735e8cad82b6f640e
Gerrit-Change-Number: 14552
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: library/ranap: enrich both t(s|r)_RANAP_DirectTransfer templates
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14550
Change subject: library/ranap: enrich both t(s|r)_RANAP_DirectTransfer templates
..
library/ranap: enrich both t(s|r)_RANAP_DirectTransfer templates
Instead of having two similar variants of RANAP_DirectTransfer:
- t(s|r)_RANAP_DirectTransfer, and
- t(s|r)_RANAP_DirectTransferSAPI,
let's make the first one more flexible, and drop the last one.
This is achieved by introducing two supplementary functions:
- f_gen_ts_dt_ies(), and
- f_gen_tr_dt_ies,
which dynamically compose DirectTransfer.protocolIEs.
Change-Id: I7333d08c4d5a72159bfbd50fe8e7b1084cd61b9e
---
M library/RAN_Emulation.ttcnpp
M library/ranap/RANAP_Templates.ttcn
2 files changed, 84 insertions(+), 94 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/50/14550/1
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index de5b7f3..c7f67c4 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -1097,12 +1097,7 @@
#ifdef RAN_EMULATION_RANAP
case (RAN_PROTOCOL_RANAP) {
var RANAP_PDU ranap;
- if (false /* SAPI */) {
- var RANAP_IEs.SAPI sapi := sapi_0;
- ranap := valueof(ts_RANAP_DirectTransferSAPI(l3_enc,
sapi));
- } else {
- ranap := valueof(ts_RANAP_DirectTransfer(l3_enc));
- }
+ ranap := valueof(ts_RANAP_DirectTransfer(l3_enc, sapi :=
sapi_0));
RANAP.send(ts_RANAP_DATA_req(sccp_conn_id, ranap));
}
#endif
diff --git a/library/ranap/RANAP_Templates.ttcn
b/library/ranap/RANAP_Templates.ttcn
index e55f212..fdced83 100644
--- a/library/ranap/RANAP_Templates.ttcn
+++ b/library/ranap/RANAP_Templates.ttcn
@@ -998,25 +998,94 @@
* Direct Transfer
*/
+private function f_gen_ts_dt_ies(template (value) NAS_PDU nas,
+template (omit) SAPI sapi,
+template (value) DirectTransfer.protocolIEs
opt_ies)
+return DirectTransfer.protocolIEs {
+ var DirectTransfer.protocolIEs ies := {
+ /* NAS PDU is mandatory */
+ {
+ id := id_NAS_PDU,
+ criticality := ignore,
+ value_ := {
+ nAS_PDU := valueof(nas)
+ }
+ }
+ };
+
+ /* Optional IEs, e.g. LAI, RAC, SAI */
+ ies := ies & valueof(opt_ies);
+
+ /* Optional SAPI is the last IE */
+ if (isvalue(sapi)) {
+ ies := ies & {{
+ id := id_SAPI,
+ criticality := ignore,
+ value_ := {
+ sAPI := valueof(sapi)
+ }
+ }};
+ }
+
+ return ies;
+}
+
+private function f_gen_tr_dt_ies(template NAS_PDU nas,
+template SAPI sapi,
+template DirectTransfer.protocolIEs opt_ies)
+return template DirectTransfer.protocolIEs {
+ var template DirectTransfer.protocolIEs ies := {
+ /* NAS PDU is mandatory */
+ {
+ id := id_NAS_PDU,
+ criticality := ignore,
+ value_ := {
+ nAS_PDU := nas
+ }
+ }
+ };
+
+ /* Optional IEs start from index 1 */
+ var integer idx := 1;
+
+ /* Optional IEs, e.g. LAI, RAC, SAI */
+ if (istemplatekind(opt_ies, "*")) {
+ ies[idx] := *;
+ idx := idx + 1;
+ } else if (not istemplatekind(opt_ies, "omit")) {
+ for (var integer i := 0; i < lengthof(opt_ies); i := i + 1) {
+ ies[idx] := opt_ies[idx];
+ idx := idx + 1;
+ }
+ }
+
+ /* Optional SAPI is the last IE */
+ if (istemplatekind(sapi, "*")) {
+ ies[idx] := *;
+ } else if (not istemplatekind(sapi, "omit")) {
+ ies[idx] := {
+ id := id_SAPI,
+ criticality := ignore,
+ value_ := {
+ sAPI := sapi
+ }
+ };
+ }
+
+ return ies;
+}
+
template (value) RANAP_PDU
ts_RANAP_DirectTransfer(template (value) NAS_PDU nas,
- /* template DirectTransfer.protocolIEs ies := {}, */
+ template (omit) SAPI sapi := sapi_0,
+ template (value) DirectTransfer.protocolIEs ies := {},
template (omit) DirectTransfer.
Change in ...osmo-ttcn3-hacks[master]: library/RAN_Emulation.ttcnpp: fix: properly handle SAPI / DLCI for RANAP
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14551
Change subject: library/RAN_Emulation.ttcnpp: fix: properly handle SAPI / DLCI
for RANAP
..
library/RAN_Emulation.ttcnpp: fix: properly handle SAPI / DLCI for RANAP
Some of our SMS related test cases are failing. The problem is
that SMS related RAN messages shall be sent on SAPI 3, as per
GSM TS 04.11, section 2.3, while they actually being sent on
SAPI 0.
For the messages coming from the TCs towards OsmoMSC over RANAP,
we need to convert from DLCI to SAPI in f_xmit_raw_l3(). OsmoMSC
also needs to be patched, because it seems to ignore SAPI IE.
Change-Id: I6199fd5f26774fb1ec419bc1ef9e1caeca3a0d35
---
M library/RAN_Emulation.ttcnpp
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/51/14551/1
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index c7f67c4..60c363b 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -1096,8 +1096,15 @@
#endif
#ifdef RAN_EMULATION_RANAP
case (RAN_PROTOCOL_RANAP) {
+ var RANAP_IEs.SAPI sapi := sapi_0;
var RANAP_PDU ranap;
- ranap := valueof(ts_RANAP_DirectTransfer(l3_enc, sapi :=
sapi_0));
+
+ /* FIXME: is it the correct way of DLCI -> SAPI transformation?
*/
+ if (dlci == '03'O) {
+ sapi := sapi_3;
+ }
+
+ ranap := valueof(ts_RANAP_DirectTransfer(l3_enc, sapi := sapi));
RANAP.send(ts_RANAP_DATA_req(sccp_conn_id, ranap));
}
#endif
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14551
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6199fd5f26774fb1ec419bc1ef9e1caeca3a0d35
Gerrit-Change-Number: 14551
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...docker-playground[master]: Have only one bts/bsc configured in osmo-bsc and bscnat
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14546 ) Change subject: Have only one bts/bsc configured in osmo-bsc and bscnat .. Patch Set 1: Code-Review+1 I agree the proper fix is in #2417, but while we implement that, this one is fine enough. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I57468d983580b5ed4f15961ac1eac9bed9096556 Gerrit-Change-Number: 14546 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 17:04:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: libvlr/vlr.c: do not expire subscribers if periodic LU is disabled
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-msc/+/14525 )
Change subject: libvlr/vlr.c: do not expire subscribers if periodic LU is
disabled
..
libvlr/vlr.c: do not expire subscribers if periodic LU is disabled
When periodic Location Update is disabled (T3212 = 0), it was noticed
that OsmoMSC does expire subscribers quite soon - after 60 seconds
(VLR_SUBSCRIBER_LU_EXPIRATION_INTERVAL) since the last LU.
In order to avoid that, we need to check T3212 timer value in
vlr_subscr_expire_lu(), and if it's equal to 0, do not expire
anybody until the explicit IMSI Detach.
Change-Id: I2ead2241a3394dbdd5417f4554190df3fd698af2
---
M src/libvlr/vlr.c
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c
index 5610cfb..625b699 100644
--- a/src/libvlr/vlr.c
+++ b/src/libvlr/vlr.c
@@ -519,8 +519,15 @@
{
struct vlr_instance *vlr = data;
struct vlr_subscr *vsub, *vsub_tmp;
+ struct gsm_network *net;
struct timespec now;
+ /* Periodic location update might be disabled from the VTY,
+* so we shall not expire subscribers until explicit IMSI Detach. */
+ net = vlr->user_ctx; /* XXX move t3212 into struct vlr_instance? */
+ if (!net->t3212)
+ goto done;
+
if (llist_empty(&vlr->subscribers))
goto done;
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14525
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I2ead2241a3394dbdd5417f4554190df3fd698af2
Gerrit-Change-Number: 14525
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-gsm-tester[master]: tests: voice: Add voice call test with Osmux enabled
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14548 ) Change subject: tests: voice: Add voice call test with Osmux enabled .. tests: voice: Add voice call test with Osmux enabled Change-Id: Ie4f360a77f6fcbc74f140a7fcb5feef2d94ac734 --- M src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl A suites/voice/lib/testlib.py M suites/voice/mo_mt_call.py A suites/voice/mo_mt_call_osmux.py 4 files changed, 81 insertions(+), 52 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/48/14548/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ie4f360a77f6fcbc74f140a7fcb5feef2d94ac734 Gerrit-Change-Number: 14548 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear()
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-msc/+/14514 )
Change subject: tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear()
..
tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear()
The function name implies OSMO_RAT_GERAN_A, and it has nothing
to do with other OSMO_RAT_* types. Found using clang:
warning: too many arguments in call to 'expect_bssap_clear'
expect_bssap_clear(OSMO_RAT_GERAN_A);
Change-Id: Id3a3af33fcc5da4ca4c48a2f589a69f3568d2586
---
M tests/msc_vlr/msc_vlr_test_gsm_authen.c
M tests/msc_vlr/msc_vlr_test_gsm_ciph.c
M tests/msc_vlr/msc_vlr_test_no_authen.c
M tests/msc_vlr/msc_vlr_test_reject_concurrency.c
4 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index 8776e03..ee5af1e 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -113,7 +113,7 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
@@ -327,7 +327,7 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
@@ -1017,7 +1017,7 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index c76cba4..155afbe 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -128,7 +128,7 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
@@ -363,7 +363,7 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
@@ -967,7 +967,7 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
@@ -1158,7 +1158,7 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
@@ -1375,7 +1375,7 @@
VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c
b/tests/msc_vlr/msc_vlr_test_no_authen.c
index ae77252..9d506d6 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c
@@ -69,7 +69,7 @@
EXPECT_ACCEPTED(true);
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
@@ -227,7 +227,7 @@
EXPECT_ACCEPTED(true);
/* Release connection */
- expect_bssap_clear(OSMO_RAT_GERAN_A);
+ expect_bssap_clear();
conn_conclude_cm_service_req(g_msub, MSC_A_USE_CM_SERVICE_SMS);
btw("all requests serviced, conn has been released");
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
index fe53469..648313f 1
Change in ...osmo-msc[master]: tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14514 ) Change subject: tests/msc_vlr: fix: do not pass RAT type to expect_bssap_clear() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id3a3af33fcc5da4ca4c48a2f589a69f3568d2586 Gerrit-Change-Number: 14514 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 19 Jun 2019 16:57:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: libvlr/vlr.c: do not expire subscribers if periodic LU is disabled
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14525 ) Change subject: libvlr/vlr.c: do not expire subscribers if periodic LU is disabled .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2ead2241a3394dbdd5417f4554190df3fd698af2 Gerrit-Change-Number: 14525 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 16:56:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14538 ) Change subject: vty: Simplify char escaping in asciidoc output .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 Gerrit-Change-Number: 14538 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 19 Jun 2019 16:55:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: osmo-sgsn-master: Bind to localhost instead of a specific IP by default
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14537 ) Change subject: osmo-sgsn-master: Bind to localhost instead of a specific IP by default .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a922139c50d06217e5e6105ea65bf673daa10a8 Gerrit-Change-Number: 14537 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 19 Jun 2019 16:55:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...simtrace2[master]: qmod: Disable hub reset and EEPROM erase/write by default
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/simtrace2/+/14549
Change subject: qmod: Disable hub reset and EEPROM erase/write by default
..
qmod: Disable hub reset and EEPROM erase/write by default
We recently introduced ALLOW_PEER_ERASE to control if the firmware
should contain code for the SAM3 to reset each other on QMOD.
Let's use the same define to also remove code for putting the USB
hub into reset as well as code for erasing + writing the hub EEPROM.
This is needed only during production, but it shouldn't be enabled
during normal operation of the product at the end user.
Change-Id: I1c8cca2f7f0f0070d7bf1ade676e035c45e4d5ab
---
M firmware/libboard/qmod/source/board_qmod.c
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/49/14549/1
diff --git a/firmware/libboard/qmod/source/board_qmod.c
b/firmware/libboard/qmod/source/board_qmod.c
index 4d75b98..0565c92 100644
--- a/firmware/libboard/qmod/source/board_qmod.c
+++ b/firmware/libboard/qmod/source/board_qmod.c
@@ -28,6 +28,7 @@
#include "card_pres.h"
#include
#include "usb_buf.h"
+#include "i2c.h"
static const Pin pin_hubpwr_override = PIN_PRTPWR_OVERRIDE;
static const Pin pin_hub_rst = {PIO_PA13, PIOA, ID_PIOA, PIO_OUTPUT_0,
PIO_DEFAULT};
@@ -46,6 +47,7 @@
return 0;
}
+#if (ALLOW_PEER_ERASE > 0)
const unsigned char __eeprom_bin[256] = {
USB_VENDOR_OPENMOKO & 0xff,
USB_VENDOR_OPENMOKO >> 8,
@@ -69,7 +71,6 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x56,
0x23, 0x71, 0x04, 0x00, /* 0xf0 - 0xff */
};
-#include "i2c.h"
static int write_hub_eeprom(void)
{
int i;
@@ -126,7 +127,7 @@
return 0;
}
-
+#endif /* ALLOW_PEER_ERASE */
static void board_exec_dbg_cmd_st12only(int ch)
{
@@ -137,12 +138,14 @@
return;
switch (ch) {
+#if (ALLOW_PEER_ERASE > 0)
case 'E':
write_hub_eeprom();
break;
case 'e':
erase_hub_eeprom();
break;
+#endif /* ALLOW_PEER_ERASE */
case 'O':
printf("Setting PRTPWR_OVERRIDE\n\r");
PIO_Set(&pin_hubpwr_override);
@@ -151,6 +154,7 @@
printf("Clearing PRTPWR_OVERRIDE\n\r");
PIO_Clear(&pin_hubpwr_override);
break;
+#if (ALLOW_PEER_ERASE > 0)
case 'H':
printf("Clearing _HUB_RESET -> HUB_RESET high (inactive)\n\r");
PIO_Clear(&pin_hub_rst);
@@ -170,6 +174,7 @@
printf("Writing value 0x%02lx to EEPROM offset 0x%02lx\n\r",
val, addr);
eeprom_write_byte(0x50, addr, val);
break;
+#endif /* ALLOW_PEER_ERASE */
case 'r':
printf("Please enter EEPROM offset:\n\r");
UART_GetIntegerMinMax(&addr, 0, 255);
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/14549
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I1c8cca2f7f0f0070d7bf1ade676e035c45e4d5ab
Gerrit-Change-Number: 14549
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in ...docker-playground[master]: Have only one bts/bsc configured in osmo-bsc and bscnat
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14546 ) Change subject: Have only one bts/bsc configured in osmo-bsc and bscnat .. Patch Set 1: I'm not really a fan of this. I'd rather not report multiple identical counter groups. See also https://projects.osmocom.org/issues/3417 which needs to be fixed as well and is a related problem. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I57468d983580b5ed4f15961ac1eac9bed9096556 Gerrit-Change-Number: 14546 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 19 Jun 2019 16:28:39 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...docker-playground[master]: Have only one bts/bsc configured in osmo-bsc and bscnat
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/14546 Change subject: Have only one bts/bsc configured in osmo-bsc and bscnat .. Have only one bts/bsc configured in osmo-bsc and bscnat The way our counter reporting works is that each counter group is reported even if the same one exists multiple times. To avoid that change the default config (used by regen_doc.sh) to only configure one bts / bsc. Change-Id: I57468d983580b5ed4f15961ac1eac9bed9096556 Related: OS#1700 --- M osmo-bsc-master/osmo-bsc.cfg M osmo-nitb-master/bscs.config 2 files changed, 0 insertions(+), 194 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/46/14546/1 diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index 7ce9173..71516dd 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -157,186 +157,6 @@ timeslot 7 phys_chan_config PDCH hopping enabled 0 - bts 1 - type sysmobts - band DCS1800 - cell_identity 1 - location_area_code 2 - dtx uplink force - dtx downlink - base_station_id_code 63 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - early-classmark-sending forbidden - ip.access unit_id 1235 0 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - codec-support fr - gprs mode gprs - gprs 11bit_rach_support_for_egprs 0 - gprs routing area 0 - gprs network-control-order nc0 - gprs cell bvci 1235 - gprs cell timer blocking-timer 3 - gprs cell timer blocking-retries 3 - gprs cell timer unblocking-retries 3 - gprs cell timer reset-timer 3 - gprs cell timer reset-retries 3 - gprs cell timer suspend-timer 10 - gprs cell timer suspend-retries 3 - gprs cell timer resume-timer 10 - gprs cell timer resume-retries 3 - gprs cell timer capability-update-timer 10 - gprs cell timer capability-update-retries 3 - gprs nsei 1235 - gprs ns timer tns-block 3 - gprs ns timer tns-block-retries 3 - gprs ns timer tns-reset 3 - gprs ns timer tns-reset-retries 3 - gprs ns timer tns-test 30 - gprs ns timer tns-alive 3 - gprs ns timer tns-alive-retries 10 - gprs nsvc 0 nsvci 1235 - gprs nsvc 0 local udp port 23000 - gprs nsvc 0 remote udp port 23000 - gprs nsvc 0 remote ip 192.168.100.239 - gprs nsvc 1 nsvci 0 - gprs nsvc 1 local udp port 0 - gprs nsvc 1 remote udp port 0 - gprs nsvc 1 remote ip 0.0.0.0 - no force-combined-si - trx 0 - rf_locked 0 - arfcn 871 - nominal power 23 - max_power_red 20 - rsl e1 tei 0 - timeslot 0 -phys_chan_config CCCH+SDCCH4 -hopping enabled 0 - timeslot 1 -phys_chan_config TCH/F -hopping enabled 0 - timeslot 2 -phys_chan_config TCH/F -hopping enabled 0 - timeslot 3 -phys_chan_config TCH/F -hopping enabled 0 - timeslot 4 -phys_chan_config TCH/F -hopping enabled 0 - timeslot 5 -phys_chan_config TCH/F -hopping enabled 0 - timeslot 6 -phys_chan_config PDCH -hopping enabled 0 - timeslot 7 -phys_chan_config PDCH -hopping enabled 0 - bts 2 - type sysmobts - band DCS1800 - cell_identity 1 - location_area_code 1 - dtx uplink force - dtx downlink - base_station_id_code 63 - ms max power 15 - cell reselection hysteresis 4 - rxlev access min 0 - radio-link-timeout 32 - channel allocator ascending - rach tx integer 9 - rach max transmission 7 - channel-descrption attach 1 - channel-descrption bs-pa-mfrms 5 - channel-descrption bs-ag-blks-res 1 - early-classmark-sending forbidden - ip.access unit_id 1236 0 - oml ip.access stream_id 255 line 0 - neighbor-list mode manual-si5 - neighbor-list add arfcn 100 - neighbor-list add arfcn 200 - si5 neighbor-list add arfcn 10 - si5 neighbor-list add arfcn 20 - codec-support fr - gprs mode gprs - gprs 11bit_rach_support_for_egprs 0 - gprs routing area 0 - gprs network-control-order nc0 - gprs cell bvci 1236 - gprs cell timer blocking-timer 3 - gprs cell timer blocking-retries 3 - gprs cell timer unblocking-retries 3 - gprs cell timer reset-timer 3 - gprs cell timer reset-retries 3 - gprs cell timer suspend-timer 10 - gprs cell timer suspend-retries 3 - gprs cell timer resume-timer 10 - gprs cell timer resume-retries 3 - gprs cell timer capability-update-timer 10 - gprs cell timer capability-update-retries 3 - gprs nsei 1236 - gprs ns timer tns-block 3 - gprs ns timer tns-block-retries 3 - gprs ns timer tns-reset 3 - gprs ns timer tns-reset-retries 3 - gprs ns timer tns-test 30 - gprs ns timer tns-alive 3 - gprs ns timer tns-alive-
Change in ...osmo-gsm-tester[master]: tests: voice: Add voice call test with Osmux enabled
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14548
Change subject: tests: voice: Add voice call test with Osmux enabled
..
tests: voice: Add voice call test with Osmux enabled
Change-Id: Ie4f360a77f6fcbc74f140a7fcb5feef2d94ac734
---
M src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
A suites/voice/lib/testlib.py
M suites/voice/mo_mt_call.py
A suites/voice/mo_mt_call_osmux.py
4 files changed, 78 insertions(+), 52 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/48/14548/1
diff --git a/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
b/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
index f91ab30..5f351a4 100644
--- a/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
@@ -15,3 +15,4 @@
rtcp-omit
rtp-accept-all 1
osmux ${mgw.use_osmux}
+ osmux bind-ip ${mgw.ip_address.addr}
diff --git a/suites/voice/lib/testlib.py b/suites/voice/lib/testlib.py
new file mode 100644
index 000..1eaf95d
--- /dev/null
+++ b/suites/voice/lib/testlib.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.testenv import *
+
+def test_mo_mt_call(use_osmux=False, force_osmux=False):
+hlr = suite.hlr()
+bts = suite.bts()
+mgw_msc = suite.mgw()
+mgw_bsc = suite.mgw()
+stp = suite.stp()
+msc = suite.msc(hlr, mgw_msc, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
+ms_mo = suite.modem()
+ms_mt = suite.modem()
+
+hlr.start()
+stp.start()
+
+msc.set_use_osmux(use_osmux, force_osmux)
+msc.start()
+
+mgw_msc.set_use_osmux(use_osmux, force_osmux)
+mgw_msc.start()
+
+# We don't want to force Osmux in BSC_MGW since in MGW BTS-side is still
RTP.
+mgw_bsc.set_use_osmux(use_osmux, False)
+mgw_bsc.start()
+
+bsc.set_use_osmux(use_osmux, force_osmux)
+bsc.bts_add(bts)
+bsc.start()
+
+bts.start()
+wait(bsc.bts_is_connected, bts)
+
+hlr.subscriber_add(ms_mo)
+hlr.subscriber_add(ms_mt)
+
+ms_mo.connect(msc.mcc_mnc())
+ms_mt.connect(msc.mcc_mnc())
+
+ms_mo.log_info()
+ms_mt.log_info()
+
+print('waiting for modems to attach...')
+wait(ms_mo.is_connected, msc.mcc_mnc())
+wait(ms_mt.is_connected, msc.mcc_mnc())
+wait(msc.subscriber_attached, ms_mo, ms_mt)
+
+assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0
+mo_cid = ms_mo.call_dial(ms_mt)
+mt_cid = ms_mt.call_wait_incoming(ms_mo)
+print('dial success')
+
+assert not ms_mo.call_is_active(mo_cid) and not
ms_mt.call_is_active(mt_cid)
+ms_mt.call_answer(mt_cid)
+wait(ms_mo.call_is_active, mo_cid)
+wait(ms_mt.call_is_active, mt_cid)
+print('answer success, call established and ongoing')
+
+sleep(5) # maintain the call active for 5 seconds
+
+assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid)
+ms_mt.call_hangup(mt_cid)
+wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list())
== 0)
+print('hangup success')
diff --git a/suites/voice/mo_mt_call.py b/suites/voice/mo_mt_call.py
index aeda80d..740b1fe 100755
--- a/suites/voice/mo_mt_call.py
+++ b/suites/voice/mo_mt_call.py
@@ -1,56 +1,8 @@
#!/usr/bin/env python3
from osmo_gsm_tester.testenv import *
-hlr = suite.hlr()
-bts = suite.bts()
-mgw_msc = suite.mgw()
-mgw_bsc = suite.mgw()
-stp = suite.stp()
-msc = suite.msc(hlr, mgw_msc, stp)
-bsc = suite.bsc(msc, mgw_bsc, stp)
-ms_mo = suite.modem()
-ms_mt = suite.modem()
+import testlib
+suite.test_import_modules_register_for_cleanup(testlib)
+from testlib import test_mo_mt_call
-hlr.start()
-stp.start()
-msc.start()
-mgw_msc.start()
-mgw_bsc.start()
-
-bsc.bts_add(bts)
-bsc.start()
-
-bts.start()
-wait(bsc.bts_is_connected, bts)
-
-hlr.subscriber_add(ms_mo)
-hlr.subscriber_add(ms_mt)
-
-ms_mo.connect(msc.mcc_mnc())
-ms_mt.connect(msc.mcc_mnc())
-
-ms_mo.log_info()
-ms_mt.log_info()
-
-print('waiting for modems to attach...')
-wait(ms_mo.is_connected, msc.mcc_mnc())
-wait(ms_mt.is_connected, msc.mcc_mnc())
-wait(msc.subscriber_attached, ms_mo, ms_mt)
-
-assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0
-mo_cid = ms_mo.call_dial(ms_mt)
-mt_cid = ms_mt.call_wait_incoming(ms_mo)
-print('dial success')
-
-assert not ms_mo.call_is_active(mo_cid) and not ms_mt.call_is_active(mt_cid)
-ms_mt.call_answer(mt_cid)
-wait(ms_mo.call_is_active, mo_cid)
-wait(ms_mt.call_is_active, mt_cid)
-print('answer success, call established and ongoing')
-
-sleep(5) # maintain the call active for 5 seconds
-
-assert ms_mo.call_is_active(mo_cid) and ms_mt.call_is_active(mt_cid)
-ms_mt.call_hangup(mt_cid)
-wait(lambda: len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0)
-print('hangup success')
+test_mo_mt_call(False, False)
diff --git a/suites/voice/mo_mt_call_osmux.py b/suites/voice/mo_mt_call_osmux.py
new file mode 100755
index 000..acf7
Change in ...osmo-gsm-tester[master]: Introduce osmux support for msc, bsc, mgw
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/14547
Change subject: Introduce osmux support for msc,bsc,mgw
..
Introduce osmux support for msc,bsc,mgw
Change-Id: Ief3518e77650f2cddb48357b07fe95346e46ee1b
---
M src/osmo_gsm_tester/osmo_bsc.py
M src/osmo_gsm_tester/osmo_mgw.py
M src/osmo_gsm_tester/osmo_msc.py
M src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
M src/osmo_gsm_tester/templates/osmo-mgw.cfg.tmpl
M src/osmo_gsm_tester/templates/osmo-msc.cfg.tmpl
6 files changed, 41 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/47/14547/1
diff --git a/src/osmo_gsm_tester/osmo_bsc.py b/src/osmo_gsm_tester/osmo_bsc.py
index ec9c3b8..4160527 100644
--- a/src/osmo_gsm_tester/osmo_bsc.py
+++ b/src/osmo_gsm_tester/osmo_bsc.py
@@ -32,6 +32,7 @@
self.process = None
self.encryption = None
self.rsl_ip = None
+self.use_osmux = "off"
self.suite_run = suite_run
self.ip_address = ip_address
self.bts = []
@@ -90,6 +91,7 @@
else:
encryption_vty =
util.encryption2osmovty(values['bsc']['net']['encryption'])
config.overlay(values,
dict(bsc=dict(net=dict(encryption=encryption_vty
+config.overlay(values, dict(bsc=dict(use_osmux=self.use_osmux)))
if self.rsl_ip is not None:
config.overlay(values,
dict(bsc=dict(net=dict(rsl_ip=self.rsl_ip
@@ -113,6 +115,15 @@
other external entities to test the RSL path, such as TTCN3 tests.'''
self.rsl_ip = ip_addr
+def set_use_osmux(self, use=False, force=False):
+if not use:
+self.use_osmux = "off"
+else:
+if not force:
+self.use_osmux = "on"
+else:
+self.use_osmux = "only"
+
def bts_add(self, bts):
self.bts.append(bts)
bts.set_bsc(self)
diff --git a/src/osmo_gsm_tester/osmo_mgw.py b/src/osmo_gsm_tester/osmo_mgw.py
index ca7bd51..ea8e652 100644
--- a/src/osmo_gsm_tester/osmo_mgw.py
+++ b/src/osmo_gsm_tester/osmo_mgw.py
@@ -31,6 +31,7 @@
self.process = None
self.suite_run = suite_run
self.ip_address = ip_address
+self.use_osmux = "off"
def start(self):
self.log('Starting osmo-mgw')
@@ -63,7 +64,11 @@
values = dict(mgw=config.get_defaults('mgw'))
config.overlay(values, self.suite_run.config())
-config.overlay(values, dict(mgw=dict(ip_address=self.ip_address)))
+config.overlay(values, { 'mgw': {
+'ip_address': self.ip_address,
+'use_osmux': self.use_osmux
+}
+})
self.dbg('MGW CONFIG:\n' + pprint.pformat(values))
@@ -81,4 +86,14 @@
def running(self):
return not self.process.terminated()
+def set_use_osmux(self, use=False, force=False):
+if not use:
+self.use_osmux = "off"
+else:
+if not force:
+self.use_osmux = "on"
+else:
+self.use_osmux = "only"
+
+
# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/osmo_msc.py b/src/osmo_gsm_tester/osmo_msc.py
index 192926c..51f50c4 100644
--- a/src/osmo_gsm_tester/osmo_msc.py
+++ b/src/osmo_gsm_tester/osmo_msc.py
@@ -32,6 +32,7 @@
self.config = None
self.encryption = None
self.authentication = None
+self.use_osmux = "off"
self.suite_run = suite_run
self.ip_address = ip_address
self.hlr = hlr
@@ -84,6 +85,7 @@
config.overlay(values,
dict(msc=dict(net=dict(encryption=encryption_vty
if self.authentication is not None:
config.overlay(values,
dict(msc=dict(net=dict(authentication=self.authentication
+config.overlay(values, dict(msc=dict(use_osmux=self.use_osmux)))
self.config = values
@@ -107,6 +109,15 @@
return
self.authentication = "required" if val else "optional"
+def set_use_osmux(self, use=False, force=False):
+if not use:
+self.use_osmux = "off"
+else:
+if not force:
+self.use_osmux = "on"
+else:
+self.use_osmux = "only"
+
def mcc(self):
return self.config['msc']['net']['mcc']
diff --git a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
index 53e683b..572e765 100644
--- a/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl
@@ -118,5 +118,6 @@
amr-config 5_90k allowed
amr-config 5_15k forbidden
amr-config 4_75k forbidden
+ osmux ${bsc.use_osmux}
msc-addr msc_remote
bsc-addr bsc_local
diff --git a/src/osmo_gsm_t
Change in ...osmo-python-tests[master]: osmo-trap2cgi: Remove invalid specifier for /etc
daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14544 ) Change subject: osmo-trap2cgi: Remove invalid specifier for /etc .. osmo-trap2cgi: Remove invalid specifier for /etc On prod-bscnat the specifier %E (for /etc) does not exist so let's not use it. Change-Id: Ia3d8838475c2cc8f9f4ba3a0bc5483c6e1645f8f Related: SYS#4399 --- M contrib/systemd/osmo-trap2cgi.service 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/systemd/osmo-trap2cgi.service b/contrib/systemd/osmo-trap2cgi.service index 7a90813..8122790 100644 --- a/contrib/systemd/osmo-trap2cgi.service +++ b/contrib/systemd/osmo-trap2cgi.service @@ -4,7 +4,7 @@ [Service] Type=simple Restart=always -ExecStart=/usr/bin/osmo_trap2cgi.py -d -c %E/osmocom/%N.ini +ExecStart=/usr/bin/osmo_trap2cgi.py -d -c /etc/osmocom/%N.ini RestartSec=2 [Install] -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ia3d8838475c2cc8f9f4ba3a0bc5483c6e1645f8f Gerrit-Change-Number: 14544 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-python-tests[master]: osmo_trap2cgi.py: Don't recurse in ctrl_client()
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 ) Change subject: osmo_trap2cgi.py: Don't recurse in ctrl_client() .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/14545/1/scripts/osmo_trap2cgi.py File scripts/osmo_trap2cgi.py: https://gerrit.osmocom.org/#/c/14545/1/scripts/osmo_trap2cgi.py@193 PS1, Line 193: await conn_client(proxy) We need to break this recursion as well. https://gerrit.osmocom.org/#/c/14545/1/scripts/osmo_trap2cgi.py@215 PS1, Line 215: await conn_client(proxy) > Then we should turn this recursion into a while True. Yes, see also my generic comment. So I'll try to get the recursion out of this script. Maybe Max can share his ideas why he used it in the first place. -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c Gerrit-Change-Number: 14545 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 16:07:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-python-tests[master]: osmo_trap2cgi.py: Don't recurse in ctrl_client()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 ) Change subject: osmo_trap2cgi.py: Don't recurse in ctrl_client() .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/14545/1/scripts/osmo_trap2cgi.py File scripts/osmo_trap2cgi.py: https://gerrit.osmocom.org/#/c/14545/1/scripts/osmo_trap2cgi.py@215 PS1, Line 215: await conn_client(proxy) Then we should turn this recursion into a while True. -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c Gerrit-Change-Number: 14545 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 15:58:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-python-tests[master]: osmo_trap2cgi.py: Don't recurse in ctrl_client()
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 ) Change subject: osmo_trap2cgi.py: Don't recurse in ctrl_client() .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14545/1/scripts/osmo_trap2cgi.py File scripts/osmo_trap2cgi.py: https://gerrit.osmocom.org/#/c/14545/1/scripts/osmo_trap2cgi.py@211 PS1, Line 211: await ctrl_client(proxy, reader, writer) > I don't know how this framework works, but are you sure keeping ctrl_client > in a while True loop is […] We're more or less in the same boat then. :-) As far as I can tell conn_client (re-)connects - see also line 215 - to the ctrl port and ctrl_client reads the traps in an infinite loop (or before in an infinite tail-recursion). If anything goes wrong in the exception handlers conn_client is called again, which re-establishes the connection. -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c Gerrit-Change-Number: 14545 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 15:49:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-python-tests[master]: osmo-trap2cgi: Remove invalid specifier for /etc
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14544 ) Change subject: osmo-trap2cgi: Remove invalid specifier for /etc .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ia3d8838475c2cc8f9f4ba3a0bc5483c6e1645f8f Gerrit-Change-Number: 14544 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 15:44:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-python-tests[master]: osmo_trap2cgi.py: Don't recurse in ctrl_client()
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 ) Change subject: osmo_trap2cgi.py: Don't recurse in ctrl_client() .. Patch Set 1: It seems to me that tail-recursion should be possible in python - at least from some comments on the web, but it's clearly not working here. This might also have implications in conn_client (which calls itself) and recon_reader (which calls conn_client and is called by conn_client->ctrl_client). conn_client is easily modified, should we pass-through the exception in recon_reader and then just catch it in conn_client and reconnect? -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c Gerrit-Change-Number: 14545 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 15:44:22 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-python-tests[master]: osmo_trap2cgi.py: Don't recurse in ctrl_client()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 ) Change subject: osmo_trap2cgi.py: Don't recurse in ctrl_client() .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14545/1/scripts/osmo_trap2cgi.py File scripts/osmo_trap2cgi.py: https://gerrit.osmocom.org/#/c/14545/1/scripts/osmo_trap2cgi.py@211 PS1, Line 211: await ctrl_client(proxy, reader, writer) I don't know how this framework works, but are you sure keeping ctrl_client in a while True loop is fine? For instance this function conn_client looks like will block always here. Just to make sure. -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c Gerrit-Change-Number: 14545 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 15:43:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-python-tests[master]: osmo-trap2cgi: Remove invalid specifier for /etc
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14544 Change subject: osmo-trap2cgi: Remove invalid specifier for /etc .. osmo-trap2cgi: Remove invalid specifier for /etc On prod-bscnat the specifier %E (for /etc) does not exist so let's not use it. Change-Id: Ia3d8838475c2cc8f9f4ba3a0bc5483c6e1645f8f Related: SYS#4399 --- M contrib/systemd/osmo-trap2cgi.service 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/44/14544/1 diff --git a/contrib/systemd/osmo-trap2cgi.service b/contrib/systemd/osmo-trap2cgi.service index 7a90813..8122790 100644 --- a/contrib/systemd/osmo-trap2cgi.service +++ b/contrib/systemd/osmo-trap2cgi.service @@ -4,7 +4,7 @@ [Service] Type=simple Restart=always -ExecStart=/usr/bin/osmo_trap2cgi.py -d -c %E/osmocom/%N.ini +ExecStart=/usr/bin/osmo_trap2cgi.py -d -c /etc/osmocom/%N.ini RestartSec=2 [Install] -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ia3d8838475c2cc8f9f4ba3a0bc5483c6e1645f8f Gerrit-Change-Number: 14544 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in ...osmo-python-tests[master]: osmo_trap2cgi.py: Don't recurse in ctrl_client()
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 Change subject: osmo_trap2cgi.py: Don't recurse in ctrl_client() .. osmo_trap2cgi.py: Don't recurse in ctrl_client() Use a loop instead. Without it the script will eventually crash with a RecursionError. File "/usr/bin/osmo_trap2cgi.py", line 211, in conn_client await ctrl_client(proxy, reader, writer) File "/usr/bin/osmo_trap2cgi.py", line 202, in ctrl_client proxy.dispatch(wr, data) [...] File "/usr/bin/osmo_trap2cgi.py", line 202, in ctrl_client proxy.dispatch(wr, data) File "/usr/bin/osmo_trap2cgi.py", line 201, in ctrl_client [...] RecursionError: maximum recursion depth exceeded in comparison Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c Related: SYS#4399 --- M scripts/osmo_trap2cgi.py 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/python/osmo-python-tests refs/changes/45/14545/1 diff --git a/scripts/osmo_trap2cgi.py b/scripts/osmo_trap2cgi.py index ad66e7b..8aa7649 100755 --- a/scripts/osmo_trap2cgi.py +++ b/scripts/osmo_trap2cgi.py @@ -194,12 +194,12 @@ async def ctrl_client(proxy, rd, wr): """ -Recursively read CTRL stream and handle selected messages. +Read CTRL stream and handle selected messages. """ -header = await recon_reader(proxy, rd, 4) -data = await recon_reader(proxy, rd, get_ctrl_len(proxy, header)) -proxy.dispatch(wr, data) -await ctrl_client(proxy, rd, wr) +while True: +header = await recon_reader(proxy, rd, 4) +data = await recon_reader(proxy, rd, get_ctrl_len(proxy, header)) +proxy.dispatch(wr, data) async def conn_client(proxy): """ -- To view, visit https://gerrit.osmocom.org/c/python/osmo-python-tests/+/14545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: python/osmo-python-tests Gerrit-Branch: master Gerrit-Change-Id: Ic909e371771f3056cb87e18793fd4225ffb90a2c Gerrit-Change-Number: 14545 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/14538 to look at the new patch set (#2). Change subject: vty: Simplify char escaping in asciidoc output .. vty: Simplify char escaping in asciidoc output Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 --- M src/vty/command.c 1 file changed, 4 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/14538/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638 Gerrit-Change-Number: 14538 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in gsm411_alloc_mt_trans()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14541 ) Change subject: libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in gsm411_alloc_mt_trans() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3c1e633aee5dd7cd0d367404a3def9cffe0b3baa Gerrit-Change-Number: 14541 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 14:30:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: gsm_04_11_gsup.c: fix broken reference counting for vsub
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14540 ) Change subject: gsm_04_11_gsup.c: fix broken reference counting for vsub .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic729beb5f94cbbfbb251bc9ab66a5e7b799286c0 Gerrit-Change-Number: 14540 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 14:28:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: Remove trailing whitespace in output from show asciidoc
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmocore/+/14536 ) Change subject: vty: Remove trailing whitespace in output from show asciidoc .. vty: Remove trailing whitespace in output from show asciidoc Change-Id: Ifb3115c7488fbcf082cc9b92abc25cf7c46064e0 --- M src/vty/stats_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index c911087..8c2ddc6 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -442,7 +442,7 @@ char *group_name_prefix = osmo_asciidoc_escape(ctrg->desc->group_name_prefix); vty_out(vty, "// rate_ctr_group table %s%s", group_description, VTY_NEWLINE); - vty_out(vty, ".%s - %s %s", group_name_prefix, group_description, VTY_NEWLINE); + vty_out(vty, ".%s - %s%s", group_name_prefix, group_description, VTY_NEWLINE); vty_out(vty, "[options=\"header\"]%s", VTY_NEWLINE); vty_out(vty, "|===%s", VTY_NEWLINE); vty_out(vty, "| Name | Reference | Description%s", VTY_NEWLINE); @@ -491,7 +491,7 @@ vty_out(vty, "%s%s", group_description ? group_description : "" , VTY_NEWLINE); vty_out(vty, "// osmo_stat_item_group table %s%s", group_description ? group_description : "", VTY_NEWLINE); - vty_out(vty, ".%s - %s %s", group_name_prefix, group_description ? group_description : "", VTY_NEWLINE); + vty_out(vty, ".%s - %s%s", group_name_prefix, group_description ? group_description : "", VTY_NEWLINE); vty_out(vty, "[options=\"header\"]%s", VTY_NEWLINE); vty_out(vty, "|===%s", VTY_NEWLINE); vty_out(vty, "| Name | Reference | Description | Unit%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb3115c7488fbcf082cc9b92abc25cf7c46064e0 Gerrit-Change-Number: 14536 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: BSSMAP_Templates: Provide complete set of CellID related rx/tx templates
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14543
Change subject: BSSMAP_Templates: Provide complete set of CellID related rx/tx
templates
..
BSSMAP_Templates: Provide complete set of CellID related rx/tx templates
Change-Id: I07c5fb9b621b09e11fec025b56f971fb61060839
---
M library/BSSMAP_Templates.ttcn
1 file changed, 57 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/43/14543/1
diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn
index b377358..4fa6100 100644
--- a/library/BSSMAP_Templates.ttcn
+++ b/library/BSSMAP_Templates.ttcn
@@ -1036,6 +1036,56 @@
template BSSMAP_FIELD_CellIdentificationList ts_BSSMAP_CIL_noCell := {
cIl_noCell := ''O
}
+template (value) BSSMAP_FIELD_CellIdentificationList ts_BSSMAP_CIL_BSS := {
+ cIl_allInBSS := ''O
+}
+template BSSMAP_FIELD_CellIdentificationList tr_BSSMAP_CIL_BSS := {
+ cIl_allInBSS := ''O
+}
+
+template (value) BSSMAP_FIELD_CellIdentificationList
+ ts_BSSMAP_CIL_CGI(template (value)
BSSMAP_FIELD_CellIdentificationList_CGI cgil) := {
+ cIl_CGI := cgil
+}
+template BSSMAP_FIELD_CellIdentificationList
+ tr_BSSMAP_CIL_CGI(template
BSSMAP_FIELD_CellIdentificationList_CGI cgil) := {
+ cIl_CGI := cgil
+}
+
+template (value) BSSMAP_FIELD_CellIdentificationList
+ ts_BSSMAP_CIL_LAC_CI(template (value)
BSSMAP_FIELD_CellIdentificationList_LAC_CI lac_cil) := {
+ cIl_LAC_CI := lac_cil
+}
+template BSSMAP_FIELD_CellIdentificationList
+ tr_BSSMAP_CIL_LAC_CI(template
BSSMAP_FIELD_CellIdentificationList_LAC_CI lac_cil) := {
+ cIl_LAC_CI := lac_cil
+}
+
+template (value) BSSMAP_FIELD_CellIdentificationList
+ ts_BSSMAP_CIL_CI(template (value) RecordOfOCT2 cil) := {
+ cIl_CI := cil
+}
+template BSSMAP_FIELD_CellIdentificationList tr_BSSMAP_CIL_CI(template
RecordOfOCT2 cil) := {
+ cIl_CI := cil
+}
+
+template (value) BSSMAP_FIELD_CellIdentificationList
+ ts_BSSMAP_CIL_LAI(template (value)
BSSMAP_FIELD_CellIdentificationList_LAI lail) := {
+ cIl_LAI := lail
+}
+template BSSMAP_FIELD_CellIdentificationList
+ tr_BSSMAP_CIL_LAI(template
BSSMAP_FIELD_CellIdentificationList_LAI lail) := {
+ cIl_LAI := lail
+}
+
+template (value) BSSMAP_FIELD_CellIdentificationList
+ ts_BSSMAP_CIL_LAC(template (value) RecordOfOCT2 lacl) := {
+ cIl_LAC := lacl
+}
+template BSSMAP_FIELD_CellIdentificationList tr_BSSMAP_CIL_LAC(template
RecordOfOCT2 lacl) := {
+ cIl_LAC := lacl
+}
+
private function f_enc_mcc_mnc(GsmMcc mcc, GsmMnc mnc) return OCT3 {
if (lengthof(mnc) == 2) {
@@ -1045,33 +1095,33 @@
}
}
-template BSSMAP_FIELD_CellIdentification_CGI ts_BSSMAP_CI_CGI(GsmMcc mcc,
GsmMnc mnc, GsmLac lac, GsmCellId ci) := {
+template (value) BSSMAP_FIELD_CellIdentification_CGI ts_BSSMAP_CI_CGI(GsmMcc
mcc, GsmMnc mnc, GsmLac lac, GsmCellId ci) := {
mcc_mnc := f_enc_mcc_mnc(mcc, mnc),
lac := int2oct(lac, 2),
ci := int2oct(ci, 2)
}
-template BSSMAP_FIELD_CellIdentification_LAC_CI ts_BSSMAP_CI_LAC_CI(GsmLac
lac, GsmCellId ci) := {
+template (value) BSSMAP_FIELD_CellIdentification_LAC_CI
ts_BSSMAP_CI_LAC_CI(GsmLac lac, GsmCellId ci) := {
lac := int2oct(lac, 2),
ci := int2oct(ci, 2)
}
-template BSSMAP_FIELD_CellIdentification_LAI ts_BSSMAP_CI_LAI(GsmMcc mcc,
GsmMnc mnc, GsmLac lac) := {
+template (value) BSSMAP_FIELD_CellIdentification_LAI ts_BSSMAP_CI_LAI(GsmMcc
mcc, GsmMnc mnc, GsmLac lac) := {
mcc_mnc := f_enc_mcc_mnc(mcc, mnc),
lac := int2oct(lac, 2)
}
-template OCT2 ts_BSSMAP_CI_CI(GsmCellId ci) := int2oct(ci, 2);
-template OCT2 ts_BSSMAP_CI_LAC(GsmLac lac) := int2oct(lac, 2);
+template (value) OCT2 ts_BSSMAP_CI_LAC(GsmLac lac) := int2oct(lac, 2);
+template (value) OCT2 ts_BSSMAP_CI_CI(GsmCellId ci) := int2oct(ci, 2);
-template BSSMAP_FIELD_CellIdentification_PLMN_LAC_RNC
+template (value) BSSMAP_FIELD_CellIdentification_PLMN_LAC_RNC
ts_BSSMAP_CI_PLMN_LAC_RNC(GsmMcc mcc, GsmMnc mnc, GsmLac lac, uint16_t rnc_id)
:= {
mcc_mnc := f_enc_mcc_mnc(mcc, mnc),
lac := int2oct(lac, 2),
rncId := int2oct(rnc_id, 2)
}
-template BSSMAP_FIELD_CellIdentification_LAC_RNC ts_BSSMAP_CI_LAC_RNC(GsmLac
lac, uint16_t rnc_id) := {
+template (value) BSSMAP_FIELD_CellIdentification_LAC_RNC
ts_BSSMAP_CI_LAC_RNC(GsmLac lac, uint16_t rnc_id) := {
lac := int2oct(lac, 2),
rncId := int2oct(rnc_id, 2)
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14543
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I07c5fb9b621b09e11fec025b56f971fb61060839
Gerrit-Change-Number: 14543
Gerrit-P
Change in ...osmo-ttcn3-hacks[master]: Put build / run scripts under Apache 2.0 license
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14542
Change subject: Put build / run scripts under Apache 2.0 license
..
Put build / run scripts under Apache 2.0 license
The license of the build or execution scripts doesn't affect the license
of the actual program, and we want to explicitly state that these scripts may
be used in any kind of context.
Change-Id: I553925cd88b05903aab52ae1afb093aa9ab9d035
---
M Makefile
M compare-results.sh
M deps/Makefile
M gen_links.sh.inc
M log_merge.sh
M regen-makefile.sh
M start-testsuite.sh
M update_expected_results_from_jenkins.sh
8 files changed, 119 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/42/14542/1
diff --git a/Makefile b/Makefile
index b8778af..2c8e951 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,18 @@
+# Copyright 2017 Harald Welte
+# Copyright 2018 sysmocom - s.f.m.c. GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
SUBDIRS=bsc bsc-nat bts ggsn_tests hlr mgw msc pcu sccp selftest sgsn sip
sysinfo
NPROC=$(shell nproc 2>/dev/null)
diff --git a/compare-results.sh b/compare-results.sh
index cce3a8d..6037174 100755
--- a/compare-results.sh
+++ b/compare-results.sh
@@ -2,6 +2,20 @@
expected_file="$1"
results_file="$2"
+# Copyright 2018 sysmocom - s.f.m.c. GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
usage() {
echo "
Usage:
diff --git a/deps/Makefile b/deps/Makefile
index 23f7b64..cdca8f1 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -1,3 +1,17 @@
+# Copyright 2017 Harald Welte
+# Copyright 2018 sysmocom - s.f.m.c. GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
ECLIPSEGIT:=https://github.com/eclipse
ECLIPSEGIT2:=git://git.eclipse.org/gitroot/titan
diff --git a/gen_links.sh.inc b/gen_links.sh.inc
index 8a87359..539b398 100644
--- a/gen_links.sh.inc
+++ b/gen_links.sh.inc
@@ -1,6 +1,21 @@
#!dont_run_this
# This file is sourced by */gen_links.sh
+# Copyright 2017 Harald Welte
+# Copyright 2018 sysmocom - s.f.m.c. GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
rm -f .gitignore
gen_link() {
diff --git a/log_merge.sh b/log_merge.sh
index d3c50f7..886b788 100755
--- a/log_merge.sh
+++ b/log_merge.sh
@@ -7,6 +7,21 @@
#
# the output files will be called "Module-Testcase.merged"
+# Copyright 2018 Harald Welte
+# Copyright 2018 sysmocom - s.f.m.c. GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific lan
Change in ...osmo-msc[master]: libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in gsm411_alloc_mt_trans()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/14541 to look at the new patch set (#2). Change subject: libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in gsm411_alloc_mt_trans() .. libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in gsm411_alloc_mt_trans() This change is similar to I6b68a0f0b32eb126e0f7e914a314130254d28467. If we 100% sure that trans == NULL, it makes more sense to use generic LOGP(DLSMS, LOGL_*, ...) call, so the logs can reflect more information than such dummy prefix: trans(NULL NULL callref-0x0 tid-0) ... Change-Id: I3c1e633aee5dd7cd0d367404a3def9cffe0b3baa --- M src/libmsc/gsm_04_11.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/14541/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3c1e633aee5dd7cd0d367404a3def9cffe0b3baa Gerrit-Change-Number: 14541 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in gsm411_alloc_mt_trans()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/14541
Change subject: libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in
gsm411_alloc_mt_trans()
..
libmsc/gsm_04_11.c: do not abuse LOG_TRANS() in gsm411_alloc_mt_trans()
This change is similar to I6b68a0f0b32eb126e0f7e914a314130254d28467.
If we 100% sure that trans == NULL, it makes more sense to use
generic LOGP(DLSMS, LOGL_*, ...) call, so the logs can reflect
more information than such dummy prefix:
trans(NULL NULL callref-0x0 tid-0) ...
Change-Id: I3c1e633aee5dd7cd0d367404a3def9cffe0b3baa
---
M src/libmsc/gsm_04_11.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/14541/1
diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c
index 3a3ec8c..3a8b93d 100644
--- a/src/libmsc/gsm_04_11.c
+++ b/src/libmsc/gsm_04_11.c
@@ -1097,13 +1097,13 @@
struct vlr_subscr *vsub)
{
struct msc_a *msc_a;
- struct gsm_trans *trans = NULL;
+ struct gsm_trans *trans;
int tid;
/* Generate a new transaction ID */
tid = trans_assign_trans_id(net, vsub, TRANS_SMS);
if (tid == -1) {
- LOG_TRANS(trans, LOGL_ERROR, "No available transaction IDs\n");
+ LOG(DLSMS, LOGL_ERROR, "No available transaction IDs\n");
return NULL;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14541
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3c1e633aee5dd7cd0d367404a3def9cffe0b3baa
Gerrit-Change-Number: 14541
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: gsm_04_11_gsup.c: fix broken reference counting for vsub
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/14540
Change subject: gsm_04_11_gsup.c: fix broken reference counting for vsub
..
gsm_04_11_gsup.c: fix broken reference counting for vsub
This change is similar to I5540556b1c75f6873883e46b78656f31fc1ef186.
In gsm411_gsup_rx() we do call vlr_subscr_find_by_imsi(), which
increases subscriber's reference count by one using the function
name as the token. However, we never release this token, so the
reference count grows on every received GSUP FORWARD-SM message.
Change-Id: Ic729beb5f94cbbfbb251bc9ab66a5e7b799286c0
---
M src/libmsc/gsm_04_11_gsup.c
1 file changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/40/14540/1
diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c
index 331092a..2abfc92 100644
--- a/src/libmsc/gsm_04_11_gsup.c
+++ b/src/libmsc/gsm_04_11_gsup.c
@@ -287,8 +287,10 @@
int gsm411_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct
osmo_gsup_message *gsup_msg)
{
struct gsm_network *net = (struct gsm_network *) data;
- struct vlr_subscr *vsub = vlr_subscr_find_by_imsi(net->vlr,
gsup_msg->imsi, __func__);
+ struct vlr_subscr *vsub;
+ int rc;
+ vsub = vlr_subscr_find_by_imsi(net->vlr, gsup_msg->imsi, __func__);
if (!vsub) {
LOGP(DLSMS, LOGL_ERROR, "Rx %s for unknown subscriber,
rejecting\n",
osmo_gsup_message_type_name(gsup_msg->message_type));
@@ -303,16 +305,21 @@
case OSMO_GSUP_MSGT_READY_FOR_SM_ERROR:
case OSMO_GSUP_MSGT_READY_FOR_SM_RESULT:
DEBUGP(DMSC, "Routed to GSM 04.11 MO handler\n");
- return gsm411_gsup_mo_handler(net, vsub, gsup_msg);
+ rc = gsm411_gsup_mo_handler(net, vsub, gsup_msg);
+ break;
/* GSM 04.11 code implementing MT SMS */
case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST:
DEBUGP(DMSC, "Routed to GSM 04.11 MT handler\n");
- return gsm411_gsup_mt_handler(net, vsub, gsup_msg);
+ rc = gsm411_gsup_mt_handler(net, vsub, gsup_msg);
+ break;
default:
LOGP(DMM, LOGL_ERROR, "No handler found for %s, dropping
message...\n",
osmo_gsup_message_type_name(gsup_msg->message_type));
- return -GMM_CAUSE_MSGT_NOTEXIST_NOTIMPL;
+ rc = -GMM_CAUSE_MSGT_NOTEXIST_NOTIMPL;
}
+
+ vlr_subscr_put(vsub, __func__);
+ return rc;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14540
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ic729beb5f94cbbfbb251bc9ab66a5e7b799286c0
Gerrit-Change-Number: 14540
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...openbsc[master]: bsc-nat: Remove whitespace at the end of CTR descriptions
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/openbsc/+/14539
Change subject: bsc-nat: Remove whitespace at the end of CTR descriptions
..
bsc-nat: Remove whitespace at the end of CTR descriptions
Change-Id: Ia7ff352de1fb1997066f72e84a7d517c7642853a
---
M openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
1 file changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/39/14539/1
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
index 223ef34..c4fe0d3 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c
@@ -46,19 +46,19 @@
#include
static const struct rate_ctr_desc bsc_cfg_ctr_description[] = {
- [BCFG_CTR_SCCP_CONN] = { "sccp:conn", "SCCP Connections
"},
- [BCFG_CTR_SCCP_CALLS]= { "sccp:calls", "SCCP Assignment
Commands "},
- [BCFG_CTR_NET_RECONN]= { "net:reconnects", "Network reconnects
"},
- [BCFG_CTR_DROPPED_SCCP] = { "dropped:sccp", "Dropped SCCP
connections."},
- [BCFG_CTR_DROPPED_CALLS] = { "dropped:calls", "Dropped active calls.
"},
- [BCFG_CTR_REJECTED_CR] = { "rejected:cr","Rejected CR due filter
"},
- [BCFG_CTR_REJECTED_MSG] = { "rejected:msg", "Rejected MSG due filter
"},
- [BCFG_CTR_ILL_PACKET]= { "rejected:ill", "Rejected due parse
error "},
- [BCFG_CTR_CON_TYPE_LU] = { "conn:lu","Conn Location Update
"},
- [BCFG_CTR_CON_CMSERV_RQ] = { "conn:rq","Conn CM Service Req
"},
- [BCFG_CTR_CON_PAG_RESP] = { "conn:pag", "Conn Paging Response
"},
- [BCFG_CTR_CON_SSA] = { "conn:ssa", "Conn USSD
"},
- [BCFG_CTR_CON_OTHER] = { "conn:other", "Conn Other
"},
+ [BCFG_CTR_SCCP_CONN] = { "sccp:conn", "SCCP Connections"
},
+ [BCFG_CTR_SCCP_CALLS]= { "sccp:calls", "SCCP Assignment
Commands"},
+ [BCFG_CTR_NET_RECONN]= { "net:reconnects", "Network reconnects"
},
+ [BCFG_CTR_DROPPED_SCCP] = { "dropped:sccp", "Dropped SCCP
connections"},
+ [BCFG_CTR_DROPPED_CALLS] = { "dropped:calls", "Dropped active calls."
},
+ [BCFG_CTR_REJECTED_CR] = { "rejected:cr","Rejected CR due filter"
},
+ [BCFG_CTR_REJECTED_MSG] = { "rejected:msg", "Rejected MSG due
filter" },
+ [BCFG_CTR_ILL_PACKET]= { "rejected:ill", "Rejected due parse
error"},
+ [BCFG_CTR_CON_TYPE_LU] = { "conn:lu","Conn Location Update"
},
+ [BCFG_CTR_CON_CMSERV_RQ] = { "conn:rq","Conn CM Service Req"
},
+ [BCFG_CTR_CON_PAG_RESP] = { "conn:pag", "Conn Paging Response"
},
+ [BCFG_CTR_CON_SSA] = { "conn:ssa", "Conn USSD"
},
+ [BCFG_CTR_CON_OTHER] = { "conn:other", "Conn Other"
},
};
static const struct rate_ctr_group_desc bsc_cfg_ctrg_desc = {
--
To view, visit https://gerrit.osmocom.org/c/openbsc/+/14539
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia7ff352de1fb1997066f72e84a7d517c7642853a
Gerrit-Change-Number: 14539
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...openbsc[master]: manuals: Generate vty/counter documentation for osmo-bscnat
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/14530 ) Change subject: manuals: Generate vty/counter documentation for osmo-bscnat .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/14530/1/manuals/OsmoBSCNAT/chapters/counters_generated.adoc File manuals/OsmoBSCNAT/chapters/counters_generated.adoc: https://gerrit.osmocom.org/#/c/14530/1/manuals/OsmoBSCNAT/chapters/counters_generated.adoc@79 PS1, Line 79: | conn:other | <> | Conn Other > Where the hell does all this whitespace come from? osmo_asciidoc_escape? Found where the whitespace come, providing fix for it. But this section is printed 3 times, that's wrong right? -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/14530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ice7f15192a57e2c964d07d364732af888972ba0f Gerrit-Change-Number: 14530 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 13:02:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...docker-playground[master]: regen_doc.sh: Add optional parameter to customize docker execution
daniel has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/docker-playground/+/14527 )
Change subject: regen_doc.sh: Add optional parameter to customize docker
execution
..
regen_doc.sh: Add optional parameter to customize docker execution
The osmo-nitb-master image can run not only osmo-nitb, but also
osmo-bsc_nat. In that case we can't use the default command from
Dockerfile, but should provide our own. This argument makes it possible
to do so.
Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c
Related: OS#1700
---
M scripts/regen_doc.sh
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
daniel: Verified
pespin: Looks good to me, approved
diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh
index 7c7529f..5327ae8 100755
--- a/scripts/regen_doc.sh
+++ b/scripts/regen_doc.sh
@@ -6,6 +6,7 @@
PORT="$2"
COUNTERFILE="$3"
VTYFILE="$4"
+DOCKER_EXTRA="$5"
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
if [ -z "$OSMO_INTERACT_VTY" ]; then
@@ -23,7 +24,8 @@
docker run --rm --network ${NET_NAME} --ip ${IP_ADDR} \
--name ${BUILD_TAG}-${CONTAINERNAME} -d \
- ${REPO_USER}/${CONTAINERNAME}
+ ${REPO_USER}/${CONTAINERNAME} \
+ ${DOCKER_EXTRA}
}
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14527
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c
Gerrit-Change-Number: 14527
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...libosmocore[master]: vty: Simplify char escaping in asciidoc output
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/14538
Change subject: vty: Simplify char escaping in asciidoc output
..
vty: Simplify char escaping in asciidoc output
Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638
---
M src/vty/command.c
1 file changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/14538/1
diff --git a/src/vty/command.c b/src/vty/command.c
index 89a2bc1..d8e7f7f 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -538,23 +538,18 @@
out_ptr = out;
-#define ADD(out, str) \
- for (j = 0; j < strlen(str); ++j) \
- *(out++) = str[j];
-
for (i = 0; i < _strlen; ++i) {
switch (inp[i]) {
case '|':
- ADD(out_ptr, "\\|");
- break;
+ /* Prepend escape character "\": */
+ *(out_ptr++) = '\\';
+ /* fall through */
default:
*(out_ptr++) = inp[i];
break;
}
}
-#undef ADD
-
out_ptr[0] = '\0';
return out;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14538
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I7df6858bb98abffc1d5bf420f991ae5854b24638
Gerrit-Change-Number: 14538
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...libosmocore[master]: vty: Remove trailing whitespace in output from show asciidoc
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14536 ) Change subject: vty: Remove trailing whitespace in output from show asciidoc .. Patch Set 2: Code-Review+2 Nice catch -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb3115c7488fbcf082cc9b92abc25cf7c46064e0 Gerrit-Change-Number: 14536 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 19 Jun 2019 12:55:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: manuals: Add counter documentation
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14524 ) Change subject: manuals: Add counter documentation .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/14524/1/doc/manuals/chapters/counters_generated.adoc File doc/manuals/chapters/counters_generated.adoc: https://gerrit.osmocom.org/#/c/14524/1/doc/manuals/chapters/counters_generated.adoc@9 PS1, Line 9: .e1inp - E1 Input subsystem > Is there an extra whitespace at the end of the line? probably something we > want to fix in code. Hmm, I do have git configured to remove trailing whitespace at the end of a line, but it seems that only happens for diffs/updated files and not when adding a new one. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I994ad6aae7f409e0f15ff1d388127e16243b378a Gerrit-Change-Number: 14524 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:54:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...docker-playground[master]: regen_doc.sh: Add optional parameter to customize docker execution
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14527 ) Change subject: regen_doc.sh: Add optional parameter to customize docker execution .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c Gerrit-Change-Number: 14527 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:48:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: regen_doc.sh: Add optional parameter to customize docker execution
daniel has posted comments on this change. (
https://gerrit.osmocom.org/c/docker-playground/+/14527 )
Change subject: regen_doc.sh: Add optional parameter to customize docker
execution
..
Patch Set 2:
(1 comment)
https://gerrit.osmocom.org/#/c/14527/2/scripts/regen_doc.sh
File scripts/regen_doc.sh:
https://gerrit.osmocom.org/#/c/14527/2/scripts/regen_doc.sh@28
PS2, Line 28: ${DOCKER_EXTRA}
> not sure if we need "" here.
I don't think so. I'm using it with DOCKER_EXTRA="osmo-bsc_nat -c
/data/osmo-bsc_nat.cfg" and in docker run these should (or at least can) be
independent arguments.
ttcn3-bscnat-test calls docker run like this as well.
docker run --rm \
--network $NET_NAME --ip 172.18.15.20 \
-v $VOL_BASE_DIR/bscnat:/data \
--name ${BUILD_TAG}-bscnat -d \
$REPO_USER/osmo-nitb-$IMAGE_SUFFIX osmo-bsc_nat -c
/data/osmo-bsc-nat.cfg
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14527
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c
Gerrit-Change-Number: 14527
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Wed, 19 Jun 2019 12:47:53 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
Change in ...osmo-bts[master]: manuals: Add script to regenerate counter/vty documentation
daniel has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bts/+/14522 )
Change subject: manuals: Add script to regenerate counter/vty documentation
..
manuals: Add script to regenerate counter/vty documentation
This will generate the VTY/counter documentation for osmo-bts-virtual so
it will be missing documentation for device-specific commands/counters.
Change-Id: Idebb099b69924d6212db119f7a2f2861d4150d7e
Related: OS#1700
---
M doc/manuals/Makefile.am
A doc/manuals/regen_doc.sh
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index 1d8125f..e8018d5 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -6,6 +6,7 @@
osmobts-vty-reference.xml \
rtp-amr.adoc \
rtp-amr-docinfo.xml \
+regen_doc.sh \
abis \
chapters \
vty
diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh
new file mode 100755
index 000..6ff5091
--- /dev/null
+++ b/doc/manuals/regen_doc.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_BTS_BRANCH=$COMMIT ./regen_doc.sh osmo-bts 4241 \
+ "$MANUAL_DIR/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/vty/bts_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14522
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Idebb099b69924d6212db119f7a2f2861d4150d7e
Gerrit-Change-Number: 14522
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...libosmo-sccp[master]: manuals: Add script to regenerate vty/counter documentation
daniel has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/14518 )
Change subject: manuals: Add script to regenerate vty/counter documentation
..
manuals: Add script to regenerate vty/counter documentation
Related: OS#1700
Change-Id: I9978d04fec68d6a8e17caa3c88c1020cf3a348ac
---
M doc/manuals/Makefile.am
A doc/manuals/regen_doc.sh
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index 68c2d86..6707f07 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,6 +1,7 @@
EXTRA_DIST = osmostp-usermanual.adoc \
osmostp-usermanual-docinfo.xml \
osmostp-vty-reference.xml \
+regen_doc.sh \
chapters \
vty
diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh
new file mode 100755
index 000..6e7ce30
--- /dev/null
+++ b/doc/manuals/regen_doc.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_STP_BRANCH=$COMMIT ./regen_doc.sh osmo-stp 4239 \
+ "$MANUAL_DIR/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/vty/osmo-stp_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/14518
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: I9978d04fec68d6a8e17caa3c88c1020cf3a348ac
Gerrit-Change-Number: 14518
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...libosmo-sccp[master]: manuals: Update vty documentation
daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/14519 ) Change subject: manuals: Update vty documentation .. manuals: Update vty documentation Related: OS#1700 Change-Id: I2061d7883f5457ec8c53358dc6089daaf60c67c3 --- M doc/manuals/vty/osmo-stp_vty_reference.xml 1 file changed, 246 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/manuals/vty/osmo-stp_vty_reference.xml b/doc/manuals/vty/osmo-stp_vty_reference.xml index 308c369..9a26316 100644 --- a/doc/manuals/vty/osmo-stp_vty_reference.xml +++ b/doc/manuals/vty/osmo-stp_vty_reference.xml @@ -187,7 +187,7 @@ - + @@ -209,6 +209,7 @@ + @@ -261,6 +262,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -390,6 +420,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + enable @@ -558,7 +625,7 @@ - + @@ -580,6 +647,7 @@ + @@ -632,6 +700,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -761,6 +858,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config @@ -955,6 +1089,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1037,7 +1208,7 @@ - + @@ -1059,6 +1230,7 @@ + @@ -1099,6 +1271,75 @@ + +config-stats + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-line @@ -1112,10 +1353,11 @@ - + + @@ -1438,7 +1680,6 @@ - -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/14519 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I2061d7883f5457ec8c53358dc6089daaf60c67c3 Gerrit-Change-Number: 14519 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-pcu[master]: manuals: Add script to regenerate vty/counter documentation
daniel has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-pcu/+/14520 )
Change subject: manuals: Add script to regenerate vty/counter documentation
..
manuals: Add script to regenerate vty/counter documentation
Change-Id: Iff570e85828c87d69a7a49a00d9459094077ca30
Related: OS#1700
---
M doc/manuals/Makefile.am
A doc/manuals/regen_doc.sh
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index 96675ec..a29b48f 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -3,6 +3,7 @@
osmopcu-usermanual.adoc \
osmopcu-usermanual-docinfo.xml \
osmopcu-vty-reference.xml \
+regen_doc.sh \
chapters \
gb \
vty
diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh
new file mode 100755
index 000..aae5566
--- /dev/null
+++ b/doc/manuals/regen_doc.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_PCU_BRANCH=$COMMIT ./regen_doc.sh osmo-pcu 4240 \
+ "$MANUAL_DIR/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/vty/osmo-pcu_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/14520
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Iff570e85828c87d69a7a49a00d9459094077ca30
Gerrit-Change-Number: 14520
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-mgw[master]: manuals: Add script to regenerate vty/counter documentation
daniel has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-mgw/+/14532 )
Change subject: manuals: Add script to regenerate vty/counter documentation
..
manuals: Add script to regenerate vty/counter documentation
Change-Id: Ib5e0bd9ec430a6ef3dce6845d7def39720c54637
Depends: Ic5828957a29d4f317e1ebf4f03b5f5359f6250e8 (docker-playground.git)
Related: OS#1700
---
M doc/manuals/Makefile.am
A doc/manuals/regen_doc.sh
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index 0faebf3..a82f95d 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,6 +1,7 @@
EXTRA_DIST = osmomgw-usermanual.adoc \
osmomgw-usermanual-docinfo.xml \
osmomgw-vty-reference.xml \
+regen_doc.sh \
chapters \
vty
diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh
new file mode 100755
index 000..210d65c
--- /dev/null
+++ b/doc/manuals/regen_doc.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_MGW_BRANCH=$COMMIT ./regen_doc.sh osmo-mgw 4243 \
+ "$MANUAL_DIR/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/vty/mgw_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/14532
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib5e0bd9ec430a6ef3dce6845d7def39720c54637
Gerrit-Change-Number: 14532
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...openbsc[master]: manuals: Add script to regenerate counter/vty documentation
daniel has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/openbsc/+/14528 )
Change subject: manuals: Add script to regenerate counter/vty documentation
..
manuals: Add script to regenerate counter/vty documentation
Related: OS#1700
Change-Id: I3e6e6603300d2d7f6221720fa7ce35b3a6aa0b7a
---
M openbsc/doc/Makefile.am
A openbsc/doc/regen_doc.sh
2 files changed, 23 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/openbsc/doc/Makefile.am b/openbsc/doc/Makefile.am
index 5a23107..ac3c914 100644
--- a/openbsc/doc/Makefile.am
+++ b/openbsc/doc/Makefile.am
@@ -1,3 +1,5 @@
SUBDIRS = \
examples \
$(NULL)
+
+EXTRA_DIST = regen_doc.sh
diff --git a/openbsc/doc/regen_doc.sh b/openbsc/doc/regen_doc.sh
new file mode 100755
index 000..5552dec
--- /dev/null
+++ b/openbsc/doc/regen_doc.sh
@@ -0,0 +1,21 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")/../../manuals
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_NITB_BRANCH=$COMMIT ./regen_doc.sh osmo-nitb 4242 \
+ "$MANUAL_DIR/OsmoNITB/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/OsmoNITB/vty/nitb_vty_reference.xml"
+
+#OSMO_BSCNAT_BRANCH=$COMMIT ./regen_doc.sh osmo-bscnat 4244 \
+# "$MANUAL_DIR/OsmoBSCNAT/chapters/counters_generated.adoc" \
+# "$MANUAL_DIR/OsmoBSCNAT/vty/nat_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/openbsc/+/14528
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Change-Id: I3e6e6603300d2d7f6221720fa7ce35b3a6aa0b7a
Gerrit-Change-Number: 14528
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-mgw[master]: manuals: Update vty/counter documentation
daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-mgw/+/14533 ) Change subject: manuals: Update vty/counter documentation .. manuals: Update vty/counter documentation Change-Id: Icc86ef7ddd8a30984f91b025157e11fc0df9631e Depends: OS#1700 --- M doc/manuals/chapters/counters_generated.adoc M doc/manuals/vty/mgw_vty_reference.xml 2 files changed, 111 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index 20a4dec..22c321d 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -1,10 +1,79 @@ // autogenerated by show asciidoc counters -These counters and their description based on OsmoMGW 1.3.0.34-9cd52 (OsmoMGW). +These counters and their description based on OsmoMGW 1.5.0.60-f638 (OsmoMGW). === Rate Counters // generating tables for rate_ctr_group +// rate_ctr_group table aggregated statistics for all rtp connections +.all_rtp_conn - aggregated statistics for all rtp connections +[options="header"] +|=== +| Name | Reference | Description +| all_rtp:err_tstmp_in | <> | Total inbound rtp-stream timestamp errors. +| all_rtp:err_tstmp_out | <> | Total outbound rtp-stream timestamp errors. +| all_rtp:packets_rx | <> | Total inbound rtp packets. +| all_rtp:octets_rx | <> | Total inbound rtp octets. +| all_rtp:packets_tx | <> | Total outbound rtp packets. +| all_rtp:octets_tx | <> | Total outbound rtp octets. +| all_rtp:dropped | <> | Total dropped rtp packets. +| all_rtp:num_closed_conns | <> | Total number of rtp connections closed. +|=== +// rate_ctr_group table dlcx statistics +.dlcx - dlcx statistics +[options="header"] +|=== +| Name | Reference | Description +| dlcx:success | <> | DLCX command processed successfully. +| dlcx:wildcard | <> | wildcard names in DLCX commands are unsupported. +| dlcx:no_conn | <> | endpoint specified in DLCX command has no active connections. +| dlcx:callid | <> | CallId specified in DLCX command mismatches endpoint's CallId . +| dlcx:connid | <> | connection ID specified in DLCX command does not exist on endpoint. +| dlcx:unhandled_param | <> | unhandled parameter in DLCX command. +| dlcx:rejected | <> | connection deletion rejected by policy. +| dlcx:deferred | <> | connection deletion deferred by policy. +|=== +// rate_ctr_group table mdcx statistics +.mdcx - mdcx statistics +[options="header"] +|=== +| Name | Reference | Description +| mdcx:success | <> | MDCX command processed successfully. +| mdcx:wildcard | <> | wildcard endpoint names in MDCX commands are unsupported. +| mdcx:no_conn | <> | endpoint specified in MDCX command has no active connections. +| mdcx:callid | <> | invalid CallId specified in MDCX command. +| mdcx:connid | <> | invalid connection ID specified in MDCX command. +| crcx:unhandled_param | <> | unhandled parameter in MDCX command. +| mdcx:no_connid | <> | no connection ID specified in MDCX command. +| mdcx:conn_not_found | <> | connection specified in MDCX command does not exist. +| mdcx:invalid_mode | <> | invalid connection mode in MDCX command. +| mdcx:conn_opt | <> | connection options invalid. +| mdcx:no_remote_conn_desc | <> | no opposite end specified for connection. +| mdcx:start_rtp_failure | <> | failure to start RTP processing. +| mdcx:conn_rejected | <> | connection rejected by policy. +| mdcx:conn_deferred | <> | connection deferred by policy. +|=== +// rate_ctr_group table crxc statistics +.crcx - crxc statistics +[options="header"] +|=== +| Name | Reference | Description +| crcx:success | <> | CRCX command processed successfully. +| crcx:bad_action | <> | bad action in CRCX command. +| crcx:unhandled_param | <> | unhandled parameter in CRCX command. +| crcx:missing_callid | <> | missing CallId in CRCX command. +| crcx:invalid_mode | <> | invalid connection mode in CRCX command. +| crcx:limit_exceeded | <> | limit of concurrent connections was reached. +| crcx:unkown_callid | <> | unknown CallId in CRCX command. +| crcx:alloc_conn_fail | <> | connection allocation failure. +| crcx:no_remote_conn_desc | <> | no opposite end specified for connection. +| crcx:start_rtp_failure | <> | failure to start RTP processing. +| crcx:conn_rejected | <> | connection rejected by policy. +| crcx:no_osmux | <> | no osmux offered by peer. +| crcx:conn_opt | <> | connection options invalid. +| crcx:codec_nego | <> | codec negotiation failure. +| crcx:bind_port | <> | port bind failure. +|=== == Osmo Stat Items // generating tables for osmo_stat_items diff --git a/doc/manuals/vty/mgw_vty_reference.xml b/doc/manuals/vty/mgw_vty_reference.xml index 834db04..1770dab 100644 --- a/doc/manuals/vty/mgw_vty_reference.xml +++ b/doc/manuals/vty/mgw_vty_reference.xml @@ -187,12 +187,11 @@
Change in ...osmo-ggsn[master]: manuals: Add script to regenerate vty/counter documentation
daniel has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/14517 )
Change subject: manuals: Add script to regenerate vty/counter documentation
..
manuals: Add script to regenerate vty/counter documentation
Related: OS#1700
Change-Id: I2f51ff19d2a1d7bcfdf569309a79a6e91a848302
---
M doc/manuals/Makefile.am
A doc/manuals/regen_doc.sh
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index 0c9e2e1..f9f47fb 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,6 +1,7 @@
EXTRA_DIST = osmoggsn-usermanual.adoc \
osmoggsn-usermanual-docinfo.xml \
osmoggsn-vty-reference.xml \
+regen_doc.sh \
chapters \
vty
diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh
new file mode 100755
index 000..f213f71
--- /dev/null
+++ b/doc/manuals/regen_doc.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_GGSN_BRANCH=$COMMIT ./regen_doc.sh osmo-ggsn 4260 \
+ "$MANUAL_DIR/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/vty/ggsn_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14517
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I2f51ff19d2a1d7bcfdf569309a79a6e91a848302
Gerrit-Change-Number: 14517
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-sgsn[master]: manuals: Add script to regenerate vty/counter documentation
daniel has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/14534 )
Change subject: manuals: Add script to regenerate vty/counter documentation
..
manuals: Add script to regenerate vty/counter documentation
Change-Id: I8ee63a3da532285def8de7fe5e90873152adb21e
Related: OS#1700
---
M doc/manuals/Makefile.am
A doc/manuals/regen_doc.sh
2 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index 52283ab..4c6b847 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,6 +1,7 @@
EXTRA_DIST = osmosgsn-usermanual.adoc \
osmosgsn-usermanual-docinfo.xml \
osmosgsn-vty-reference.xml \
+regen_doc.sh \
chapters \
vty
diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh
new file mode 100755
index 000..d758436
--- /dev/null
+++ b/doc/manuals/regen_doc.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_SGSN_BRANCH=$COMMIT ./regen_doc.sh osmo-sgsn 4245 \
+ "$MANUAL_DIR/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/vty/sgsn_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14534
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I8ee63a3da532285def8de7fe5e90873152adb21e
Gerrit-Change-Number: 14534
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-sgsn[master]: manuals: Update vty/counter documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14535 ) Change subject: manuals: Update vty/counter documentation .. Patch Set 1: Quick look: may be it's built without Iu support? or why are all those commands dropped? -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id7245eb1011d1f04d5dfa1503a96d100bc98344c Gerrit-Change-Number: 14535 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-CC: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:41:04 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...openbsc[master]: manuals: Update osmonitb counter/vty documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/14529 ) Change subject: manuals: Update osmonitb counter/vty documentation .. Patch Set 1: See https://gerrit.osmocom.org/c/libosmocore/+/14536 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/14529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ia598124fbb98b3ec8dee606f9d028bb3cc6ff002 Gerrit-Change-Number: 14529 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:41:32 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...docker-playground[master]: osmo-nitb-master: Add default config file for osmo-bsc_nat
daniel has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/14526 ) Change subject: osmo-nitb-master: Add default config file for osmo-bsc_nat .. osmo-nitb-master: Add default config file for osmo-bsc_nat Change-Id: I44bb395009582f5e1399f277e15203553c2dcf78 Related: OS#1700 --- M osmo-nitb-master/Dockerfile A osmo-nitb-master/bscs.config A osmo-nitb-master/osmo-bsc-nat.cfg 3 files changed, 65 insertions(+), 0 deletions(-) Approvals: daniel: Verified pespin: Looks good to me, approved diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index c7fb008..3e20ec8 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -42,6 +42,8 @@ VOLUME /data COPY openbsc.cfg /data/openbsc.cfg +COPY osmo-bsc-nat.cfg /data/osmo-bsc-nat.cfg +COPY bscs.config /data/bscs.config WORKDIR/data CMD["/usr/local/bin/osmo-nitb"] diff --git a/osmo-nitb-master/bscs.config b/osmo-nitb-master/bscs.config new file mode 100644 index 000..16cfa2b --- /dev/null +++ b/osmo-nitb-master/bscs.config @@ -0,0 +1,22 @@ +nat + bsc 0 + token BSC0 + location_area_code 1 + description bsc + max-endpoints 32 + paging forbidden 0 + osmux on + bsc 1 + token BSC1 + location_area_code 2 + description bsc + max-endpoints 32 + paging forbidden 0 + osmux on + bsc 2 + token BSC2 + location_area_code 3 + description bsc + max-endpoints 32 + paging forbidden 0 + osmux on diff --git a/osmo-nitb-master/osmo-bsc-nat.cfg b/osmo-nitb-master/osmo-bsc-nat.cfg new file mode 100644 index 000..0179a94 --- /dev/null +++ b/osmo-nitb-master/osmo-bsc-nat.cfg @@ -0,0 +1,41 @@ +! +! OsmoBSCNAT (0.12.0.266-2daa9) configuration saved from vty +!! +! +log file /data/osmo-bsc_nat.log + logging filter all 1 + logging color 0 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level force-all debug +! +line vty + no login + bind 0.0.0.0 +! +mgcp + bind ip 0.0.0.0 + bind port 2427 + rtp bts-base 4000 + rtp net-base 16000 + rtp ip-dscp 0 + no rtcp-omit + sdp audio-payload number 126 + sdp audio-payload name AMR/8000 + loop 0 + number endpoints 32 + call-agent ip 127.0.0.1 + rtp transcoder-base 0 + transcoder-remote-base 4000 +nat + msc ip 127.0.0.1 + msc port 5100 + token foo + timeout auth 2 + timeout ping 20 + timeout pong 5 + ip-dscp 0 + bscs-config-file bscs.config + access-list msceven imsi-allow ^[0-9]*[24680]$ + access-list mscodd imsi-allow ^[0-9]*[13579]$ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I44bb395009582f5e1399f277e15203553c2dcf78 Gerrit-Change-Number: 14526 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...docker-playground[master]: osmo-mgw: Bind to 0.0.0.0 by default
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14531 ) Change subject: osmo-mgw: Bind to 0.0.0.0 by default .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic5828957a29d4f317e1ebf4f03b5f5359f6250e8 Gerrit-Change-Number: 14531 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:40:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: osmo-sgsn-master: Bind to localhost instead of a specific IP by default
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14537 ) Change subject: osmo-sgsn-master: Bind to localhost instead of a specific IP by default .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a922139c50d06217e5e6105ea65bf673daa10a8 Gerrit-Change-Number: 14537 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 19 Jun 2019 12:40:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: manuals: Add script to regenerate vty/counter documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14534 ) Change subject: manuals: Add script to regenerate vty/counter documentation .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8ee63a3da532285def8de7fe5e90873152adb21e Gerrit-Change-Number: 14534 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 19 Jun 2019 12:39:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: osmo-sgsn-master: Bind to localhost instead of a specific IP by default
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/14537 Change subject: osmo-sgsn-master: Bind to localhost instead of a specific IP by default .. osmo-sgsn-master: Bind to localhost instead of a specific IP by default This does not break ttcn3-sgsn-test since it uses a custom config file with the correct IPs. Change-Id: I2a922139c50d06217e5e6105ea65bf673daa10a8 Related: OS#1700 --- M osmo-sgsn-master/osmo-sgsn.cfg 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/37/14537/1 diff --git a/osmo-sgsn-master/osmo-sgsn.cfg b/osmo-sgsn-master/osmo-sgsn.cfg index 6db56b7..b39a83e 100644 --- a/osmo-sgsn-master/osmo-sgsn.cfg +++ b/osmo-sgsn-master/osmo-sgsn.cfg @@ -7,8 +7,8 @@ bind 0.0.0.0 ! sgsn - gtp local-ip 172.18.0.21 - ggsn 0 remote-ip 172.18.0.201 + gtp local-ip 127.0.0.1 + ggsn 0 remote-ip 127.0.0.2 ggsn 0 gtp-version 1 ns timer tns-block 3 @@ -18,7 +18,7 @@ timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 172.18.0.21 + encapsulation udp local-ip 127.0.0.1 encapsulation udp local-port 23000 encapsulation framerelay-gre enabled 0 bssgp -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a922139c50d06217e5e6105ea65bf673daa10a8 Gerrit-Change-Number: 14537 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in ...osmo-mgw[master]: manuals: Update vty/counter documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/14533 ) Change subject: manuals: Update vty/counter documentation .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/14533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icc86ef7ddd8a30984f91b025157e11fc0df9631e Gerrit-Change-Number: 14533 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:39:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: manuals: Add counter documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14524 ) Change subject: manuals: Add counter documentation .. Patch Set 2: See https://gerrit.osmocom.org/c/libosmocore/+/14536 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I994ad6aae7f409e0f15ff1d388127e16243b378a Gerrit-Change-Number: 14524 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:38:38 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-mgw[master]: manuals: Add script to regenerate vty/counter documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/14532 ) Change subject: manuals: Add script to regenerate vty/counter documentation .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/14532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib5e0bd9ec430a6ef3dce6845d7def39720c54637 Gerrit-Change-Number: 14532 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:37:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: regen_doc.sh: Add optional parameter to customize docker execution
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14527 ) Change subject: regen_doc.sh: Add optional parameter to customize docker execution .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c Gerrit-Change-Number: 14527 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:35:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: regen_doc.sh: Add optional parameter to customize docker execution
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/docker-playground/+/14527 )
Change subject: regen_doc.sh: Add optional parameter to customize docker
execution
..
Patch Set 2:
(1 comment)
https://gerrit.osmocom.org/#/c/14527/2/scripts/regen_doc.sh
File scripts/regen_doc.sh:
https://gerrit.osmocom.org/#/c/14527/2/scripts/regen_doc.sh@28
PS2, Line 28: ${DOCKER_EXTRA}
not sure if we need "" here.
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14527
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c
Gerrit-Change-Number: 14527
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: daniel
Gerrit-CC: pespin
Gerrit-Comment-Date: Wed, 19 Jun 2019 12:35:54 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in ...docker-playground[master]: osmo-nitb-master: Add default config file for osmo-bsc_nat
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14526 ) Change subject: osmo-nitb-master: Add default config file for osmo-bsc_nat .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I44bb395009582f5e1399f277e15203553c2dcf78 Gerrit-Change-Number: 14526 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:34:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/osmo-sgsn in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-sgsn failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 696s] bss_ptmsi = bss_ptmsi | GSM23003_TMSI_SGSN_MASK; [ 696s] ^~~ [ 696s] gb_proxy.c:246:28: note: each undeclared identifier is reported only once for each function it appears in [ 696s] Makefile:615: recipe for target 'gb_proxy.o' failed [ 696s] make[4]: *** [gb_proxy.o] Error 1 [ 696s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/gprs' [ 696s] Makefile:391: recipe for target 'all-recursive' failed [ 696s] make[3]: *** [all-recursive] Error 1 [ 696s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 696s] Makefile:453: recipe for target 'all-recursive' failed [ 696s] make[2]: *** [all-recursive] Error 1 [ 696s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 696s] Makefile:385: recipe for target 'all' failed [ 696s] make[1]: *** [all] Error 2 [ 696s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 696s] dh_auto_build: make -j1 returned exit code 2 [ 697s] debian/rules:45: recipe for target 'build' failed [ 697s] make: *** [build] Error 2 [ 697s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 697s] [ 697s] obs-arm-5 failed "build osmo-sgsn_1.4.0.26.df9b3.dsc" at Wed Jun 19 12:33:12 UTC 2019. [ 697s] [ 697s] ### VM INTERACTION START ### [ 700s] [ 663.089098] sysrq: SysRq : Power Off [ 700s] [ 663.112385] reboot: Power down [ 702s] ### VM INTERACTION END ### [ 702s] [ 702s] obs-arm-5 failed "build osmo-sgsn_1.4.0.26.df9b3.dsc" at Wed Jun 19 12:33:17 UTC 2019. [ 702s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...docker-playground[master]: osmo-mgw: Bind to 0.0.0.0 by default
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14531 ) Change subject: osmo-mgw: Bind to 0.0.0.0 by default .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14531/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/14531/1//COMMIT_MSG@10 PS1, Line 10: don't configure that exact IP address) What's the issue here? We do set that IP addr when we use the docker container right? Please extend description. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic5828957a29d4f317e1ebf4f03b5f5359f6250e8 Gerrit-Change-Number: 14531 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:33:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...openbsc[master]: manuals: Generate vty/counter documentation for osmo-bscnat
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/14530 ) Change subject: manuals: Generate vty/counter documentation for osmo-bscnat .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14530/1/manuals/OsmoBSCNAT/chapters/counters_generated.adoc File manuals/OsmoBSCNAT/chapters/counters_generated.adoc: https://gerrit.osmocom.org/#/c/14530/1/manuals/OsmoBSCNAT/chapters/counters_generated.adoc@79 PS1, Line 79: | conn:other | <> | Conn Other Where the hell does all this whitespace come from? osmo_asciidoc_escape? -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/14530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ice7f15192a57e2c964d07d364732af888972ba0f Gerrit-Change-Number: 14530 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:32:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...openbsc[master]: manuals: Generate vty/counter documentation for osmo-bscnat
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/14530 ) Change subject: manuals: Generate vty/counter documentation for osmo-bscnat .. Patch Set 1: See https://gerrit.osmocom.org/c/libosmocore/+/14536 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/14530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ice7f15192a57e2c964d07d364732af888972ba0f Gerrit-Change-Number: 14530 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:29:50 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...openbsc[master]: manuals: Update osmonitb counter/vty documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/14529 ) Change subject: manuals: Update osmonitb counter/vty documentation .. Patch Set 1: -Code-Review See https://gerrit.osmocom.org/c/libosmocore/+/14536 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/14529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ia598124fbb98b3ec8dee606f9d028bb3cc6ff002 Gerrit-Change-Number: 14529 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:29:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty: Remove trailing whitespace in output from show asciidoc
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/14536 ) Change subject: vty: Remove trailing whitespace in output from show asciidoc .. vty: Remove trailing whitespace in output from show asciidoc Change-Id: Ifb3115c7488fbcf082cc9b92abc25cf7c46064e0 --- M src/vty/stats_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/14536/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb3115c7488fbcf082cc9b92abc25cf7c46064e0 Gerrit-Change-Number: 14536 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-sgsn[master]: manuals: Add script to regenerate vty/counter documentation
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/14534
Change subject: manuals: Add script to regenerate vty/counter documentation
..
manuals: Add script to regenerate vty/counter documentation
Change-Id: I8ee63a3da532285def8de7fe5e90873152adb21e
Related: OS#1700
---
M doc/manuals/Makefile.am
A doc/manuals/regen_doc.sh
2 files changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/34/14534/1
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index 52283ab..4c6b847 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,6 +1,7 @@
EXTRA_DIST = osmosgsn-usermanual.adoc \
osmosgsn-usermanual-docinfo.xml \
osmosgsn-vty-reference.xml \
+regen_doc.sh \
chapters \
vty
diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh
new file mode 100755
index 000..d758436
--- /dev/null
+++ b/doc/manuals/regen_doc.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_SGSN_BRANCH=$COMMIT ./regen_doc.sh osmo-sgsn 4245 \
+ "$MANUAL_DIR/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/vty/sgsn_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14534
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I8ee63a3da532285def8de7fe5e90873152adb21e
Gerrit-Change-Number: 14534
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
Change in ...osmo-sgsn[master]: manuals: Update vty/counter documentation
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14535 Change subject: manuals: Update vty/counter documentation .. manuals: Update vty/counter documentation Change-Id: Id7245eb1011d1f04d5dfa1503a96d100bc98344c Related: OS#1700 --- M doc/manuals/chapters/counters_generated.adoc M doc/manuals/vty/sgsn_vty_reference.xml 2 files changed, 11 insertions(+), 556 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/35/14535/1 diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index 756a4a5..35a907e 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -1,5 +1,8 @@ + // autogenerated by show asciidoc counters -These counters and their description based on OsmoSGSN UNKNOWN (OsmoSGSN). +These counters and their description based on OsmoSGSN 1.4.0.26-df9b3 (OsmoSGSN). + +=== Rate Counters // generating tables for rate_ctr_group // rate_ctr_group table BSSGP Peer Statistics @@ -93,6 +96,8 @@ | lost:alive | <> | ALIVE ACK missing count | lost:reset | <> | RESET ACK missing count |=== +== Osmo Stat Items + // generating tables for osmo_stat_items NSVC Peer Statistics // osmo_stat_item_group table NSVC Peer Statistics @@ -118,4 +123,7 @@ | Name | Reference | Description |=== +== Osmo Counters +// generating tables for osmo_counters +// there are no ungrouped osmo_counters diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml index e9cd322..a8245fc 100644 --- a/doc/manuals/vty/sgsn_vty_reference.xml +++ b/doc/manuals/vty/sgsn_vty_reference.xml @@ -378,98 +378,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -683,8 +591,7 @@ - - + @@ -989,98 +896,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1429,13 +1244,6 @@ - - - - - - - @@ -1518,8 +1326,7 @@ - - + @@ -1835,342 +1642,6 @@ - -config-cs7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -config-cs7-as - - - - - - -
Change in ...libosmocore[master]: vty: Remove trailing whitespace in output from show asciidoc
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/14536 Change subject: vty: Remove trailing whitespace in output from show asciidoc .. vty: Remove trailing whitespace in output from show asciidoc Change-Id: Ifb3115c7488fbcf082cc9b92abc25cf7c46064e0 --- M src/vty/stats_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/14536/1 diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c index c911087..7650567 100644 --- a/src/vty/stats_vty.c +++ b/src/vty/stats_vty.c @@ -442,7 +442,7 @@ char *group_name_prefix = osmo_asciidoc_escape(ctrg->desc->group_name_prefix); vty_out(vty, "// rate_ctr_group table %s%s", group_description, VTY_NEWLINE); - vty_out(vty, ".%s - %s %s", group_name_prefix, group_description, VTY_NEWLINE); + vty_out(vty, ".%s - %s%s", group_name_prefix, group_description, VTY_NEWLINE); vty_out(vty, "[options=\"header\"]%s", VTY_NEWLINE); vty_out(vty, "|===%s", VTY_NEWLINE); vty_out(vty, "| Name | Reference | Description%s", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifb3115c7488fbcf082cc9b92abc25cf7c46064e0 Gerrit-Change-Number: 14536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...openbsc[master]: manuals: Update osmonitb counter/vty documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/14529 ) Change subject: manuals: Update osmonitb counter/vty documentation .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/14529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ia598124fbb98b3ec8dee606f9d028bb3cc6ff002 Gerrit-Change-Number: 14529 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:20:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...openbsc[master]: manuals: Add script to regenerate counter/vty documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/openbsc/+/14528 ) Change subject: manuals: Add script to regenerate counter/vty documentation .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/14528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I3e6e6603300d2d7f6221720fa7ce35b3a6aa0b7a Gerrit-Change-Number: 14528 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 12:20:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:nightly/osmo-msc in Raspbian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Raspbian_9.0/armv7l Package network:osmocom:nightly/osmo-msc failed to build in Raspbian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 547s] tmsi |= GSM23003_TMSI_SGSN_MASK; [ 547s] ^~~ [ 547s] vlr.c:339:12: note: each undeclared identifier is reported only once for each function it appears in [ 547s] Makefile:442: recipe for target 'vlr.o' failed [ 547s] make[4]: *** [vlr.o] Error 1 [ 547s] make[4]: Leaving directory '/usr/src/packages/BUILD/src/libvlr' [ 547s] Makefile:422: recipe for target 'all-recursive' failed [ 547s] make[3]: *** [all-recursive] Error 1 [ 547s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 547s] Makefile:462: recipe for target 'all-recursive' failed [ 547s] make[2]: *** [all-recursive] Error 1 [ 547s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 547s] Makefile:394: recipe for target 'all' failed [ 547s] make[1]: *** [all] Error 2 [ 547s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 547s] dh_auto_build: make -j1 returned exit code 2 [ 547s] debian/rules:45: recipe for target 'build' failed [ 547s] make: *** [build] Error 2 [ 547s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 547s] [ 547s] armbuild25 failed "build osmo-msc_1.3.1.169.7a2c9c.dsc" at Wed Jun 19 12:20:22 UTC 2019. [ 547s] [ 547s] ### VM INTERACTION START ### [ 550s] [ 499.393185] sysrq: SysRq : Power Off [ 550s] [ 499.422567] reboot: Power down [ 550s] ### VM INTERACTION END ### [ 550s] [ 550s] armbuild25 failed "build osmo-msc_1.3.1.169.7a2c9c.dsc" at Wed Jun 19 12:20:25 UTC 2019. [ 550s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-bts[master]: manuals: Add counter documentation
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/14524 to look at the new patch set (#2). Change subject: manuals: Add counter documentation .. manuals: Add counter documentation Change-Id: I994ad6aae7f409e0f15ff1d388127e16243b378a Related: OS#1700 --- A doc/manuals/chapters/counters.adoc A doc/manuals/chapters/counters_generated.adoc M doc/manuals/osmobts-usermanual.adoc 3 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/14524/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I994ad6aae7f409e0f15ff1d388127e16243b378a Gerrit-Change-Number: 14524 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-mgw[master]: manuals: Update vty/counter documentation
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/14533 Change subject: manuals: Update vty/counter documentation .. manuals: Update vty/counter documentation Change-Id: Icc86ef7ddd8a30984f91b025157e11fc0df9631e Depends: OS#1700 --- M doc/manuals/chapters/counters_generated.adoc M doc/manuals/vty/mgw_vty_reference.xml 2 files changed, 111 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/33/14533/1 diff --git a/doc/manuals/chapters/counters_generated.adoc b/doc/manuals/chapters/counters_generated.adoc index 20a4dec..22c321d 100644 --- a/doc/manuals/chapters/counters_generated.adoc +++ b/doc/manuals/chapters/counters_generated.adoc @@ -1,10 +1,79 @@ // autogenerated by show asciidoc counters -These counters and their description based on OsmoMGW 1.3.0.34-9cd52 (OsmoMGW). +These counters and their description based on OsmoMGW 1.5.0.60-f638 (OsmoMGW). === Rate Counters // generating tables for rate_ctr_group +// rate_ctr_group table aggregated statistics for all rtp connections +.all_rtp_conn - aggregated statistics for all rtp connections +[options="header"] +|=== +| Name | Reference | Description +| all_rtp:err_tstmp_in | <> | Total inbound rtp-stream timestamp errors. +| all_rtp:err_tstmp_out | <> | Total outbound rtp-stream timestamp errors. +| all_rtp:packets_rx | <> | Total inbound rtp packets. +| all_rtp:octets_rx | <> | Total inbound rtp octets. +| all_rtp:packets_tx | <> | Total outbound rtp packets. +| all_rtp:octets_tx | <> | Total outbound rtp octets. +| all_rtp:dropped | <> | Total dropped rtp packets. +| all_rtp:num_closed_conns | <> | Total number of rtp connections closed. +|=== +// rate_ctr_group table dlcx statistics +.dlcx - dlcx statistics +[options="header"] +|=== +| Name | Reference | Description +| dlcx:success | <> | DLCX command processed successfully. +| dlcx:wildcard | <> | wildcard names in DLCX commands are unsupported. +| dlcx:no_conn | <> | endpoint specified in DLCX command has no active connections. +| dlcx:callid | <> | CallId specified in DLCX command mismatches endpoint's CallId . +| dlcx:connid | <> | connection ID specified in DLCX command does not exist on endpoint. +| dlcx:unhandled_param | <> | unhandled parameter in DLCX command. +| dlcx:rejected | <> | connection deletion rejected by policy. +| dlcx:deferred | <> | connection deletion deferred by policy. +|=== +// rate_ctr_group table mdcx statistics +.mdcx - mdcx statistics +[options="header"] +|=== +| Name | Reference | Description +| mdcx:success | <> | MDCX command processed successfully. +| mdcx:wildcard | <> | wildcard endpoint names in MDCX commands are unsupported. +| mdcx:no_conn | <> | endpoint specified in MDCX command has no active connections. +| mdcx:callid | <> | invalid CallId specified in MDCX command. +| mdcx:connid | <> | invalid connection ID specified in MDCX command. +| crcx:unhandled_param | <> | unhandled parameter in MDCX command. +| mdcx:no_connid | <> | no connection ID specified in MDCX command. +| mdcx:conn_not_found | <> | connection specified in MDCX command does not exist. +| mdcx:invalid_mode | <> | invalid connection mode in MDCX command. +| mdcx:conn_opt | <> | connection options invalid. +| mdcx:no_remote_conn_desc | <> | no opposite end specified for connection. +| mdcx:start_rtp_failure | <> | failure to start RTP processing. +| mdcx:conn_rejected | <> | connection rejected by policy. +| mdcx:conn_deferred | <> | connection deferred by policy. +|=== +// rate_ctr_group table crxc statistics +.crcx - crxc statistics +[options="header"] +|=== +| Name | Reference | Description +| crcx:success | <> | CRCX command processed successfully. +| crcx:bad_action | <> | bad action in CRCX command. +| crcx:unhandled_param | <> | unhandled parameter in CRCX command. +| crcx:missing_callid | <> | missing CallId in CRCX command. +| crcx:invalid_mode | <> | invalid connection mode in CRCX command. +| crcx:limit_exceeded | <> | limit of concurrent connections was reached. +| crcx:unkown_callid | <> | unknown CallId in CRCX command. +| crcx:alloc_conn_fail | <> | connection allocation failure. +| crcx:no_remote_conn_desc | <> | no opposite end specified for connection. +| crcx:start_rtp_failure | <> | failure to start RTP processing. +| crcx:conn_rejected | <> | connection rejected by policy. +| crcx:no_osmux | <> | no osmux offered by peer. +| crcx:conn_opt | <> | connection options invalid. +| crcx:codec_nego | <> | codec negotiation failure. +| crcx:bind_port | <> | port bind failure. +|=== == Osmo Stat Items // generating tables for osmo_stat_items diff --git a/doc/manuals/vty/mgw_vty_reference.xml b/doc/manuals/vty/mgw_vty_reference.xml index 834db04..1770dab 100644 --- a/doc/manuals/vty/mgw_vty_reference.xml +++ b/doc/manuals/vty/mgw_vty_reference.xml @@ -187,12 +187,11 @@
Change in ...osmo-mgw[master]: manuals: Add script to regenerate vty/counter documentation
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/14532
Change subject: manuals: Add script to regenerate vty/counter documentation
..
manuals: Add script to regenerate vty/counter documentation
Change-Id: Ib5e0bd9ec430a6ef3dce6845d7def39720c54637
Depends: Ic5828957a29d4f317e1ebf4f03b5f5359f6250e8 (docker-playground.git)
Related: OS#1700
---
M doc/manuals/Makefile.am
A doc/manuals/regen_doc.sh
2 files changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/32/14532/1
diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am
index 0faebf3..a82f95d 100644
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,6 +1,7 @@
EXTRA_DIST = osmomgw-usermanual.adoc \
osmomgw-usermanual-docinfo.xml \
osmomgw-vty-reference.xml \
+regen_doc.sh \
chapters \
vty
diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh
new file mode 100755
index 000..210d65c
--- /dev/null
+++ b/doc/manuals/regen_doc.sh
@@ -0,0 +1,17 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_MGW_BRANCH=$COMMIT ./regen_doc.sh osmo-mgw 4243 \
+ "$MANUAL_DIR/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/vty/mgw_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/14532
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib5e0bd9ec430a6ef3dce6845d7def39720c54637
Gerrit-Change-Number: 14532
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
Change in ...docker-playground[master]: regen_doc.sh: Add optional parameter to customize docker execution
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14527 ) Change subject: regen_doc.sh: Add optional parameter to customize docker execution .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c Gerrit-Change-Number: 14527 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 19 Jun 2019 12:05:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: osmo-nitb-master: Add default config file for osmo-bsc_nat
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14526 ) Change subject: osmo-nitb-master: Add default config file for osmo-bsc_nat .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I44bb395009582f5e1399f277e15203553c2dcf78 Gerrit-Change-Number: 14526 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 19 Jun 2019 12:05:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: osmo-mgw: Bind to 0.0.0.0 by default
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/14531 Change subject: osmo-mgw: Bind to 0.0.0.0 by default .. osmo-mgw: Bind to 0.0.0.0 by default Don't bind to a specific IP otherwise starting osmo-mgw will fail (if we don't configure that exact IP address) Related: OS#1700 Change-Id: Ic5828957a29d4f317e1ebf4f03b5f5359f6250e8 --- M osmo-mgw-master/osmo-mgw.cfg 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/31/14531/1 diff --git a/osmo-mgw-master/osmo-mgw.cfg b/osmo-mgw-master/osmo-mgw.cfg index 682c4ed..8f07294 100644 --- a/osmo-mgw-master/osmo-mgw.cfg +++ b/osmo-mgw-master/osmo-mgw.cfg @@ -34,10 +34,10 @@ bind 0.0.0.0 ! mgcp - bind ip 172.18.0.180 + bind ip 0.0.0.0 bind port 2427 rtp port-range 4002 16000 - rtp bind-ip 172.18.0.180 + rtp bind-ip 0.0.0.0 rtp ip-probing rtp ip-dscp 184 no rtp keep-alive -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic5828957a29d4f317e1ebf4f03b5f5359f6250e8 Gerrit-Change-Number: 14531 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in ...docker-playground[master]: osmo-nitb-master: Add default config file for osmo-bsc_nat
daniel has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/14526 ) Change subject: osmo-nitb-master: Add default config file for osmo-bsc_nat .. osmo-nitb-master: Add default config file for osmo-bsc_nat Change-Id: I44bb395009582f5e1399f277e15203553c2dcf78 Related: OS#1700 --- M osmo-nitb-master/Dockerfile A osmo-nitb-master/bscs.config A osmo-nitb-master/osmo-bsc-nat.cfg 3 files changed, 65 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/26/14526/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I44bb395009582f5e1399f277e15203553c2dcf78 Gerrit-Change-Number: 14526 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-MessageType: newpatchset
Change in ...docker-playground[master]: regen_doc.sh: Add optional parameter to customize docker execution
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14527 ) Change subject: regen_doc.sh: Add optional parameter to customize docker execution .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c Gerrit-Change-Number: 14527 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: daniel Gerrit-Comment-Date: Wed, 19 Jun 2019 11:59:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...openbsc[master]: manuals: Update osmonitb counter/vty documentation
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/14529 Change subject: manuals: Update osmonitb counter/vty documentation .. manuals: Update osmonitb counter/vty documentation Change-Id: Ia598124fbb98b3ec8dee606f9d028bb3cc6ff002 Related: OS#1700 --- A manuals/OsmoNITB/chapters/counters.adoc A manuals/OsmoNITB/chapters/counters_generated.adoc M manuals/OsmoNITB/osmonitb-usermanual.adoc M manuals/OsmoNITB/vty/nitb_vty_reference.xml 4 files changed, 4,176 insertions(+), 4,724 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/29/14529/1 -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/14529 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ia598124fbb98b3ec8dee606f9d028bb3cc6ff002 Gerrit-Change-Number: 14529 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in ...openbsc[master]: manuals: Add script to regenerate counter/vty documentation
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/openbsc/+/14528
Change subject: manuals: Add script to regenerate counter/vty documentation
..
manuals: Add script to regenerate counter/vty documentation
Related: OS#1700
Change-Id: I3e6e6603300d2d7f6221720fa7ce35b3a6aa0b7a
---
M openbsc/doc/Makefile.am
A openbsc/doc/regen_doc.sh
2 files changed, 23 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/28/14528/1
diff --git a/openbsc/doc/Makefile.am b/openbsc/doc/Makefile.am
index 5a23107..ac3c914 100644
--- a/openbsc/doc/Makefile.am
+++ b/openbsc/doc/Makefile.am
@@ -1,3 +1,5 @@
SUBDIRS = \
examples \
$(NULL)
+
+EXTRA_DIST = regen_doc.sh
diff --git a/openbsc/doc/regen_doc.sh b/openbsc/doc/regen_doc.sh
new file mode 100755
index 000..5552dec
--- /dev/null
+++ b/openbsc/doc/regen_doc.sh
@@ -0,0 +1,21 @@
+#!/bin/sh -x
+
+if [ -z "$DOCKER_PLAYGROUND" ]; then
+ echo "You need to set DOCKER_PLAYGROUND"
+ exit 1
+fi
+
+SCRIPT=$(realpath "$0")
+MANUAL_DIR=$(dirname "$SCRIPT")/../../manuals
+
+COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
+
+cd "$DOCKER_PLAYGROUND/scripts" || exit 1
+
+OSMO_NITB_BRANCH=$COMMIT ./regen_doc.sh osmo-nitb 4242 \
+ "$MANUAL_DIR/OsmoNITB/chapters/counters_generated.adoc" \
+ "$MANUAL_DIR/OsmoNITB/vty/nitb_vty_reference.xml"
+
+#OSMO_BSCNAT_BRANCH=$COMMIT ./regen_doc.sh osmo-bscnat 4244 \
+# "$MANUAL_DIR/OsmoBSCNAT/chapters/counters_generated.adoc" \
+# "$MANUAL_DIR/OsmoBSCNAT/vty/nat_vty_reference.xml"
--
To view, visit https://gerrit.osmocom.org/c/openbsc/+/14528
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Change-Id: I3e6e6603300d2d7f6221720fa7ce35b3a6aa0b7a
Gerrit-Change-Number: 14528
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
Change in ...docker-playground[master]: osmo-nitb-master: Add default config file for osmo-bsc_nat
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/14526 Change subject: osmo-nitb-master: Add default config file for osmo-bsc_nat .. osmo-nitb-master: Add default config file for osmo-bsc_nat Change-Id: I44bb395009582f5e1399f277e15203553c2dcf78 Related: OS#1700 --- M osmo-nitb-master/Dockerfile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/26/14526/1 diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index c7fb008..3e20ec8 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -42,6 +42,8 @@ VOLUME /data COPY openbsc.cfg /data/openbsc.cfg +COPY osmo-bsc-nat.cfg /data/osmo-bsc-nat.cfg +COPY bscs.config /data/bscs.config WORKDIR/data CMD["/usr/local/bin/osmo-nitb"] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I44bb395009582f5e1399f277e15203553c2dcf78 Gerrit-Change-Number: 14526 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
Change in ...docker-playground[master]: regen_doc.sh: Add optional parameter to customize docker execution
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/14527
Change subject: regen_doc.sh: Add optional parameter to customize docker
execution
..
regen_doc.sh: Add optional parameter to customize docker execution
The osmo-nitb-master image can run not only osmo-nitb, but also
osmo-bsc_nat. In that case we can't use the default command from
Dockerfile, but should provide our own. This argument makes it possible
to do so.
Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c
Related: OS#1700
---
M scripts/regen_doc.sh
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/27/14527/1
diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh
index 7c7529f..5327ae8 100755
--- a/scripts/regen_doc.sh
+++ b/scripts/regen_doc.sh
@@ -6,6 +6,7 @@
PORT="$2"
COUNTERFILE="$3"
VTYFILE="$4"
+DOCKER_EXTRA="$5"
IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
if [ -z "$OSMO_INTERACT_VTY" ]; then
@@ -23,7 +24,8 @@
docker run --rm --network ${NET_NAME} --ip ${IP_ADDR} \
--name ${BUILD_TAG}-${CONTAINERNAME} -d \
- ${REPO_USER}/${CONTAINERNAME}
+ ${REPO_USER}/${CONTAINERNAME} \
+ ${DOCKER_EXTRA}
}
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14527
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I52c3cb2cdcfb143e71ac2c1aa40bb466e41a0f5c
Gerrit-Change-Number: 14527
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: libvlr/vlr.c: do not expire subscribers if periodic LU is disabled
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14525 ) Change subject: libvlr/vlr.c: do not expire subscribers if periodic LU is disabled .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I2ead2241a3394dbdd5417f4554190df3fd698af2 Gerrit-Change-Number: 14525 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 19 Jun 2019 11:13:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: manuals: Add counter documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14524 ) Change subject: manuals: Add counter documentation .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/14524/1/doc/manuals/chapters/counters_generated.adoc File doc/manuals/chapters/counters_generated.adoc: https://gerrit.osmocom.org/#/c/14524/1/doc/manuals/chapters/counters_generated.adoc@9 PS1, Line 9: .e1inp - E1 Input subsystem Is there an extra whitespace at the end of the line? probably something we want to fix in code. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I994ad6aae7f409e0f15ff1d388127e16243b378a Gerrit-Change-Number: 14524 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 11:10:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: manuals: Update vty documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14523 ) Change subject: manuals: Update vty documentation .. Patch Set 2: > Patch Set 1: > > The VTY docs are significantly newer now (~3 years) - however they don't > contain any commands that are specific to any "real" BTS. The previous > documentation probably contained commands for osmo-bts-sysmo. > > Ideally we should generate the VTY documentation (and maybe also counters) > for each osmo-bts-*, but I don't think we can even run osmo-bts-sysmo or > others in docker since they expect dsp/fpga to be present. I think we should keep those in a separate .xml file (probably one per bts type) and update them manually over time (shouldn't be a lot of them). -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icc0c96d173f31f2eb5fcb6385525a17f94ead852 Gerrit-Change-Number: 14523 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 11:08:41 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bts[master]: manuals: Add script to regenerate counter/vty documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14522 ) Change subject: manuals: Add script to regenerate counter/vty documentation .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idebb099b69924d6212db119f7a2f2861d4150d7e Gerrit-Change-Number: 14522 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 11:06:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: manuals: Update VTY documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/14521 ) Change subject: manuals: Update VTY documentation .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/14521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4a5da9b2b1caa625754383b0f9a180e7503bc60e Gerrit-Change-Number: 14521 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 11:05:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmo-sccp[master]: manuals: Add script to regenerate vty/counter documentation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/14518 ) Change subject: manuals: Add script to regenerate vty/counter documentation .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/14518 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I9978d04fec68d6a8e17caa3c88c1020cf3a348ac Gerrit-Change-Number: 14518 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 19 Jun 2019 11:04:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
