Change in ...osmo-hlr[master]: db_test: set timezone to work around mktime bug
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14351 ) Change subject: db_test: set timezone to work around mktime bug .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ic8080ba1914bb364169ab0c563b132a4ab9a9aab Gerrit-Change-Number: 14351 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 03 Jun 2019 10:08:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ggsn[master]: ggsn: vty: Require ggsn param in cmd
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14298 ) Change subject: ggsn: vty: Require ggsn param in cmd .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/14298/2/ggsn/ggsn_vty.c File ggsn/ggsn_vty.c: https://gerrit.osmocom.org/#/c/14298/2/ggsn/ggsn_vty.c@767 PS2, Line 767: ggsn NAME > I think we should add a hidden / deprecated alias, because this change breaks > backward compatibility […] Indeed it does, but this type of command is not expected to be in VTY cfg files, since it's used to show information, and we don't use it in any TTCN3 test. So it does make sense to me in this case to make more mess in the code by adding a global ggsn variable and assign it to first created ggsn. Still, it seems I need to update doc/manuals/vty/ggsn_vty_reference.xml (first find how to do it). -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8357e20076348c8ded5e9f5b8e7252566b0fbfea Gerrit-Change-Number: 14298 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 03 Jun 2019 10:44:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-msc: Enable extended-timestamp in VTY cfg
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/14353 Change subject: ttcn3-msc: Enable extended-timestamp in VTY cfg .. ttcn3-msc: Enable extended-timestamp in VTY cfg Having extended-timestamp allows for easier matching between osmo-*.log files and pcap traces. Change-Id: I98cdc0adc24edc966d5648d2c215c6ad7c749209 --- M ttcn3-msc-test/osmo-msc.cfg M ttcn3-msc-test/osmo-stp.cfg 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/14353/1 diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index d19f039..db2029c 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -7,6 +7,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level all everything logging level rll notice logging level cc debug diff --git a/ttcn3-msc-test/osmo-stp.cfg b/ttcn3-msc-test/osmo-stp.cfg index a2a6210..cefaef1 100644 --- a/ttcn3-msc-test/osmo-stp.cfg +++ b/ttcn3-msc-test/osmo-stp.cfg @@ -7,6 +7,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level all everything logging level lglobal notice logging level llapd notice -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I98cdc0adc24edc966d5648d2c215c6ad7c749209 Gerrit-Change-Number: 14353 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: msc: Fix IU tests timing out due to explicit CM ServiceAccept not recvd
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14354
Change subject: msc: Fix IU tests timing out due to explicit CM ServiceAccept
not recvd
..
msc: Fix IU tests timing out due to explicit CM ServiceAccept not recvd
Even if chipering it not enabled, osmo-msc still sends a
SecurityModeCommand to use IntegrityProtection, and as a result osmo-msc
assumes implicit ACCEPT in all UTRAN CM service requests.
Fixes: OS#3991
Change-Id: Ida91f907dd6dfae68cbc63752ddc6f2948792689
---
M msc/BSC_ConnectionHandler.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/54/14354/1
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index c1114a6..b5dbb87 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -359,7 +359,7 @@
f_cl3_or_initial_ue(l3_info);
f_mm_common();
- if (g_pars.net.expect_ciph) {
+ if (g_pars.net.expect_ciph or not g_pars.ran_is_geran) {
/* implicit CM SERVICE ACCEPT? */
} else {
if (etype != EST_TYPE_PAG_RESP) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14354
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: Ida91f907dd6dfae68cbc63752ddc6f2948792689
Gerrit-Change-Number: 14354
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...docker-playground[master]: ttcn3-*: Enable extended-timestamp in VTY cfg
Hello Harald Welte, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/14353 to look at the new patch set (#2). Change subject: ttcn3-*: Enable extended-timestamp in VTY cfg .. ttcn3-*: Enable extended-timestamp in VTY cfg Having extended-timestamp allows for easier matching between osmo-*.log files and pcap traces. Change-Id: I98cdc0adc24edc966d5648d2c215c6ad7c749209 --- M ttcn3-bsc-test/osmo-stp.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg M ttcn3-bts-test/osmo-bsc.cfg M ttcn3-ggsn-test/osmo-ggsn.cfg M ttcn3-mgw-test/osmo-mgw.cfg M ttcn3-msc-test/osmo-msc.cfg M ttcn3-msc-test/osmo-stp.cfg M ttcn3-sgsn-test/osmo-sgsn.cfg M ttcn3-sip-test/osmo-sip-connector.cfg 9 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/14353/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I98cdc0adc24edc966d5648d2c215c6ad7c749209 Gerrit-Change-Number: 14353 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: db: Fix call to mempcy with NULL src ptr
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/14355
Change subject: db: Fix call to mempcy with NULL src ptr
..
db: Fix call to mempcy with NULL src ptr
Catched by ASan on db_sms_test unit test:
DDB NOTICE test_db_sms_get('Empty TP-UD'): osmo-msc/src/libmsc/db.c:796:2:
runtime error: null pointer passed as argument 2, which is declared to never be
null
That happens on empty PDU because dbi_result_get_binary returns NULL,
and sms->user_data_len is 0, so it's harmless but we can avoid calling
mempcy and make ASan happy.
Change-Id: I545967464c406348b8505d1729213cfb4afcd3e2
---
M src/libmsc/db.c
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/55/14355/1
diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index add6304..e3995a6 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -793,7 +793,8 @@
user_data = dbi_result_get_binary(result, "user_data");
if (sms->user_data_len > sizeof(sms->user_data))
sms->user_data_len = (uint8_t) sizeof(sms->user_data);
- memcpy(sms->user_data, user_data, sms->user_data_len);
+ if (user_data)
+ memcpy(sms->user_data, user_data, sms->user_data_len);
text = dbi_result_get_string(result, "text");
if (text)
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14355
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I545967464c406348b8505d1729213cfb4afcd3e2
Gerrit-Change-Number: 14355
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-msc[master]: db_sms_test: Remove libdbi expected driver load errors
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/14356
Change subject: db_sms_test: Remove libdbi expected driver load errors
..
db_sms_test: Remove libdbi expected driver load errors
Newer versions of libdbi print to stderr unconditionally when trying to
load drivers from /usr/lib/dbd. This makes test output to change
depending on host/distro set up (installed modules).
Let's get those messages out to make it easier for people having tests
pass.
Change-Id: I06dfdc5a7415a4d3b34a3b25f11c8abda1a63f92
---
M tests/db_sms/db_sms_test.err
M tests/db_sms/db_sms_test.ok
M tests/testsuite.at
3 files changed, 76 insertions(+), 76 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/56/14356/1
diff --git a/tests/db_sms/db_sms_test.err b/tests/db_sms/db_sms_test.err
index e0a329d..e69de29 100644
--- a/tests/db_sms/db_sms_test.err
+++ b/tests/db_sms/db_sms_test.err
@@ -1,75 +0,0 @@
-DDB DEBUG Init a new database
-DDB DEBUG Init complete
-DDB INFO Testing db_sms_store()...
-DDB NOTICE test_db_sms_store('Regular MO SMS'): success, as expected
-DDB NOTICE test_db_sms_store('Regular MT SMS'): success, as expected
-DDB NOTICE test_db_sms_store('Complete TP-UD (160 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('Complete TP-UD (140 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('TP-UD buffer overflow (UDH-Length >
UD-Length)'): success, as expected
-DDB NOTICE test_db_sms_store('Truncated TP-UD (200 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('Truncated TP-UD (255 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('Same MSISDN #1'): success, as expected
-DDB NOTICE test_db_sms_store('Same MSISDN #2'): success, as expected
-DDB NOTICE test_db_sms_store('Expired SMS'): success, as expected
-DDB NOTICE test_db_sms_store('Empty TP-UD'): success, as expected
-DDB INFO Testing db_sms_get()...
-DDB NOTICE test_db_sms_get('Regular MO SMS'): success, as expected
-DDB NOTICE verify_sms('Regular MO SMS'): match
-DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected
-DDB NOTICE verify_sms('Regular MT SMS'): match
-DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-65/256)
-DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'):
TP-User-Data mismatch (diff=-66/256)
-DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'):
success, as expected
-DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match
-DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-65/256)
-DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'):
TP-User-Data mismatch (diff=-16896/256)
-DDB NOTICE test_db_sms_get('Same MSISDN #1'): success, as expected
-DDB NOTICE verify_sms('Same MSISDN #1'): match
-DDB NOTICE test_db_sms_get('Same MSISDN #2'): success, as expected
-DDB NOTICE verify_sms('Same MSISDN #2'): match
-DDB NOTICE test_db_sms_get('Expired SMS'): success, as expected
-DDB NOTICE verify_sms('Expired SMS'): match
-DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
-DDB NOTICE verify_sms('Empty TP-UD'): match
-DDB INFO Testing db_sms_get_next_unsent() and db_sms_mark_delivered()...
-DDB NOTICE db_sms_get_next_unsent(#1): found
-DDB NOTICE verify_sms('Regular MO SMS'): match
-DDB NOTICE db_sms_get_next_unsent(#2): found
-DDB NOTICE verify_sms('Regular MT SMS'): match
-DDB DEBUG Marking #1 as delivered: rc=0
-DDB DEBUG Marking #2 as delivered: rc=0
-DDB NOTICE db_sms_get_next_unsent(starting from #1): found
-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-65/256)
-DDB INFO Testing db_sms_delete_sent_message_by_id()...
-DDB NOTICE db_sms_delete_sent_message_by_id(#1, sent): rc=0
-DDB NOTICE db_sms_delete_sent_message_by_id(#3, not sent): rc=0
-DDB INFO Testing db_sms_delete_by_msisdn()...
-DDB NOTICE db_sms_delete_by_msisdn('72631'): rc=0
-DDB INFO Testing db_sms_delete_oldest_expired_
Change in ...osmo-msc[master]: db_sms_test: Do not print exact memcmp result
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/14357
Change subject: db_sms_test: Do not print exact memcmp result
..
db_sms_test: Do not print exact memcmp result
man memcp doesn't define exact values for returned integer, it only
specifices a meaning for the sign of it.
So it happens that different versions/implementations actually return
different values when this test is run, making it fail.
Let's simply verify only the sign of the returned value.
Change-Id: I771fb8f4fc56f337b16561d005ff1803a386d1c6
---
M tests/db_sms/db_sms_test.c
M tests/db_sms/db_sms_test.ok
2 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/14357/1
diff --git a/tests/db_sms/db_sms_test.c b/tests/db_sms/db_sms_test.c
index a97f7c7..a204ab1 100644
--- a/tests/db_sms/db_sms_test.c
+++ b/tests/db_sms/db_sms_test.c
@@ -358,7 +358,7 @@
sizeof(sms->user_data));
if (rc) {
LOGPC(DDB, LOGL_ERROR, "TP-User-Data mismatch (diff=%d/%zu)\n",
- rc, sizeof(sms->user_data));
+ rc > 0 ? 1 : -1, sizeof(sms->user_data));
return -EINVAL;
}
@@ -366,7 +366,7 @@
rc = strncmp(sms->text, test->sms.text, sizeof(sms->text));
if (rc) {
LOGPC(DDB, LOGL_ERROR, "TP-User-Data (text) mismatch
(diff=%d/%zu)\n",
- rc, sizeof(sms->text));
+ rc > 0 ? 1 : -1, sizeof(sms->text));
return -EINVAL;
}
diff --git a/tests/db_sms/db_sms_test.ok b/tests/db_sms/db_sms_test.ok
index e0a329d..4722a92 100644
--- a/tests/db_sms/db_sms_test.ok
+++ b/tests/db_sms/db_sms_test.ok
@@ -18,15 +18,15 @@
DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected
DDB NOTICE verify_sms('Regular MT SMS'): match
DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-65/256)
+DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-1/256)
DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'):
TP-User-Data mismatch (diff=-66/256)
+DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'):
TP-User-Data mismatch (diff=-1/256)
DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'):
success, as expected
DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match
DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-65/256)
+DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-1/256)
DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'):
TP-User-Data mismatch (diff=-16896/256)
+DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'):
TP-User-Data mismatch (diff=-1/256)
DDB NOTICE test_db_sms_get('Same MSISDN #1'): success, as expected
DDB NOTICE verify_sms('Same MSISDN #1'): match
DDB NOTICE test_db_sms_get('Same MSISDN #2'): success, as expected
@@ -43,7 +43,7 @@
DDB DEBUG Marking #1 as delivered: rc=0
DDB DEBUG Marking #2 as delivered: rc=0
DDB NOTICE db_sms_get_next_unsent(starting from #1): found
-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-65/256)
+DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-1/256)
DDB INFO Testing db_sms_delete_sent_message_by_id()...
DDB NOTICE db_sms_delete_sent_message_by_id(#1, sent): rc=0
DDB NOTICE db_sms_delete_sent_message_by_id(#3, not sent): rc=0
@@ -57,15 +57,15 @@
DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected
DDB NOTICE verify_sms('Regular MT SMS'): match
DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-65/256)
+DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch (diff=-1/256)
DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8
Change in ...osmo-ggsn[master]: ggsn_vty_reference.xml: Update from last code changes
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14358 Change subject: ggsn_vty_reference.xml: Update from last code changes .. ggsn_vty_reference.xml: Update from last code changes Change-Id: I5de2e5223e4532bbbec77b928fbdecb57ef2bca7 --- M doc/manuals/vty/ggsn_vty_reference.xml 1 file changed, 52 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/58/14358/1 diff --git a/doc/manuals/vty/ggsn_vty_reference.xml b/doc/manuals/vty/ggsn_vty_reference.xml index 7460026..a226f8f 100644 --- a/doc/manuals/vty/ggsn_vty_reference.xml +++ b/doc/manuals/vty/ggsn_vty_reference.xml @@ -187,7 +187,7 @@ - + @@ -214,6 +214,7 @@ + @@ -332,14 +333,22 @@ - + - - + + + + + + + + + + @@ -351,6 +360,16 @@ + + + + + + + + + + @@ -526,7 +545,7 @@ - + @@ -553,6 +572,7 @@ + @@ -671,14 +691,22 @@ - + - - + + + + + + + + + + @@ -690,6 +718,16 @@ + + + + + + + + + + @@ -821,7 +859,8 @@ - + + @@ -1020,7 +1059,7 @@ - + @@ -1047,6 +1086,7 @@ + @@ -1169,10 +1209,11 @@ - + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14358 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I5de2e5223e4532bbbec77b928fbdecb57ef2bca7 Gerrit-Change-Number: 14358 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-ggsn[master]: ggsn: vty: Require ggsn param in cmd
Hello fixeria, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14298 to look at the new patch set (#3). Change subject: ggsn: vty: Require ggsn param in cmd .. ggsn: vty: Require ggsn param in cmd Other similar commands already do it. This way we also get rid of deprecated APIs, supporting search when more than one GSN is set up. Related: OS#2873 Change-Id: I8357e20076348c8ded5e9f5b8e7252566b0fbfea --- M doc/manuals/vty/ggsn_vty_reference.xml M ggsn/ggsn_vty.c 2 files changed, 22 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/98/14298/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8357e20076348c8ded5e9f5b8e7252566b0fbfea Gerrit-Change-Number: 14298 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...docker-playground[master]: ttcn3-*: Enable extended-timestamp in VTY cfg
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14353 ) Change subject: ttcn3-*: Enable extended-timestamp in VTY cfg .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I98cdc0adc24edc966d5648d2c215c6ad7c749209 Gerrit-Change-Number: 14353 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 08:45:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: ttcn3-*: Enable extended-timestamp in VTY cfg
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/14353 ) Change subject: ttcn3-*: Enable extended-timestamp in VTY cfg .. ttcn3-*: Enable extended-timestamp in VTY cfg Having extended-timestamp allows for easier matching between osmo-*.log files and pcap traces. Change-Id: I98cdc0adc24edc966d5648d2c215c6ad7c749209 --- M ttcn3-bsc-test/osmo-stp.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg M ttcn3-bts-test/osmo-bsc.cfg M ttcn3-ggsn-test/osmo-ggsn.cfg M ttcn3-mgw-test/osmo-mgw.cfg M ttcn3-msc-test/osmo-msc.cfg M ttcn3-msc-test/osmo-stp.cfg M ttcn3-sgsn-test/osmo-sgsn.cfg M ttcn3-sip-test/osmo-sip-connector.cfg 9 files changed, 10 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved pespin: Verified diff --git a/ttcn3-bsc-test/osmo-stp.cfg b/ttcn3-bsc-test/osmo-stp.cfg index 0f25f0f..7cee48b 100644 --- a/ttcn3-bsc-test/osmo-stp.cfg +++ b/ttcn3-bsc-test/osmo-stp.cfg @@ -7,6 +7,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level all everything logging level lglobal notice logging level llapd notice diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 49855d2..3f29361 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -8,6 +8,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level all everything logging level rll notice logging level cc notice diff --git a/ttcn3-bts-test/osmo-bsc.cfg b/ttcn3-bts-test/osmo-bsc.cfg index e4edf50..e98cc57 100644 --- a/ttcn3-bts-test/osmo-bsc.cfg +++ b/ttcn3-bts-test/osmo-bsc.cfg @@ -8,6 +8,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging print file 1 logging level all everything logging level rll info diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn.cfg index 097c968..11a2309 100644 --- a/ttcn3-ggsn-test/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn.cfg @@ -7,6 +7,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level ip info logging level tun info logging level ggsn info diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index 7b0094f..8158860 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -6,7 +6,8 @@ logging filter all 1 logging color 1 logging print category 1 - logging timestamp 0 + logging timestamp 1 + logging print extended-timestamp 1 logging level all everything logging level rtp notice logging level lglobal notice diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg index d19f039..db2029c 100644 --- a/ttcn3-msc-test/osmo-msc.cfg +++ b/ttcn3-msc-test/osmo-msc.cfg @@ -7,6 +7,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level all everything logging level rll notice logging level cc debug diff --git a/ttcn3-msc-test/osmo-stp.cfg b/ttcn3-msc-test/osmo-stp.cfg index a2a6210..cefaef1 100644 --- a/ttcn3-msc-test/osmo-stp.cfg +++ b/ttcn3-msc-test/osmo-stp.cfg @@ -7,6 +7,7 @@ logging color 0 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging level all everything logging level lglobal notice logging level llapd notice diff --git a/ttcn3-sgsn-test/osmo-sgsn.cfg b/ttcn3-sgsn-test/osmo-sgsn.cfg index 72ca46d..37f4ed8 100644 --- a/ttcn3-sgsn-test/osmo-sgsn.cfg +++ b/ttcn3-sgsn-test/osmo-sgsn.cfg @@ -7,6 +7,7 @@ logging color 1 logging print category 1 logging timestamp 1 + logging print extended-timestamp 1 logging print file 1 logging level all everything logging level mm debug diff --git a/ttcn3-sip-test/osmo-sip-connector.cfg b/ttcn3-sip-test/osmo-sip-connector.cfg index 1834325..5df7468 100644 --- a/ttcn3-sip-test/osmo-sip-connector.cfg +++ b/ttcn3-sip-test/osmo-sip-connector.cfg @@ -7,6 +7,7 @@ logging color 0 logging print category 1 logging timestamp 0 + logging print extended-timestamp 1 logging print file basename logging level all everything logging level sip debug -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I98cdc0adc24edc966d5648d2c215c6ad7c749209 Gerrit-Change-Number: 14353 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-msc[master]: db_sms_test: Remove libdbi expected driver load errors
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-msc/+/14356 )
Change subject: db_sms_test: Remove libdbi expected driver load errors
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/#/c/14356/1/tests/testsuite.at
File tests/testsuite.at:
https://gerrit.osmocom.org/#/c/14356/1/tests/testsuite.at@23
PS1, Line 23: 2>&1
> nice find!
autotest doesn't seem to like it. I changed the line to:
AT_CHECK([$abs_top_builddir/tests/db_sms/db_sms_test 2> >(grep -v "Failed to
load driver")], [], [expout], [experr])
(I know it's not exactly the same I had before, just a simplified form)
But then running tests fail:
"""
3: db_sms_test
osmo-msc/tests/testsuite.dir/at-groups/3/test-source: line 14: syntax error
near unexpected token `>'
osmo-msc/tests/testsuite.dir/at-groups/3/test-source: line 14: `(
$at_check_trace; $abs_top_builddir/tests/db_sms/db_sms_test 2> >(grep -v
"Failed to load driver")'
testsuite: WARNING: unable to parse test group: 3
testsuite: WARNING: A failure happened in a test group before any test could be
testsuite: WARNING: run. This means that test suite is improperly designed.
Please
testsuite: WARNING: report this failure to .
FAILED (testsuite.at:19)
"""
It looks like it doesn't like having parentheses in there. I tried scaping them
wiht "\(", but didn't work.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14356
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I06dfdc5a7415a4d3b34a3b25f11c8abda1a63f92
Gerrit-Change-Number: 14356
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-CC: Harald Welte
Gerrit-CC: fixeria
Gerrit-Comment-Date: Tue, 04 Jun 2019 09:08:35 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria
Comment-In-Reply-To: Harald Welte
Gerrit-MessageType: comment
Change in ...osmo-ggsn[master]: gtp: Replace old pdp APIs with new ones with multi-gsn support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 ) Change subject: gtp: Replace old pdp APIs with new ones with multi-gsn support .. Patch Set 2: > Patch Set 2: > > this is about replacing API usage / API calls, right? It's not changing the > actual API implementation? Yes indeed, I prefered splitting into different commits, since anyway I keep backwards compatibility. So first commit adds new APIs (and change implementation of old ones). Then for each user of the API, I add a commit with changes to move to use the new API (libgtp, osmo-ggsn, sgsnemu, osmo-sgsn). -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa Gerrit-Change-Number: 14297 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 09:15:59 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: db_sms_test: Do not print exact memcmp result
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/14357 to look at the new patch set (#2). Change subject: db_sms_test: Do not print exact memcmp result .. db_sms_test: Do not print exact memcmp result man memcp doesn't define exact values for returned integer, it only specifices a meaning for the sign of it. So it happens that different versions/implementations actually return different values when this test is run, making it fail. Let's simply drop that info from logs since anyways it's not useful. Change-Id: I771fb8f4fc56f337b16561d005ff1803a386d1c6 --- M tests/db_sms/db_sms_test.c M tests/db_sms/db_sms_test.err 2 files changed, 11 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/14357/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I771fb8f4fc56f337b16561d005ff1803a386d1c6 Gerrit-Change-Number: 14357 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: db_sms_test: Remove libdbi expected driver load errors
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/14362
Change subject: db_sms_test: Remove libdbi expected driver load errors
..
db_sms_test: Remove libdbi expected driver load errors
Newer versions of libdbi print to stderr unconditionally when trying to
load drivers from /usr/lib/dbd. This makes test output to change
depending on host/distro set up (installed modules).
Let's get those messages out to make it easier for people having tests
pass.
We swap stderr/stdout instead of mixing to avoud future possible race
conditions if both get content writen into them.
Change-Id: Iec78826d28435f464be22e81b3776a6ae8326d59
---
M tests/db_sms/db_sms_test.err
M tests/db_sms/db_sms_test.ok
M tests/testsuite.at
3 files changed, 77 insertions(+), 76 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/62/14362/1
diff --git a/tests/db_sms/db_sms_test.err b/tests/db_sms/db_sms_test.err
index c61b1f4..e69de29 100644
--- a/tests/db_sms/db_sms_test.err
+++ b/tests/db_sms/db_sms_test.err
@@ -1,75 +0,0 @@
-DDB DEBUG Init a new database
-DDB DEBUG Init complete
-DDB INFO Testing db_sms_store()...
-DDB NOTICE test_db_sms_store('Regular MO SMS'): success, as expected
-DDB NOTICE test_db_sms_store('Regular MT SMS'): success, as expected
-DDB NOTICE test_db_sms_store('Complete TP-UD (160 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('Complete TP-UD (140 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('TP-UD buffer overflow (UDH-Length >
UD-Length)'): success, as expected
-DDB NOTICE test_db_sms_store('Truncated TP-UD (200 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('Truncated TP-UD (255 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('Same MSISDN #1'): success, as expected
-DDB NOTICE test_db_sms_store('Same MSISDN #2'): success, as expected
-DDB NOTICE test_db_sms_store('Expired SMS'): success, as expected
-DDB NOTICE test_db_sms_store('Empty TP-UD'): success, as expected
-DDB INFO Testing db_sms_get()...
-DDB NOTICE test_db_sms_get('Regular MO SMS'): success, as expected
-DDB NOTICE verify_sms('Regular MO SMS'): match
-DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected
-DDB NOTICE verify_sms('Regular MT SMS'): match
-DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch
-DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'):
TP-User-Data mismatch
-DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'):
success, as expected
-DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match
-DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'):
TP-User-Data mismatch
-DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'):
TP-User-Data mismatch
-DDB NOTICE test_db_sms_get('Same MSISDN #1'): success, as expected
-DDB NOTICE verify_sms('Same MSISDN #1'): match
-DDB NOTICE test_db_sms_get('Same MSISDN #2'): success, as expected
-DDB NOTICE verify_sms('Same MSISDN #2'): match
-DDB NOTICE test_db_sms_get('Expired SMS'): success, as expected
-DDB NOTICE verify_sms('Expired SMS'): match
-DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
-DDB NOTICE verify_sms('Empty TP-UD'): match
-DDB INFO Testing db_sms_get_next_unsent() and db_sms_mark_delivered()...
-DDB NOTICE db_sms_get_next_unsent(#1): found
-DDB NOTICE verify_sms('Regular MO SMS'): match
-DDB NOTICE db_sms_get_next_unsent(#2): found
-DDB NOTICE verify_sms('Regular MT SMS'): match
-DDB DEBUG Marking #1 as delivered: rc=0
-DDB DEBUG Marking #2 as delivered: rc=0
-DDB NOTICE db_sms_get_next_unsent(starting from #1): found
-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch
-DDB INFO Testing db_sms_delete_sent_message_by_id()...
-DDB NOTICE db_sms_delete_sent_message_by_id(#1, sent): rc=0
-DDB NOTICE db_sms_delete_sent_message_by_id(#3, not sent): rc=0
-DDB INFO Testing db_sms_delete_by_msisdn()...
-DDB NOTICE db_sms_delete_by_msisdn('72631'): rc
Change in ...osmo-hlr[master]: db_hlr: zero-initialize "struct tm"
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14364 ) Change subject: db_hlr: zero-initialize "struct tm" .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iebbbe42fc5cd43324206d9433ede67b39251389c Gerrit-Change-Number: 14364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 10:46:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Add rate_ctr support to store/retrieve SDR errors through VTY
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14167 ) Change subject: Add rate_ctr support to store/retrieve SDR errors through VTY .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14167/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/#/c/14167/1//COMMIT_MSG@18 PS1, Line 18:device:rx_underruns: 0 (0/s 0/m 0/h 0/d) Number of Rx underruns : device:rx_overruns: 0 (0/s 0/m 0/h 0/d) Number of Rx overruns > do we have a clear definition of what those are? I think the terminology is > not entirely obvious. […] Rx underruns exist in LimeSuite. They are generated in Streamer::ReceivePacketsLoop() during read of buffers from FPGA. So bytes read is expected to be always a multiple of FPGA packet buffer. In case that doesn't happen, underrun is increased. Rx overrun happens indeed because it took too much time for App to read and LimeSuite cannot write all recvd bytes to internal buffers of the stream. Tx underflow: If for some reason not enough data is present on LimeSuite internal buffers when writing to FPGA. Tx overflow: If not all bytes willing to be sent by LimeSuite could end up inside the FPGA (due to its buffer being too full, or amount of data willing to be set being to big). And btw, while looking at LimeSuite code, I also found out overrun/underrun values are reset every time LMS_GetStreamStatus() are called. I created a ticket upstream to get it documented properly: https://github.com/myriadrf/LimeSuite/issues/265 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I78b158141697e5714d04db8b9ccc96f31f34f439 Gerrit-Change-Number: 14167 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 04 Jun 2019 14:23:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Harald Welte Gerrit-MessageType: comment
Change in ...osmo-trx[master]: lms: Drop unusued variable masterClockRate
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/14367
Change subject: lms: Drop unusued variable masterClockRate
..
lms: Drop unusued variable masterClockRate
Change-Id: I19192925d008046f474615a0476b52ddee9a9d78
---
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/lms/LMSDevice.h
2 files changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/67/14367/1
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index 910a6e7..7d3ce81 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -36,8 +36,6 @@
using namespace std;
-constexpr double LMSDevice::masterClockRate;
-
#define MAX_ANTENNA_LIST_SIZE 10
#define LMS_SAMPLE_RATE GSMRATE*32
#define GSM_CARRIER_BW 27.0 /* 270kHz */
diff --git a/Transceiver52M/device/lms/LMSDevice.h
b/Transceiver52M/device/lms/LMSDevice.h
index 8b5fe93..9e0944d 100644
--- a/Transceiver52M/device/lms/LMSDevice.h
+++ b/Transceiver52M/device/lms/LMSDevice.h
@@ -42,9 +42,6 @@
class LMSDevice:public RadioDevice {
private:
-
- static constexpr double masterClockRate = 52.0e6;
-
lms_device_t *m_lms_dev;
std::vector m_lms_stream_rx;
std::vector m_lms_stream_tx;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14367
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I19192925d008046f474615a0476b52ddee9a9d78
Gerrit-Change-Number: 14367
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: Rename and move STOP signal from Transceiver to main
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/14366
Change subject: Rename and move STOP signal from Transceiver to main
..
Rename and move STOP signal from Transceiver to main
The callback actually belongs there, since it's the code/thread in main the one
actually in charge of stopping everything. It simplifies current code,
and more important, allows for new clients of this signal to use it.
This callback will also be used in forthcoming commits by code
controlling rate_ctr thresholds to stop the process if the VTY
configured threshold is used.
Change-Id: Id4159e64225c6606fef34a74b24f37c3a071aceb
---
M CommonLibs/osmo_signal.h
M Transceiver52M/Transceiver.cpp
M Transceiver52M/Transceiver.h
M Transceiver52M/osmo-trx.cpp
4 files changed, 9 insertions(+), 24 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/66/14366/1
diff --git a/CommonLibs/osmo_signal.h b/CommonLibs/osmo_signal.h
index 7299171..6ee1bf9 100644
--- a/CommonLibs/osmo_signal.h
+++ b/CommonLibs/osmo_signal.h
@@ -26,13 +26,13 @@
/* Signalling subsystems */
enum signal_subsystems {
- SS_TRANSC,
+ SS_MAIN,
SS_DEVICE,
};
-/* SS_TRANSC signals */
-enum SS_TRANSC {
- S_TRANSC_STOP_REQUIRED, /* Transceiver fatal error, it should be
stopped */
+/* SS_MAIN signals */
+enum SS_MAIN {
+ S_MAIN_STOP_REQUIRED, /* TRX fatal error, it should be stopped */
};
/* SS_DEVICE signals */
diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index 54b9ddd..9c55d02 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -119,7 +119,7 @@
: mBasePort(wBasePort), mLocalAddr(TRXAddress), mRemoteAddr(GSMcoreAddress),
mClockSocket(TRXAddress, wBasePort, GSMcoreAddress, wBasePort + 100),
mTransmitLatency(wTransmitLatency), mRadioInterface(wRadioInterface),
-rssiOffset(wRssiOffset), sig_cbfn(NULL),
+rssiOffset(wRssiOffset),
mSPSTx(tx_sps), mSPSRx(rx_sps), mChans(chans), mEdge(false), mOn(false),
mForceClockInterface(false),
mTxFreq(0.0), mRxFreq(0.0), mTSC(0), mMaxExpectedDelayAB(0),
mMaxExpectedDelayNB(0),
mWriteBurstToDiskMask(0)
@@ -225,17 +225,6 @@
return true;
}
-void Transceiver::setSignalHandler(osmo_signal_cbfn cbfn)
-{
- if (this->sig_cbfn)
-osmo_signal_unregister_handler(SS_TRANSC, this->sig_cbfn, NULL);
-
- if (cbfn) {
-this->sig_cbfn = cbfn;
-osmo_signal_register_handler(SS_TRANSC, this->sig_cbfn, NULL);
- }
-}
-
/*
* Start the transceiver
*
@@ -910,7 +899,7 @@
usleep(10);
} else if (rc < 0) {
LOG(FATAL) << "radio Interface receive failed, requesting stop.";
-osmo_signal_dispatch(SS_TRANSC, S_TRANSC_STOP_REQUIRED, this);
+osmo_signal_dispatch(SS_MAIN, S_MAIN_STOP_REQUIRED, NULL);
} else if (mForceClockInterface || mTransmitDeadlineClock >
mLastClockUpdateTime + GSM::Time(216,0)) {
mForceClockInterface = false;
writeClockInterface();
diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h
index 432e3b4..4614efe 100644
--- a/Transceiver52M/Transceiver.h
+++ b/Transceiver52M/Transceiver.h
@@ -130,8 +130,6 @@
/** accessor for number of channels */
size_t numChans() const { return mChans; };
- void setSignalHandler(osmo_signal_cbfn cbfn);
-
/** Codes for channel combinations */
typedef enum {
FILL, ///< Channel is transmitted, but unused
@@ -181,8 +179,6 @@
double rssiOffset; ///< RSSI to dBm conversion offset
- osmo_signal_cbfn *sig_cbfn; ///< Registered Signal Handler to
announce events.
-
/** modulate and add a burst to the transmit queue */
void addRadioVector(size_t chan, BitVector &bits,
int RSSI, GSM::Time &wTime);
diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp
index a79c26e..05489bd 100644
--- a/Transceiver52M/osmo-trx.cpp
+++ b/Transceiver52M/osmo-trx.cpp
@@ -123,7 +123,7 @@
void *handler_data, void *signal_data)
{
switch (signal) {
- case S_TRANSC_STOP_REQUIRED:
+ case S_MAIN_STOP_REQUIRED:
gshutdown = true;
break;
default:
@@ -152,8 +152,6 @@
return -1;
}
-transceiver->setSignalHandler(transc_sig_cb);
-
for (size_t i = 0; i < trx->cfg.num_chans; i++) {
fifo = radio->receiveFIFO(i);
if (fifo && transceiver->receiveFIFO(fifo, i))
@@ -627,6 +625,7 @@
return EXIT_FAILURE;
}
+ osmo_signal_register_handler(SS_MAIN, transc_sig_cb, NULL);
trx_rate_ctr_init(tall_trx_ctx, g_trx_ctx);
srandom(time(NULL));
@@ -641,5 +640,6 @@
osmo_fd_unregister(&signal_ofd);
osmo_fd_close(&signal_ofd
Change in ...osmo-trx[master]: Add rate_ctr support to store/retrieve SDR errors through VTY
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/14167 to look at the new patch set (#2). Change subject: Add rate_ctr support to store/retrieve SDR errors through VTY .. Add rate_ctr support to store/retrieve SDR errors through VTY Introduce a unified implementation-agnostic interface for radioDevice to signal SDR error counters to upper layers and manage them. This patch only implements counters for osmo-trx-lms (other devices will show all counters unchanged during time). Sample use through VTY: """ OsmoTRX> show rate-counters osmo-trx statistics 0: device:rx_underruns: 0 (0/s 0/m 0/h 0/d) Number of Rx underruns device:rx_overruns: 0 (0/s 0/m 0/h 0/d) Number of Rx overruns device:tx_underruns: 0 (0/s 0/m 0/h 0/d) Number of Tx underruns device:rx_drop_events: 4 (0/s 2/m 3/h 0/d) Number of times Rx samples were dropped by HW device:rx_drop_samples:513 (0/s 196/m 425/h 0/d) Number of Rx samples dropped by HW """ Change-Id: I78b158141697e5714d04db8b9ccc96f31f34f439 --- M CommonLibs/Makefile.am M CommonLibs/osmo_signal.h A CommonLibs/trx_rate_ctr.cpp A CommonLibs/trx_rate_ctr.h M Transceiver52M/device/common/radioDevice.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/osmo-trx.cpp 8 files changed, 262 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/67/14167/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I78b158141697e5714d04db8b9ccc96f31f34f439 Gerrit-Change-Number: 14167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in ...osmo-trx[master]: lms: Fix stream_stats checks with overrun/underrun
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/14368
Change subject: lms: Fix stream_stats checks with overrun/underrun
..
lms: Fix stream_stats checks with overrun/underrun
It was initially thought that underruns/overrun fields were
increasing-over-time values.
However, after reading LimeSuite code, it seems overrun and
underrun fields are actually reset upon every call to
LMS_GetStreamStatus().
Related: osmo-trx.git 928177125654c1e596ec3450a68882c031ebb929
Related: https://github.com/myriadrf/LimeSuite/issues/265
Change-Id: I677232a7b12ee83d26aa34d92f76a91d4b5a63a6
---
M Transceiver52M/device/lms/LMSDevice.cpp
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/68/14368/1
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index 7d3ce81..0253d4c 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -583,23 +583,23 @@
return;
}
- if (status.underrun > m_ctr[chan].rx_underruns) {
+ if (status.underrun) {
changed = true;
*underrun = true;
LOGCHAN(chan, DDEV, ERROR) << "recv Underrun! ("
<< m_ctr[chan].rx_underruns << " -> "
<< status.underrun << ")";
}
- m_ctr[chan].rx_underruns = status.underrun;
+ m_ctr[chan].rx_underruns += status.underrun;
- if (status.overrun > m_ctr[chan].rx_overruns) {
+ if (status.overrun) {
changed = true;
*overrun = true;
LOGCHAN(chan, DDEV, ERROR) << "recv Overrun! ("
<< m_ctr[chan].rx_overruns << " -> "
<< status.overrun << ")";
}
- m_ctr[chan].rx_overruns = status.overrun;
+ m_ctr[chan].rx_overruns += status.overrun;
if (status.droppedPackets) {
changed = true;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14368
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I677232a7b12ee83d26aa34d92f76a91d4b5a63a6
Gerrit-Change-Number: 14368
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: bts-trx: trx_if.c: Introduce logging macro LOGPL1H
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/14373
Change subject: bts-trx: trx_if.c: Introduce logging macro LOGPL1H
..
bts-trx: trx_if.c: Introduce logging macro LOGPL1H
This way we unify format. We take the chance to add related information
to some log messages which were not printing that information (and was
confusing when using more than one phy instance).
Change-Id: I5b17a01638ade9a6c41da73e550d5947fa92f568
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 33 insertions(+), 40 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/14373/1
diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index ec879c7..8d9fedb 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -58,6 +58,8 @@
* socket helper functions
*/
+#define LOGPL1H(l1h, section, lvl, fmt, args...) LOGP(section, lvl, "%s: "
fmt, phy_instance_name(l1h->phy_inst), ##args)
+
/*! convenience wrapper to open socket + fill in osmo_fd */
static int trx_udp_open(void *priv, struct osmo_fd *ofd, const char
*host_local,
uint16_t port_local, const char *host_remote, uint16_t
port_remote,
@@ -155,7 +157,7 @@
len = snprintf(buf, sizeof(buf), "CMD %s%s%s", tcm->cmd,
tcm->params_len ? " ":"", tcm->params);
OSMO_ASSERT(len < sizeof(buf));
- LOGP(DTRX, LOGL_DEBUG, "Sending control '%s' to %s\n", buf,
phy_instance_name(l1h->phy_inst));
+ LOGPL1H(l1h, DTRX, LOGL_DEBUG, "Sending control '%s'\n", buf);
/* send command */
send(l1h->trx_ofd_ctrl.fd, buf, len+1, 0);
@@ -173,8 +175,7 @@
OSMO_ASSERT(!llist_empty(&l1h->trx_ctrl_list));
tcm = llist_entry(l1h->trx_ctrl_list.next, struct trx_ctrl_msg, list);
- LOGP(DTRX, LOGL_NOTICE, "No satisfactory response from transceiver for
%s (CMD %s%s%s)\n",
- phy_instance_name(l1h->phy_inst),
+ LOGPL1H(l1h, DTRX, LOGL_NOTICE, "No satisfactory response from
transceiver(CMD %s%s%s)\n",
tcm->cmd, tcm->params_len ? " ":"", tcm->params);
trx_ctrl_send(l1h);
@@ -208,8 +209,8 @@
if (!transceiver_available &&
!(!strcmp(cmd, "POWEROFF") || !strcmp(cmd, "POWERON"))) {
- LOGP(DTRX, LOGL_ERROR, "CTRL %s ignored: No clock from "
-"transceiver, please fix!\n", cmd);
+ LOGPL1H(l1h, DTRX, LOGL_ERROR, "CTRL %s ignored: No clock from "
+ "transceiver, please fix!\n", cmd);
return -EIO;
}
@@ -241,7 +242,7 @@
if (!pending ||
!(strcmp(tcm->cmd, prev->cmd) == 0 && strcmp(tcm->params,
prev->params) == 0)) {
- LOGP(DTRX, LOGL_INFO, "Enqueuing TRX control command 'CMD
%s%s%s'\n",
+ LOGPL1H(l1h, DTRX, LOGL_INFO, "Enqueuing TRX control command
'CMD %s%s%s'\n",
tcm->cmd, tcm->params_len ? " ":"", tcm->params);
llist_add_tail(&tcm->list, &l1h->trx_ctrl_list);
}
@@ -445,18 +446,16 @@
static int trx_ctrl_rx_rsp_setslot(struct trx_l1h *l1h, struct trx_ctrl_rsp
*rsp)
{
trx_if_cmd_setslot_cb *cb = (trx_if_cmd_setslot_cb*) rsp->cb;
- struct phy_instance *pinst = l1h->phy_inst;
unsigned int tn, ts_type;
if (rsp->status)
- LOGP(DTRX, LOGL_ERROR, "transceiver (%s) SETSLOT failed with
status %d\n",
-phy_instance_name(pinst), rsp->status);
+ LOGPL1H(l1h, DTRX, LOGL_ERROR, "transceiver SETSLOT failed with
status %d\n",
+ rsp->status);
/* Since message was already validated against CMD we sent, we know
format
* of params is: " " */
if (sscanf(rsp->params, "%u %u", &tn, &ts_type) < 2) {
- LOGP(DTRX, LOGL_ERROR, "transceiver (%s) SETSLOT unable to
parse params\n",
-phy_instance_name(pinst));
+ LOGPL1H(l1h, DTRX, LOGL_ERROR, "transceiver SETSLOT unable to
parse params\n");
return -EINVAL;
}
@@ -481,9 +480,9 @@
phy_link_state_set(pinst->phy_link,
PHY_LINK_CONNECTED);
return 0;
} else {
- LOGP(DTRX, LOGL_NOTICE,
-"transceiver (%s) rejected POWERON command (%d),
re-trying in a few seconds\n",
-phy_instance_name(pinst), rsp->status);
+
Change in ...osmo-msc[master]: db_sms_test: Remove libdbi expected driver load errors
pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14356 ) Change subject: db_sms_test: Remove libdbi expected driver load errors .. Abandoned Abandoned in favour of https://gerrit.osmocom.org/c/osmo-msc/+/14362 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I06dfdc5a7415a4d3b34a3b25f11c8abda1a63f92 Gerrit-Change-Number: 14356 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: abandon
Change in ...osmo-ggsn[master]: sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one
Hello fixeria, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14299 to look at the new patch set (#4). Change subject: sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one .. sgsnemu: Replace use of deprecated libgtp API pdp_newpdp with new one Related: OS#2873 Change-Id: I9742b82c382ae2e63f8aff4c5c32e2450059082b --- M sgsnemu/sgsnemu.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/99/14299/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9742b82c382ae2e63f8aff4c5c32e2450059082b Gerrit-Change-Number: 14299 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset
Change in ...osmo-ggsn[master]: gtp: Make use of new libgtp APIs with multi-gsn support
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 to look at the new patch set (#3). Change subject: gtp: Make use of new libgtp APIs with multi-gsn support .. gtp: Make use of new libgtp APIs with multi-gsn support Drop use of deprecated APIs everywhere in libgtp and use the new ones instead. Related: OS#2873 Change-Id: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa --- M gtp/gtp.c 1 file changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/97/14297/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14297 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa Gerrit-Change-Number: 14297 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-bts[master]: bts-trx: trx_if.c: Introduce logging macro LOGPPHI
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/14373 to look at the new patch set (#2). Change subject: bts-trx: trx_if.c: Introduce logging macro LOGPPHI .. bts-trx: trx_if.c: Introduce logging macro LOGPPHI This way we unify format. We take the chance to add related information to some log messages which were not printing that information (and was confusing when using more than one phy instance). Change-Id: I5b17a01638ade9a6c41da73e550d5947fa92f568 --- M include/osmo-bts/phy_link.h M src/osmo-bts-trx/l1_if.c M src/osmo-bts-trx/trx_if.c 3 files changed, 38 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/14373/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b17a01638ade9a6c41da73e550d5947fa92f568 Gerrit-Change-Number: 14373 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-MessageType: newpatchset
Change in ...osmo-sgsn[master]: osmo-sgsn: get rid of OSMO_ASSERT() in 'auth-policy' handler
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14195 ) Change subject: osmo-sgsn: get rid of OSMO_ASSERT() in 'auth-policy' handler .. Patch Set 2: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: If9b0c0d031477ca87786aab5c269d00748e896c8 Gerrit-Change-Number: 14195 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 Jun 2019 09:53:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: osmo-sgsn: get rid of OSMO_ASSERT() in 'auth-policy' handler
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14195 ) Change subject: osmo-sgsn: get rid of OSMO_ASSERT() in 'auth-policy' handler .. Patch Set 2: I created https://osmocom.org/issues/4045 to track this issue and a fix for libosmovty. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: If9b0c0d031477ca87786aab5c269d00748e896c8 Gerrit-Change-Number: 14195 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 Jun 2019 10:24:35 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...libosmocore[master]: vty_transcript_test.vty: add choice auto-complete tests
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14307 ) Change subject: vty_transcript_test.vty: add choice auto-complete tests .. Patch Set 1: Code-Review+2 So IIUC this commit proves the "wrong behavior" through a test, and you'll fix it + check test expectations in next commit. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14307 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I83c3aef813173952641035862c534ef16384780e Gerrit-Change-Number: 14307 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 Jun 2019 11:49:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: debian/control: add missing libdbd-sqlite3 to Build-Depends
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14380 ) Change subject: debian/control: add missing libdbd-sqlite3 to Build-Depends .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice9fb11f5b8a39abecee426d2fadcf62b7ee47c4 Gerrit-Change-Number: 14380 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 Jun 2019 11:50:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: db_sms_test: Remove libdbi expected driver load errors
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-msc/+/14362 )
Change subject: db_sms_test: Remove libdbi expected driver load errors
..
db_sms_test: Remove libdbi expected driver load errors
Newer versions of libdbi print to stderr unconditionally when trying to
load drivers from /usr/lib/dbd. This makes test output to change
depending on host/distro set up (installed modules).
Let's get those messages out to make it easier for people having tests
pass.
We swap stderr/stdout instead of mixing to avoud future possible race
conditions if both get content writen into them.
Change-Id: Iec78826d28435f464be22e81b3776a6ae8326d59
---
M tests/db_sms/db_sms_test.err
M tests/db_sms/db_sms_test.ok
M tests/testsuite.at
3 files changed, 77 insertions(+), 76 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/tests/db_sms/db_sms_test.err b/tests/db_sms/db_sms_test.err
index c61b1f4..e69de29 100644
--- a/tests/db_sms/db_sms_test.err
+++ b/tests/db_sms/db_sms_test.err
@@ -1,75 +0,0 @@
-DDB DEBUG Init a new database
-DDB DEBUG Init complete
-DDB INFO Testing db_sms_store()...
-DDB NOTICE test_db_sms_store('Regular MO SMS'): success, as expected
-DDB NOTICE test_db_sms_store('Regular MT SMS'): success, as expected
-DDB NOTICE test_db_sms_store('Complete TP-UD (160 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('Complete TP-UD (140 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('TP-UD buffer overflow (UDH-Length >
UD-Length)'): success, as expected
-DDB NOTICE test_db_sms_store('Truncated TP-UD (200 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('Truncated TP-UD (255 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE test_db_sms_store('Same MSISDN #1'): success, as expected
-DDB NOTICE test_db_sms_store('Same MSISDN #2'): success, as expected
-DDB NOTICE test_db_sms_store('Expired SMS'): success, as expected
-DDB NOTICE test_db_sms_store('Empty TP-UD'): success, as expected
-DDB INFO Testing db_sms_get()...
-DDB NOTICE test_db_sms_get('Regular MO SMS'): success, as expected
-DDB NOTICE verify_sms('Regular MO SMS'): match
-DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected
-DDB NOTICE verify_sms('Regular MT SMS'): match
-DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch
-DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'):
TP-User-Data mismatch
-DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'):
success, as expected
-DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match
-DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'):
TP-User-Data mismatch
-DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'):
success, as expected
-DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'):
TP-User-Data mismatch
-DDB NOTICE test_db_sms_get('Same MSISDN #1'): success, as expected
-DDB NOTICE verify_sms('Same MSISDN #1'): match
-DDB NOTICE test_db_sms_get('Same MSISDN #2'): success, as expected
-DDB NOTICE verify_sms('Same MSISDN #2'): match
-DDB NOTICE test_db_sms_get('Expired SMS'): success, as expected
-DDB NOTICE verify_sms('Expired SMS'): match
-DDB NOTICE test_db_sms_get('Empty TP-UD'): success, as expected
-DDB NOTICE verify_sms('Empty TP-UD'): match
-DDB INFO Testing db_sms_get_next_unsent() and db_sms_mark_delivered()...
-DDB NOTICE db_sms_get_next_unsent(#1): found
-DDB NOTICE verify_sms('Regular MO SMS'): match
-DDB NOTICE db_sms_get_next_unsent(#2): found
-DDB NOTICE verify_sms('Regular MT SMS'): match
-DDB DEBUG Marking #1 as delivered: rc=0
-DDB DEBUG Marking #2 as delivered: rc=0
-DDB NOTICE db_sms_get_next_unsent(starting from #1): found
-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'):
TP-User-Data mismatch
-DDB INFO Testing db_sms_delete_sent_message_by_id()...
-DDB NOTICE db_sms_delete_sent_message_by_id(#1, sent): rc=0
-DDB NOTICE db_sms_delete_sent_message_by_id(#3, not sent): rc=0
-DDB INFO Testing db_sms_delete_by_msisdn()...
-DDB NOTICE db_sms_delete_by_msisdn('
Change in ...osmo-trx[master]: Add rate_ctr support to store/retrieve SDR errors through VTY
Hello fixeria, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/14167 to look at the new patch set (#3). Change subject: Add rate_ctr support to store/retrieve SDR errors through VTY .. Add rate_ctr support to store/retrieve SDR errors through VTY Introduce a unified implementation-agnostic interface for radioDevice to signal SDR error counters to upper layers and manage them. This patch only implements counters for osmo-trx-lms (other devices will show all counters unchanged during time). Sample use through VTY: """ OsmoTRX> show rate-counters osmo-trx statistics 0: device:rx_underruns: 0 (0/s 0/m 0/h 0/d) Number of Rx underruns device:rx_overruns: 0 (0/s 0/m 0/h 0/d) Number of Rx overruns device:tx_underruns: 0 (0/s 0/m 0/h 0/d) Number of Tx underruns device:rx_drop_events: 4 (0/s 2/m 3/h 0/d) Number of times Rx samples were dropped by HW device:rx_drop_samples:513 (0/s 196/m 425/h 0/d) Number of Rx samples dropped by HW """ Change-Id: I78b158141697e5714d04db8b9ccc96f31f34f439 --- M CommonLibs/Makefile.am M CommonLibs/osmo_signal.h A CommonLibs/trx_rate_ctr.cpp A CommonLibs/trx_rate_ctr.h M Transceiver52M/device/common/radioDevice.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/osmo-trx.cpp 8 files changed, 262 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/67/14167/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I78b158141697e5714d04db8b9ccc96f31f34f439 Gerrit-Change-Number: 14167 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-trx[master]: doc: vty: Update trx_vty_reference.xml
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/14382 Change subject: doc: vty: Update trx_vty_reference.xml .. doc: vty: Update trx_vty_reference.xml Change-Id: I2587cd47ee48e979de447f7a0f4d79bb5fac0592 --- M doc/manuals/vty/trx_vty_reference.xml 1 file changed, 138 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/82/14382/1 diff --git a/doc/manuals/vty/trx_vty_reference.xml b/doc/manuals/vty/trx_vty_reference.xml index ffc642a..d6cd15d 100644 --- a/doc/manuals/vty/trx_vty_reference.xml +++ b/doc/manuals/vty/trx_vty_reference.xml @@ -85,12 +85,6 @@ - - - - - - @@ -181,7 +175,7 @@ - + @@ -189,6 +183,7 @@ + @@ -198,21 +193,14 @@ - - - - - - - - - - + - + + + @@ -231,7 +219,7 @@ - + @@ -239,6 +227,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -312,6 +332,12 @@ + + + + + + enable @@ -365,12 +391,6 @@ - - - - - - @@ -474,7 +494,7 @@ - + @@ -482,6 +502,7 @@ + @@ -491,21 +512,14 @@ - - - - - - - - - - + - + + + @@ -524,7 +538,7 @@ - + @@ -532,6 +546,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -605,6 +651,12 @@ + + + + + + config @@ -910,7 +962,7 @@ - + @@ -918,14 +970,17 @@ + - + - + + + @@ -944,7 +999,7 @@ - + @@ -952,6 +1007,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + config-stats @@ -1035,10 +1122,11 @@ - + + @@ -1146,6 +1234,13 @@ + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I2587cd47ee48e979de447f7a0f4d79bb5fac0592 Gerrit-Change-Number: 14382 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: Rename and move STOP signal from Transceiver to main
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/14366 to look at the new patch set (#2). Change subject: Rename and move STOP signal from Transceiver to main .. Rename and move STOP signal from Transceiver to main The callback actually belongs there, since it's the code/thread in main the one actually in charge of stopping everything. It simplifies current code, and more important, allows for new clients of this signal to use it. This callback will also be used in forthcoming commits by code controlling rate_ctr thresholds to stop the process if the VTY configured threshold is used. Change-Id: Id4159e64225c6606fef34a74b24f37c3a071aceb --- M CommonLibs/osmo_signal.h M Transceiver52M/Transceiver.cpp M Transceiver52M/Transceiver.h M Transceiver52M/osmo-trx.cpp 4 files changed, 9 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/66/14366/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id4159e64225c6606fef34a74b24f37c3a071aceb Gerrit-Change-Number: 14366 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-trx[master]: Add VTY commands to set error ctr thresholds
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14168 ) Change subject: Add VTY commands to set error ctr thresholds .. Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4bcf44dbf064e2e86dfc3b8a2ad18fea76fbd51a Gerrit-Change-Number: 14168 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 06 Jun 2019 10:12:09 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: bsc: Append Osmux Support IE only on AoIP
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14384 Change subject: bsc: Append Osmux Support IE only on AoIP .. bsc: Append Osmux Support IE only on AoIP Since in SCCPlite the BSC-attached MGW is controlled by the MSC, we don't need this kind of signalling. It's only needed for AoIP. Related: OS#2551 Change-Id: I802fc65c593e42aaa7a15cecab7a2f2b77ade3ea --- M src/osmo-bsc/osmo_bsc_sigtran.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/14384/1 diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index 8303c4f..18f269d 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -101,7 +101,7 @@ LOGP(DMSC, LOGL_NOTICE, "Sending RESET to MSC: %s\n", osmo_sccp_addr_name(ss7, &msc->a.msc_addr)); msg = gsm0808_create_reset(); - if (msc->use_osmux != OSMUX_USAGE_OFF) + if (msc_is_aoip(msc) && msc->use_osmux != OSMUX_USAGE_OFF) _gsm0808_extend_announce_osmux(msg); osmo_sccp_tx_unitdata_msg(msc->a.sccp_user, &msc->a.bsc_addr, @@ -120,7 +120,7 @@ LOGP(DMSC, LOGL_NOTICE, "Sending RESET ACK to MSC: %s\n", osmo_sccp_addr_name(ss7, &msc->a.msc_addr)); msg = gsm0808_create_reset_ack(); - if (msc->use_osmux != OSMUX_USAGE_OFF) + if (msc_is_aoip(msc) && msc->use_osmux != OSMUX_USAGE_OFF) _gsm0808_extend_announce_osmux(msg); osmo_sccp_tx_unitdata_msg(msc->a.sccp_user, &msc->a.bsc_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I802fc65c593e42aaa7a15cecab7a2f2b77ade3ea Gerrit-Change-Number: 14384 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-bsc[master]: Introduce msc_is_{sccplite, aoip}() helpers
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/14383
Change subject: Introduce msc_is_{sccplite,aoip}() helpers
..
Introduce msc_is_{sccplite,aoip}() helpers
Having the helper makes it easier to read/find for transport type checks. It
will be ifurther re-used in forthcoming commits.
Change-Id: Ic0ee4c472e29ec3092049e5e23b744395613616d
---
M include/osmocom/bsc/bsc_msc_data.h
M src/osmo-bsc/bsc_subscr_conn_fsm.c
M src/osmo-bsc/osmo_bsc_sigtran.c
3 files changed, 23 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/14383/1
diff --git a/include/osmocom/bsc/bsc_msc_data.h
b/include/osmocom/bsc/bsc_msc_data.h
index 4720845..1f9872a 100644
--- a/include/osmocom/bsc/bsc_msc_data.h
+++ b/include/osmocom/bsc/bsc_msc_data.h
@@ -191,5 +191,25 @@
return (port - base) / 2;
}
+static inline bool msc_is_aoip(const struct bsc_msc_data *msc)
+{
+ switch (msc->a.asp_proto) {
+ case OSMO_SS7_ASP_PROT_SUA:
+ case OSMO_SS7_ASP_PROT_M3UA:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static inline bool msc_is_sccplite(const struct bsc_msc_data *msc)
+{
+ switch (msc->a.asp_proto) {
+ case OSMO_SS7_ASP_PROT_IPA:
+ return true;
+ default:
+ return false;
+ }
+}
#endif
diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c
b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index 87ad567..7b9f912 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -1058,14 +1058,7 @@
if (!conn || !conn->sccp.msc)
return false;
- switch (conn->sccp.msc->a.asp_proto) {
- case OSMO_SS7_ASP_PROT_SUA:
- case OSMO_SS7_ASP_PROT_M3UA:
- return true;
-
- default:
- return false;
- }
+ return msc_is_aoip(conn->sccp.msc);
}
bool gscon_is_sccplite(struct gsm_subscriber_connection *conn)
@@ -1073,11 +1066,5 @@
if (!conn || !conn->sccp.msc)
return false;
- switch (conn->sccp.msc->a.asp_proto) {
- case OSMO_SS7_ASP_PROT_IPA:
- return true;
-
- default:
- return false;
- }
+ return msc_is_sccplite(conn->sccp.msc);
}
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index 5d61c32..8303c4f 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -523,8 +523,7 @@
* an X-Osmo-IGN flag telling osmo-mgw to ignore CallID
mismatches for this endpoint.
* If an explicit VTY command has already indicated whether or
not to send X-Osmo-IGN, do
* not overwrite that setting. */
- if (msc->a.asp_proto == OSMO_SS7_ASP_PROT_IPA
- && !msc->x_osmo_ign_configured)
+ if (msc_is_sccplite(msc) && !msc->x_osmo_ign_configured)
msc->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID;
/* If unset, use default local SCCP address */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14383
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic0ee4c472e29ec3092049e5e23b744395613616d
Gerrit-Change-Number: 14383
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: Add and set transport field for RanOps structure
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386
Change subject: Add and set transport field for RanOps structure
..
Add and set transport field for RanOps structure
This will allow RAN_Emulation to have better knowledge on the protocol
stack in use, and behave differently based on that information.
For intance, forthcoming commit will append OsmuxSupport IE only if
transport is BSSAP AoIP.
Change-Id: Ife62e328af2d3f2475ff93249f2138820c7ddabb
---
M bsc-nat/BSC_MS_ConnectionHandler.ttcn
M bsc-nat/MSC_ConnectionHandler.ttcn
M bsc/MSC_ConnectionHandler.ttcn
M library/RAN_Adapter.ttcnpp
M library/RAN_Emulation.ttcnpp
M msc/BSC_ConnectionHandler.ttcn
6 files changed, 13 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/86/14386/1
diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn
b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
index f9f4db0..7f2ebcd 100644
--- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn
+++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn
@@ -63,7 +63,7 @@
decode_dtap := false,
role_ms := true,
protocol := RAN_PROTOCOL_BSSAP,
- /* Always false. We don't want to enable Osmux signalling in SCCPLite
messages: */
+ transport := BSSAP_TRANSPORT_AoIP,
use_osmux := false,
sccp_addr_local := omit,
sccp_addr_peer := omit
diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn
b/bsc-nat/MSC_ConnectionHandler.ttcn
index 89728b4..c8cb005 100644
--- a/bsc-nat/MSC_ConnectionHandler.ttcn
+++ b/bsc-nat/MSC_ConnectionHandler.ttcn
@@ -69,6 +69,7 @@
decode_dtap := false,
role_ms := false,
protocol := RAN_PROTOCOL_BSSAP,
+ transport := BSSAP_TRANSPORT_AoIP,
use_osmux := false,
sccp_addr_local := omit,
sccp_addr_peer := omit
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index dbba135..3cc8f8a 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -394,6 +394,7 @@
decode_dtap := false,
role_ms := false,
protocol := RAN_PROTOCOL_BSSAP,
+ transport := BSSAP_TRANSPORT_AoIP,
use_osmux := false,
sccp_addr_local := omit,
sccp_addr_peer := omit
diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index 30a1a9e..862921e 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -52,13 +52,6 @@
RAN_Emulation_CT vc_RAN
}
-type enumerated RAN_Transport {
- BSSAP_TRANSPORT_AoIP, /* 3GPP AoIP: SCCP over M3UA over SCTP */
- BSSAP_TRANSPORT_SCCPlite_SERVER, /* SCCPlite: SCCP over IPA over TCP */
- BSSAP_TRANSPORT_SCCPlite_CLIENT, /* SCCPlite: SCCP over IPA over TCP */
- RANAP_TRANSPORT_IuCS/* 3GPP IuCS: SCCP over M3UA over SCTP */
-};
-
type record RAN_Configuration {
RAN_Transport transport,
charstring sccp_service_type,
@@ -153,6 +146,7 @@
timer T := 5.0;
T.start;
//T.timeout;
+ ops.transport := cfg.transport;
/* connect BSSNAP component to upper side of SCCP */
if (cfg.transport == RANAP_TRANSPORT_IuCS) {
#ifdef RAN_EMULATION_RANAP
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index 41aec47..85ae084 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -75,6 +75,13 @@
MSC_CONN_PRIM_CONF_IND
}
+type enumerated RAN_Transport {
+ BSSAP_TRANSPORT_AoIP, /* 3GPP AoIP: SCCP over M3UA over SCTP */
+ BSSAP_TRANSPORT_SCCPlite_SERVER, /* SCCPlite: SCCP over IPA over TCP */
+ BSSAP_TRANSPORT_SCCPlite_CLIENT, /* SCCPlite: SCCP over IPA over TCP */
+ RANAP_TRANSPORT_IuCS/* 3GPP IuCS: SCCP over M3UA over SCTP */
+};
+
/* similar to PDU_BSSAP with DTAP, but DTAP is already decoded! */
type record PDU_DTAP_MO {
OCT1dlci optional,
@@ -650,6 +657,7 @@
boolean decode_dtap,
boolean role_ms,
RanProtocol protocol,
+ RAN_Transport transport,
boolean use_osmux,
/* needed for performing BSSMAP RESET */
SCCP_PAR_Address sccp_addr_local optional,
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index b5dbb87..1dd4d05 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -222,6 +222,7 @@
decode_dtap := true,
role_ms := true,
protocol := RAN_PROTOCOL_BSSAP,
+ transport := BSSAP_TRANSPORT_AoIP,
use_osmux := false,
sccp_addr_local := omit,
sccp_addr_peer := omit
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14386
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Chan
Change in ...osmo-ttcn3-hacks[master]: bsc: Avoid appending Osmux CID IE in AssignReq/Compl with SCCPLite
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14385
Change subject: bsc: Avoid appending Osmux CID IE in AssignReq/Compl with
SCCPLite
..
bsc: Avoid appending Osmux CID IE in AssignReq/Compl with SCCPLite
That IE is not required when on SCCPlite, only for AoIP.
Change-Id: Iff939e431fa3da9fef648242140fdb8d0dc92e52
---
M bsc/BSC_Tests.ttcn
1 file changed, 2 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/85/14385/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index a84277f..518f9e1 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -650,11 +650,7 @@
}
} else {
var BSSMAP_IE_CircuitIdentityCode cic :=
valueof(ts_BSSMAP_IE_CIC(0,1));
- if (osmux_enabled) {
- ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit,
osmux_cid));
- } else {
- ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit));
- }
+ ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit));
}
return ass_cmd;
}
@@ -684,11 +680,7 @@
}
} else {
/* CIC is optional "*" as the MSC allocated it */
- if (expect_osmux) {
- exp_compl := tr_BSSMAP_AssignmentComplete(*, omit,
osmux_cid);
- } else {
- exp_compl := tr_BSSMAP_AssignmentComplete(*, omit);
- }
+ exp_compl := tr_BSSMAP_AssignmentComplete(*, omit);
}
return exp_compl;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14385
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: Iff939e431fa3da9fef648242140fdb8d0dc92e52
Gerrit-Change-Number: 14385
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: bsc: Only append Osmux IEs in BSSAP AoIP
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14387
Change subject: bsc: Only append Osmux IEs in BSSAP AoIP
..
bsc: Only append Osmux IEs in BSSAP AoIP
Previous to this commit, BSSAP Reset (Ack) messages contained Osmux
Support IE even if transport was SCCPLite, where those IEs are actually
meaningless.
Change-Id: If6cc0f65a0f273297a4523e5d6a7564d966f0aa6
---
M bsc/MSC_ConnectionHandler.ttcn
M library/RAN_Emulation.ttcnpp
2 files changed, 20 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/87/14387/1
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 3cc8f8a..c7f6495 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -379,10 +379,12 @@
private function UnitdataCallback(PDU_BSSAP bssap)
runs on RAN_Emulation_CT return template PDU_BSSAP {
var template PDU_BSSAP resp := omit;
+ var boolean append_osmux_support := g_ran_ops.use_osmux and
+ (g_ran_ops.transport ==
BSSAP_TRANSPORT_AoIP);
/* answer all RESET with a RESET ACK */
- if (match(bssap, tr_BSSMAP_Reset(g_ran_ops.use_osmux))) {
- resp := ts_BSSMAP_ResetAck(g_ran_ops.use_osmux);
+ if (match(bssap, tr_BSSMAP_Reset(append_osmux_support))) {
+ resp := ts_BSSMAP_ResetAck(append_osmux_support);
}
return resp;
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index 85ae084..ba018b4 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -445,6 +445,11 @@
type function BssmapUnitdataCallback(PDU_BSSAP bssap)
runs on RAN_Emulation_CT return template PDU_BSSAP;
+private function append_osmux_ie()
+runs on RAN_Emulation_CT return boolean {
+ return g_ran_ops.use_osmux and (g_ran_ops.transport ==
BSSAP_TRANSPORT_AoIP);
+}
+
/* handle common Unitdata such as Paging */
private function CommonBssmapUnitdataCallback(PDU_BSSAP bssap)
runs on RAN_Emulation_CT return template PDU_BSSAP {
@@ -469,14 +474,15 @@
private function f_bssap_wait_for_reset() runs on RAN_Emulation_CT {
var BSSAP_N_UNITDATA_ind ud_ind;
timer T := 20.0;
+ var boolean append_osmux_support := append_osmux_ie();
T.start;
alt {
- [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?,
tr_BSSMAP_Reset(g_ran_ops.use_osmux))) -> value ud_ind {
+ [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?,
tr_BSSMAP_Reset(append_osmux_support))) -> value ud_ind {
BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress,
ud_ind.calledAddress,
- ts_BSSMAP_ResetAck(g_ran_ops.use_osmux)));
+ ts_BSSMAP_ResetAck(append_osmux_support)));
}
- [] as_reset_ack();
+ [] as_reset_ack(append_osmux_support);
[] BSSAP.receive {
repeat;
}
@@ -489,14 +495,15 @@
function f_bssap_reset(SCCP_PAR_Address peer, SCCP_PAR_Address own) runs on
RAN_Emulation_CT {
timer T := 5.0;
+ var boolean append_osmux_support := append_osmux_ie();
- BSSAP.send(ts_BSSAP_UNITDATA_req(peer, own, ts_BSSMAP_Reset(0,
g_ran_ops.use_osmux)));
+ BSSAP.send(ts_BSSAP_UNITDATA_req(peer, own, ts_BSSMAP_Reset(0,
append_osmux_support)));
T.start;
alt {
- [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(own, peer,
tr_BSSMAP_ResetAck(g_ran_ops.use_osmux))) {
+ [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(own, peer,
tr_BSSMAP_ResetAck(append_osmux_support))) {
log("Received RESET-ACK in response to RESET, we're ready to
go!");
}
- [] as_reset_ack();
+ [] as_reset_ack(append_osmux_support);
[] BSSAP.receive { repeat };
[] T.timeout {
setverdict(fail, "Timeout waiting for RESET-ACK after sending
RESET");
@@ -728,7 +735,7 @@
f_ML3_patch_seq_nr(seq_nr, enc_l3);
}
-private altstep as_reset_ack() runs on RAN_Emulation_CT {
+private altstep as_reset_ack(boolean append_osmux_support := false) runs on
RAN_Emulation_CT {
#ifdef RAN_EMULATION_BSSAP
var BSSAP_N_UNITDATA_ind ud_ind;
#endif
@@ -736,10 +743,10 @@
var RANAP_N_UNITDATA_ind rud_ind;
#endif
#ifdef RAN_EMULATION_BSSAP
- [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?,
tr_BSSMAP_Reset(g_ran_ops.use_osmux))) -> value ud_ind {
+ [] BSSAP.receive(tr_BSSAP_UNITDATA_ind(?, ?,
tr_BSSMAP_Reset(append_osmux_support))) -> value ud_ind {
log("Respoding to inbound RESET with RESET-ACK");
BSSAP.send(ts_BSSAP_UNITDATA_req(ud_ind.callingAddress,
ud_ind.calledAddress,
- ts_BSSMAP_ResetAck(g_ran_ops.use_osmux)));
+ ts_BSSMAP_ResetAck(append_osmux_support)));
Change in ...osmo-bsc[master]: manuals: Update generated VTY reference and counters
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14388 ) Change subject: manuals: Update generated VTY reference and counters .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14388 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9f75edf2e5b88ef8f4592fa89548f32e0a7df8d8 Gerrit-Change-Number: 14388 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 06 Jun 2019 16:19:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: gsm_data_shared.h: Remove unused loc_list from struct gsm_bts
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/14398 Change subject: gsm_data_shared.h: Remove unused loc_list from struct gsm_bts .. gsm_data_shared.h: Remove unused loc_list from struct gsm_bts Change-Id: I52880962dfb0399c613048aa7ddfd828d3c6c933 --- M include/osmo-bts/gsm_data_shared.h 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/14398/1 diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h index 90772e2..031f05a 100644 --- a/include/osmo-bts/gsm_data_shared.h +++ b/include/osmo-bts/gsm_data_shared.h @@ -557,9 +557,6 @@ /* list header in net->bts_list */ struct llist_head list; - /* Geographical location of the BTS */ - struct llist_head loc_list; - /* number of ths BTS in network */ uint8_t nr; /* human readable name / description */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I52880962dfb0399c613048aa7ddfd828d3c6c933 Gerrit-Change-Number: 14398 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: CTRL_Types: Fix SET value not encoded in message
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14405 Change subject: CTRL_Types: Fix SET value not encoded in message .. CTRL_Types: Fix SET value not encoded in message Change-Id: I9e0132429265d03caa97af2b2f44eed0327f3200 --- M library/Osmocom_CTRL_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/14405/1 diff --git a/library/Osmocom_CTRL_Types.ttcn b/library/Osmocom_CTRL_Types.ttcn index eb22056..5c4527e 100644 --- a/library/Osmocom_CTRL_Types.ttcn +++ b/library/Osmocom_CTRL_Types.ttcn @@ -90,7 +90,7 @@ verb := "SET", id := id, variable := variable, - val := omit + val := val } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14405 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: I9e0132429265d03caa97af2b2f44eed0327f3200 Gerrit-Change-Number: 14405 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406
Change subject: lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN
IPA conn
..
lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn
This is the case for SCCPlite between BSC and MSC (or BSC-NAT). MGCP and
CTRL can be multiplexed over the same underlaying IPA conn.
Related: OS#2012
Change-Id: Id90c1609f0439b00379166fb9e4028d181fc023e
---
M library/RAN_Adapter.ttcnpp
M library/RAN_Emulation.ttcnpp
2 files changed, 38 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/06/14406/1
diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index 862921e..40cf0fa 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -167,6 +167,11 @@
log("Connecting MGCP RAN Emulation to IPA MGCP PORT");
connect(ba.vc_IPA:IPA_MGCP_PORT, ba.vc_RAN:MGCP);
#endif
+#ifdef IPA_EMULATION_CTRL
+ /* connect IPA CTRL port with BSSMAP CTRL port */
+ log("Connecting CTRL RAN Emulation to IPA CTRL PORT");
+ connect(ba.vc_IPA:IPA_CTRL_PORT, ba.vc_RAN:CTRL);
+#endif
}
log("Starting RAN_Emulation");
ba.vc_RAN.start(RAN_Emulation.main(valueof(ops), ""));
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index ba018b4..c580368 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -48,6 +48,11 @@
import from MGCP_Templates all;
#endif
+#ifdef RAN_EMULATION_CTRL
+import from Osmocom_CTRL_Types all;
+import from Osmocom_CTRL_Adapter all;
+#endif
+
#ifdef RAN_EMULATION_RANAP
import from RANAP_CodecPort all;
import from RANAP_PDU_Descriptions all;
@@ -177,6 +182,11 @@
/* MGCP port */
port IPA_MGCP_PT MGCP;
#endif
+#ifdef RAN_EMULATION_CTRL
+ /* CTRL port */
+ port IPA_CTRL_PT CTRL;
+ port IPA_CTRL_PT CTRL_CLIENT;
+#endif
/* use 16 as this is also the number of SCCP connections that
SCCP_Emulation can handle */
var ConnectionData ConnectionTable[16];
@@ -1041,6 +1051,28 @@
#endif
}
+private altstep as_main_ctrl() runs on RAN_Emulation_CT {
+#ifdef RAN_EMULATION_CTRL
+ var CtrlMessage ctrl;
+ var RAN_ConnHdlr vc_conn;
+
+ /* Handling of CTRL in IPA SCCPLite case. This predates 3GPP
AoIP
+* and uses a CTRL session in parallel to BSSAP. */
+
+ /* CTRL_CLIENT -> CTRL */
+ [] CTRL_CLIENT.receive(CtrlMessage:?) -> value ctrl sender
vc_conn {
+ CTRL.send(ctrl);
+ }
+
+ /* CTRL -> CTRL_CLIENT */
+ [] CTRL.receive(CtrlMessage:?) -> value ctrl {
+ CTRL_CLIENT.send(ctrl);
+ }
+#else
+ [false] CLIENT.receive {}
+#endif
+}
+
/* send a raw (encoded) L3 message over given SCCP connection */
private function f_xmit_raw_l3(integer sccp_conn_id, OCT1 dlci, octetstring
l3_enc) runs on RAN_Emulation_CT
{
@@ -1123,6 +1155,7 @@
}
[] as_main_mgcp();
+ [] as_main_ctrl();
[] PROC.getcall(RAN_register:{?,?}) -> param(l3_info, vc_hdlr) {
f_create_expect(l3_info, vc_hdlr);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406
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: Id90c1609f0439b00379166fb9e4028d181fc023e
Gerrit-Change-Number: 14406
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: bsc: Introduce test TC_ctrl_location
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407
Change subject: bsc: Introduce test TC_ctrl_location
..
bsc: Introduce test TC_ctrl_location
Related: OS#2012
Change-Id: I3640f6889e3b6adc3b4601082f948543c64a2fe3
---
M bsc/BSC_Tests.ttcn
M bsc/MSC_ConnectionHandler.ttcn
M bsc/regen_makefile.sh
M library/Osmocom_CTRL_Adapter.ttcn
4 files changed, 34 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/07/14407/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 518f9e1..030d367 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1204,6 +1204,29 @@
setverdict(pass);
}
+/* Verify that Upon receival of SET "location", BSC forwards a TRAP
+ "location-state" over the SCCPlite IPA conn */
+private function f_tc_ctrl_location(charstring id) runs on MSC_ConnHdlr {
+ g_pars := f_gen_test_hdlr_pars();
+ log("Waiting for TRAP on MSC side");
+ f_ctrl_exp_trap(CTRL, "bts.0.location-state",
"1234567,fix3d,0.34,0.56,0.78,operational,unlocked,on,001,01");
+}
+
+testcase TC_ctrl_location() runs on test_CT {
+ var MSC_ConnHdlr vc_conn;
+ var integer bts_nr := 0;
+
+ f_init(1, true);
+ f_sleep(1.0);
+
+ vc_conn := f_start_handler(refers(f_tc_ctrl_location));
+
+ f_ctrl_set_bts(IPA_CTRL, bts_nr, "location",
"1234567,fix3d,0.34,0.56,0.78");
+
+ vc_conn.done;
+ setverdict(pass);
+}
+
function f_bssap_tx_ud(template PDU_BSSAP bssap) runs on test_CT {
BSSAP.send(ts_BSSAP_UNITDATA_req(g_bssap.sccp_addr_peer,
g_bssap.sccp_addr_own, bssap));
}
@@ -1688,6 +1711,7 @@
}
connect(vc_conn:BSSAP, g_bssap.vc_RAN:CLIENT);
connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT);
+ connect(vc_conn:CTRL, g_bssap.vc_RAN:CTRL_CLIENT);
}
function f_start_handler(void_fn fn, template (omit) TestHdlrParams pars :=
omit)
@@ -3987,6 +4011,9 @@
execute( TC_ctrl_msc_connection_status() );
execute( TC_ctrl_msc0_connection_status() );
execute( TC_ctrl() );
+ if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER) {
+ execute( TC_ctrl_location() );
+ }
/* RSL DCHAN Channel ACtivation / Deactivation */
execute( TC_chan_act_noreply() );
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index c7f6495..0efe080 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -19,6 +19,7 @@
import from BSSAP_Types all;
import from RAN_Emulation all;
import from BSSMAP_Templates all;
+import from IPA_Emulation all;
import from IPL4asp_Types all;
import from Native_Functions all;
@@ -357,6 +358,8 @@
port RAN_PROC_PT RAN;
port TELNETasp_PT BSCVTY;
+ port IPA_CTRL_PT CTRL;
+
var MediaState g_media;
var TestHdlrParams g_pars;
diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh
index 06fa812..389aaed 100755
--- a/bsc/regen_makefile.sh
+++ b/bsc/regen_makefile.sh
@@ -4,6 +4,6 @@
FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc
IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc SCTPasp_PT.cc
RTP_EncDec.cc SDP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc
MGCP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc
TELNETasp_PT.cc *.c"
-export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP
-DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP
-DUSE_MTP3_DISTRIBUTOR"
+export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP
-DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP
-DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR"
../regen-makefile.sh $MAIN $FILES
diff --git a/library/Osmocom_CTRL_Adapter.ttcn
b/library/Osmocom_CTRL_Adapter.ttcn
index 93e893f..08195c8 100644
--- a/library/Osmocom_CTRL_Adapter.ttcn
+++ b/library/Osmocom_CTRL_Adapter.ttcn
@@ -61,6 +61,9 @@
function f_ctrl_get_bts(IPA_CTRL_PT pt, integer bts_nr, charstring suffix)
return CtrlValue {
return f_ctrl_get(pt, "bts." & int2str(bts_nr) & "." & suffix);
}
+function f_ctrl_set_bts(IPA_CTRL_PT pt, integer bts_nr, charstring suffix,
CtrlValue val) {
+ f_ctrl_set(pt, "bts." & int2str(bts_nr) & "." & suffix, val);
+}
template charstring ts_bts(integer bts_nr) := "bts." & int2str(bts_nr) & ".";
template charstring ts_bts_trx(integer bts_nr, integer trx_nr ) :=
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407
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: I3640f6889e3b6adc3b4601082f948543c64a2fe3
Gerrit-Change-Number: 14407
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: bsc: Fix trailing whitespace
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14408
Change subject: bsc: Fix trailing whitespace
..
bsc: Fix trailing whitespace
Change-Id: I97c6cc290d6cc23611ac38e7e370b5b0b88cca1d
---
M bsc/BSC_Tests.ttcn
M bsc/MSC_ConnectionHandler.ttcn
M library/Osmocom_CTRL_Functions.ttcn
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/08/14408/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 518f9e1..c3275e1 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -1263,7 +1263,7 @@
f_bssap_tx_ud(ts_BSSMAP_Paging(imsi, cid_list, tmsi, bssmap_chneed));
-/* FIXME: Disabled due to bugs in both GSM_RR_Types and
MobileL3_CommonIE_Types IMSI encoder
+/* FIXME: Disabled due to bugs in both GSM_RR_Types and
MobileL3_CommonIE_Types IMSI encoder
if (isvalue(tmsi)) {
mi := valueof(t_Osmo_MI_TMSI(oct2int(valueof(tmsi;
} else {
@@ -3171,7 +3171,7 @@
var octetstring ho_command_str;
BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value
rx_bssap;
-
+
ho_command_str :=
rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info;
log("Received L3 Info in HO Request Ack: ", ho_command_str);
var PDU_ML3_NW_MS ho_command := dec_PDU_ML3_NW_MS(ho_command_str);
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index c7f6495..c709794 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -1091,7 +1091,7 @@
}
}
[st.rr_ho_cmpl_seen] as_Media_ipacc();
- [st.rr_ho_cmpl_seen] as_Media_mgw(true);
+ [st.rr_ho_cmpl_seen] as_Media_mgw(true);
[st.rr_ho_cmpl_seen] RSL.receive(tr_RSL_DEACT_SACCH(st.old_chan_nr)) {
repeat;
}
diff --git a/library/Osmocom_CTRL_Functions.ttcn
b/library/Osmocom_CTRL_Functions.ttcn
index 4356ba9..94dcb8a 100644
--- a/library/Osmocom_CTRL_Functions.ttcn
+++ b/library/Osmocom_CTRL_Functions.ttcn
@@ -6,7 +6,7 @@
* implements blocking functions, instead of asynchronous functions. The
* rationale for this is simple: One normally wants to inquire a value or set
* a value and not continue the main program until that operation is complete.
- *
+ *
* CTRL is a machine-type protocol on how external programs can interact with
* an Osmocom program in a structured way. It is intended for programmatic
* access (by other software), as opposed to the VTY interface intended for
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14408
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: I97c6cc290d6cc23611ac38e7e370b5b0b88cca1d
Gerrit-Change-Number: 14408
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: bscnat: Refactor MSC side code to allow different actions per test
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14412
Change subject: bscnat: Refactor MSC side code to allow different actions per
test
..
bscnat: Refactor MSC side code to allow different actions per test
Each test can now plug in different acctions to be done by the emulated
MSC, by passing a BssmapCreateCallback RAN_Emaulation callback to
f_init(). Old hardcoded behaviour (main()) is renamed and used in
laready existing tests.
New infrastructure provides a generic BssmapCreateCallback taking care
of required boilerplate, so new tests/users only need to define a new
callback calling that generic one with a function pointer where all test
logic is implemented.
Change-Id: Ic429420d0d95b6aacb6e5c44031b49c942ed544d
---
M bsc-nat/BSCNAT_Tests.ttcn
M bsc-nat/MSC_ConnectionHandler.ttcn
M bsc-nat/MSC_Simulation.ttcn
3 files changed, 71 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/12/14412/1
diff --git a/bsc-nat/BSCNAT_Tests.ttcn b/bsc-nat/BSCNAT_Tests.ttcn
index fda065a..47d894b 100644
--- a/bsc-nat/BSCNAT_Tests.ttcn
+++ b/bsc-nat/BSCNAT_Tests.ttcn
@@ -16,6 +16,7 @@
import from IPL4asp_Types all;
import from IPA_Emulation all;
+import from RAN_Emulation all;
import from MTP3asp_Types all;
@@ -24,6 +25,7 @@
import from SCCP_Emulation all;
import from MSC_Simulation all;
+import from MSC_ConnectionHandler all;
import from BSC_MS_Simulation all;
import from BSC_MS_ConnectionHandler all;
@@ -136,7 +138,7 @@
f_vty_transceive(BSCNATVTY, "enable");
}
-function f_init(void_fn_bsc_ms fn_bsc_ms, boolean use_osmux) runs on test_CT {
+function f_init(void_fn_bsc_ms fn_bsc_ms, BssmapCreateCallback cb_msc, boolean
use_osmux) runs on test_CT {
var integer i;
var charstring id;
@@ -147,7 +149,9 @@
f_init_MscState(msc[i], mp_msc_pc +i, mp_bsc_pc, mp_msc_ssn,
mp_bsc_ssn);
id := "MSC" & int2str(i);
msc[i].MSC := MSC_CT.create(id);
- msc[i].MSC.start(MSC_Simulation.main(mp_msc_ip, mp_msc_port +
i, msc[i].sccp_pars, msc[i].sccp_addr_own, id));
+ msc[i].MSC.start(MSC_Simulation.main(mp_msc_ip, mp_msc_port + i,
+msc[i].sccp_pars,
msc[i].sccp_addr_own,
+cb_msc, id));
}
/* Wait for bsc_nat to attach to MSC. Before that all BSC connections
will be dropped */
@@ -186,7 +190,9 @@
function f_TC_recv_dump(boolean use_osmux := false) runs on test_CT {
timer T := 30.0;
- f_init(refers(bsc_ms_establish_fully), use_osmux);
+ f_init(refers(bsc_ms_establish_fully),
+ refers(CreateCallback_establish_fully),
+ use_osmux);
f_wait_finish(T);
}
diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn
b/bsc-nat/MSC_ConnectionHandler.ttcn
index c8cb005..e4d3816 100644
--- a/bsc-nat/MSC_ConnectionHandler.ttcn
+++ b/bsc-nat/MSC_ConnectionHandler.ttcn
@@ -21,6 +21,8 @@
import from MGCP_Templates all;
import from SDP_Types all;
+type function void_fn_msc(charstring id) runs on MSC_ConnHdlr;
+
/* this component represents a single subscriber connection at the MSC.
* There is a 1:1 mapping between SCCP connections and RAN_ConnHdlr components.
* We inherit all component variables, ports, functions, ... from RAN_ConnHdlr
*/
@@ -32,24 +34,38 @@
var MgcpEndpoint g_ep_name;
var MgcpCallId g_call_id;
var MgcpConnectionId g_mgcp_conn_id;
+ var MSC_TestHdlrParams g_pars;
}
-/* Callback function from general BSSMAP_Emulation whenever a new incoming
- * SCCP connection arrivces. Must create + start a new component */
-private function CreateCallback(BSSAP_N_CONNECT_ind conn_ind, charstring id)
-runs on RAN_Emulation_CT return RAN_ConnHdlr {
- var MSC_ConnHdlr vc_conn;
- /* Create a new RAN_ConnHdlr component */
- vc_conn := MSC_ConnHdlr.create(g_ran_id & "-Conn-" &
int2str(conn_ind.connectionId));
- /* connect it to the port */
+type record MSC_TestHdlrParams {
+ integer connection_id,
+ integer e1_timeslot
+};
+
+/* helper function to create and connect a MSC_ConnHdlr component */
+private function f_connect_handler(inout MSC_ConnHdlr vc_conn) runs on
RAN_Emulation_CT {
+ /* connect client BSSAP port to BSSAP dispatcher */
connect(vc_conn:BSSAP, self:CLIENT);
- /* start it */
- vc_conn.start(MSC_ConnectionHandler.main(conn_ind.connectionId,
g_next_e1_ts));
- /* increment next E1 timeslot */
- g_next_e1_ts := g_next_e1_ts + 1;
+}
+
+private function f_msc_start_handler(void_fn_msc fn, charstring id, template
(omit) MSC_TestHdlrParams pars := omit)
+runs on RAN_Emulation_CT return MSC_ConnHdlr {
+ var MSC_ConnHdlr vc_conn;
Change in libosmocore[master]: jenkins: Validate gsm 08.58 IEs are added to tlv_definition
Attention is currently required from: pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27646 to look at the new patch set (#4). Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition .. jenkins: Validate gsm 08.58 IEs are added to tlv_definition It was recently found that several IEs which were added in the header file were not actually added to the tlv_definition, and hence the tlv parser failed to decode them. Let's make sure we don't foget to add new IEs in the future. Related: SYS#5915 Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 --- M contrib/jenkins_common.sh M include/osmocom/gsm/protocol/gsm_08_58.h M src/gsm/rsl.c 3 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/27646/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 Gerrit-Change-Number: 27646 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: rsl: Fix tlv_parse of IPAC_DLCX_IND message
Attention is currently required from: pespin, fixeria. Hello osmith, Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27644 to look at the new patch set (#2). Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message .. rsl: Fix tlv_parse of IPAC_DLCX_IND message The IE was missing in rsl_att_tlvdef. Related: SYS#5915 Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 --- M src/gsm/rsl.c M tests/abis/abis_test.c M tests/abis/abis_test.ok 3 files changed, 49 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/27644/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
Change in libosmocore[master]: rsl: Fix tlv_parse of IPAC_DLCX_IND message
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27644 ) Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055 Gerrit-Change-Number: 27644 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 05 Apr 2022 16:04:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: rsl: Fix tlv_parse of IPAC_DLCX_IND message
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/27644 )
Change subject: rsl: Fix tlv_parse of IPAC_DLCX_IND message
..
rsl: Fix tlv_parse of IPAC_DLCX_IND message
The IE was missing in rsl_att_tlvdef.
Related: SYS#5915
Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055
---
M src/gsm/rsl.c
M tests/abis/abis_test.c
M tests/abis/abis_test.ok
3 files changed, 49 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index f535b7f..dd5a116 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -133,6 +133,7 @@
[RSL_IE_IPAC_LOCAL_PORT]= { TLV_TYPE_FIXED, 2 },
[RSL_IE_IPAC_SPEECH_MODE] = { TLV_TYPE_TV },
[RSL_IE_IPAC_LOCAL_IP] = { TLV_TYPE_FIXED, 4 },
+ [RSL_IE_IPAC_CONN_STAT] = { TLV_TYPE_TLV, 28 },
[RSL_IE_IPAC_CONN_ID] = { TLV_TYPE_FIXED, 2 },
[RSL_IE_IPAC_RTP_CSD_FMT] = { TLV_TYPE_TV },
[RSL_IE_IPAC_RTP_JIT_BUF] = { TLV_TYPE_FIXED, 2 },
diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c
index 2151e92..8ba5f17 100644
--- a/tests/abis/abis_test.c
+++ b/tests/abis/abis_test.c
@@ -193,6 +193,52 @@
msgb_free(msg);
}
+/* Test decode IPAC_DLCX_IND obtained from SYS#5915 */
+static void test_dec_ipac_dlc_indx()
+{
+/* Radio Signalling Link (RSL)
+ 0111 111. = Message discriminator: ip.access Vendor Specific messages
(63)
+ ...0 = T bit: Not considered transparent by BTS
+ .111 0110 = Message type: ip.access DLCX INDication (0x76)
+ Channel number IE
+ Element identifier: Channel Number (0x01)
+ 1... = C-bits: Bm + ACCH (1)
+ .110 = Time slot number (TN): 6
+ Element identifier: Connection Identifier (0xf8)
+ ip.access Connection ID: 0
+ Element identifier: Connection Statistics (0xf6)
+ [1 byte length here, val = 28 (0x1c)]
+ Packets Sent: 1202
+ Octets Sent: 45052
+ Packets Received: 556
+ Octets Received: 24580
+ Packets Lost: 0
+ Inter-arrival Jitter: 0
+ Average Tx Delay: 0
+ Cause IE
+ Element identifier: Cause (0x1a)
+ Length: 1
+ 0... = Extension: No Extension
+ .000 = Class: Normal event (0)
+ .000 = Cause Value: normal event, unspecified (15)
+*/
+ const uint8_t hex[] = {
+ 0x7e, 0x76, 0x01, 0x0e, 0xf8, 0x00, 0x00, 0xf6, 0x1c, 0x00,
0x00, 0x04, 0xb2, 0x00, 0x00, 0xaf,
+ 0xfc, 0x00, 0x00, 0x02, 0x2c, 0x00, 0x00, 0x60, 0x04, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x01, 0x0f
+ };
+ struct abis_rsl_dchan_hdr *dh = (struct abis_rsl_dchan_hdr *)&hex[0];
+
+ struct tlv_parsed tp;
+ int rc;
+
+ printf("Testing decoding IPAC_DLCX_IND\n");
+
+ rc = rsl_tlv_parse(&tp, dh->data, sizeof(hex) - sizeof(*dh));
+
+ OSMO_ASSERT(rc == 3);
+}
+
int main(int argc, char **argv)
{
void *ctx = talloc_named_const(NULL, 0, "abis_test");
@@ -202,6 +248,7 @@
test_simple_sw_config();
test_simple_sw_short();
test_dual_sw_config();
+ test_dec_ipac_dlc_indx();
printf("OK.\n");
diff --git a/tests/abis/abis_test.ok b/tests/abis/abis_test.ok
index e6b626b..2ee647b 100644
--- a/tests/abis/abis_test.ok
+++ b/tests/abis/abis_test.ok
@@ -38,4 +38,5 @@
file_id: 09 07 05
file_ver: 06 07 08
test_dual_sw_config(): OK
+Testing decoding IPAC_DLCX_IND
OK.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27644
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ib637197ef3508ec94aec05d08d4e6aa15ddea055
Gerrit-Change-Number: 27644
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654 )
Change subject: Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA
..
Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA
We don't really act as rely agents in the emulation, so let's not
announce it.
Furthermore, this aids libfreediameter selecting proper routes, since it
seems to only underscore peers not matching the AppId if they are not
rely agents (see dont_send_if_no_common_app() in freeDiameter.git)
Change-Id: I0a9daf094f4c27c0b4de5581ddd56feced8e5732
---
M library/DIAMETER_Templates.ttcn
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/54/27654/1
diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index 944dfd7..f7244d8 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -880,7 +880,6 @@
ts_AVP_SuppVendorIdRaw(5535), /* 3GPP2 */
ts_AVP_SuppVendorId(vendor_id_3GPP),
ts_AVP_SuppVendorIdRaw(13019), /* ETSI */
- ts_AVP_AuthAppId(''O),
ts_AVP_AuthAppId(int2oct(auth_app_id, 4)),
ts_AVP_InbSecId(''O)
});
@@ -901,7 +900,6 @@
ts_AVP_SuppVendorIdRaw(5535), /* 3GPP2 */
ts_AVP_SuppVendorId(vendor_id_3GPP),
ts_AVP_SuppVendorIdRaw(13019), /* ETSI */
- ts_AVP_AuthAppId(''O),
ts_AVP_InbSecId(''O),
ts_AVP_VendorSpecAppId(vendor_id_3GPP, vendor_app_id)
});
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654
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: I0a9daf094f4c27c0b4de5581ddd56feced8e5732
Gerrit-Change-Number: 27654
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-bsc[master]: contrib/osmo-bsc.spec.in: fix 4trx example paths
Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27655 ) Change subject: contrib/osmo-bsc.spec.in: fix 4trx example paths .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I92a7d85b64a9659db7ef71af5b00110b582dc4d9 Gerrit-Change-Number: 27655 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 06 Apr 2022 12:51:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: assignment_fsm: always mark MGCP ci as completed
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27656 ) Change subject: assignment_fsm: always mark MGCP ci as completed .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5ab10ee7fd9c5d7608e8a06893881d990943feed Gerrit-Change-Number: 27656 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 11:05:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: assignment_fsm: always update RTP info
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27657 ) Change subject: assignment_fsm: always update RTP info .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0788d1f013b8f820f559b6ed58a5f9bb8a02e0b4 Gerrit-Change-Number: 27657 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 11:07:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: as_Media_mgw: fail on DLCX
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658 ) Change subject: bsc: as_Media_mgw: fail on DLCX .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658 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: I0633f60f09d58802f6be0238ef41a632d93a4327 Gerrit-Change-Number: 27658 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 11:10:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: add TC_emerg_call_and_lcs_loc_req
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27659 ) Change subject: bsc: add TC_emerg_call_and_lcs_loc_req .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27659 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: I95037374c45943cb14401bc48f16a39c2fcbe1f5 Gerrit-Change-Number: 27659 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 11:11:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654 ) Change subject: Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA .. Patch Set 1: (1 comment) File library/DIAMETER_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654/comment/f63ce9ba_733df68c PS1, Line 883: ts_AVP_AuthAppId > Here I see that the ts_AVP_AuthAppId was listed twice, so we're including > only one now with the give […] well in general it's fine listing several APPids, after all a peer can support multiple applications. But for sure the EMULATION one is not relaying stuff (Relay Agent), so there's no sense in announcing it by default, specally since at least for freeDiameter it seems to be taken into account for routing. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654 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: I0a9daf094f4c27c0b4de5581ddd56feced8e5732 Gerrit-Change-Number: 27654 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 07 Apr 2022 11:13:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654 )
Change subject: Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA
..
Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA
We don't really act as rely agents in the emulation, so let's not
announce it.
Furthermore, this aids libfreediameter selecting proper routes, since it
seems to only underscore peers not matching the AppId if they are not
rely agents (see dont_send_if_no_common_app() in freeDiameter.git)
Change-Id: I0a9daf094f4c27c0b4de5581ddd56feced8e5732
---
M library/DIAMETER_Templates.ttcn
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index 944dfd7..f7244d8 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -880,7 +880,6 @@
ts_AVP_SuppVendorIdRaw(5535), /* 3GPP2 */
ts_AVP_SuppVendorId(vendor_id_3GPP),
ts_AVP_SuppVendorIdRaw(13019), /* ETSI */
- ts_AVP_AuthAppId(''O),
ts_AVP_AuthAppId(int2oct(auth_app_id, 4)),
ts_AVP_InbSecId(''O)
});
@@ -901,7 +900,6 @@
ts_AVP_SuppVendorIdRaw(5535), /* 3GPP2 */
ts_AVP_SuppVendorId(vendor_id_3GPP),
ts_AVP_SuppVendorIdRaw(13019), /* ETSI */
- ts_AVP_AuthAppId(''O),
ts_AVP_InbSecId(''O),
ts_AVP_VendorSpecAppId(vendor_id_3GPP, vendor_app_id)
});
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654
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: I0a9daf094f4c27c0b4de5581ddd56feced8e5732
Gerrit-Change-Number: 27654
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: jenkins: Validate gsm 08.58 IEs are added to tlv_definition
Attention is currently required from: osmith, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27646 ) Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition .. Patch Set 4: (1 comment) File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/c/libosmocore/+/27646/comment/9a48d086_5cc601a8 PS3, Line 356: RSL_IE_LLP_APDU, > I agree, can, will those be checked as well? They are being checked too since the last version I submitted. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 Gerrit-Change-Number: 27646 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 07 Apr 2022 12:46:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in libosmocore[master]: jenkins: Validate gsm 08.58 IEs are added to tlv_definition
Attention is currently required from: osmith, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27646 ) Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27646 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972 Gerrit-Change-Number: 27646 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 07 Apr 2022 12:46:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: jenkins: Validate gsm 08.58 IEs are added to tlv_definition
pespin has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/27646 )
Change subject: jenkins: Validate gsm 08.58 IEs are added to tlv_definition
..
jenkins: Validate gsm 08.58 IEs are added to tlv_definition
It was recently found that several IEs which were added in the header
file were not actually added to the tlv_definition, and hence the tlv
parser failed to decode them. Let's make sure we don't foget to add new
IEs in the future.
Related: SYS#5915
Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972
---
M contrib/jenkins_common.sh
M include/osmocom/gsm/protocol/gsm_08_58.h
M src/gsm/rsl.c
3 files changed, 19 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh
index c39b356..82dd471 100644
--- a/contrib/jenkins_common.sh
+++ b/contrib/jenkins_common.sh
@@ -28,6 +28,21 @@
}
verify_gsm0808_tlv_definition
+verify_gsm_08_05_tlv_definition() {
+set +x;
+enums=$(grep "RSL_IE_" include/osmocom/gsm/protocol/gsm_08_58.h | grep -e
"=" -e ",$" | awk '{ print $1 }' | tr -d ',')
+counted_enums=$(for f in $enums; do printf "%-60s %s\n" "$f" "$(grep -c
"\[$f\]" src/gsm/rsl.c)"; done)
+# TODO: Add RSL_IE_SIEMENS_* to the tlv struct definitions.
+missing_enums=$(echo "$counted_enums" | grep -v RSL_IE_SIEMENS |grep "0$"
|| true)
+if [ "x$missing_enums" != "x" ]; then
+echo "Missing IEs in src/gsm/rsl.c!"
+echo "$missing_enums"
+exit 1
+fi
+set -x;
+}
+verify_gsm_08_05_tlv_definition
+
prep_build() {
_src_dir="$1"
_build_dir="$2"
diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h
b/include/osmocom/gsm/protocol/gsm_08_58.h
index 7a527ff..d1720fa 100644
--- a/include/osmocom/gsm/protocol/gsm_08_58.h
+++ b/include/osmocom/gsm/protocol/gsm_08_58.h
@@ -385,9 +385,9 @@
RSL_IE_IPAC_RTP_CSD_FMT = 0xf9,
RSL_IE_IPAC_RTP_JIT_BUF = 0xfa,
RSL_IE_IPAC_RTP_COMPR = 0xfb,
- RSL_IE_IPAC_RTP_PAYLOAD2= 0xfc,
+ RSL_IE_IPAC_RTP_PAYLOAD2 = 0xfc,
RSL_IE_IPAC_RTP_MPLEX = 0xfd,
- RSL_IE_IPAC_RTP_MPLEX_ID= 0xfe,
+ RSL_IE_IPAC_RTP_MPLEX_ID = 0xfe,
};
/* Ericsson specific IEs, clash with above partially, so they're not
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index dd5a116..0af366f 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -125,6 +125,7 @@
[RSL_IE_OSMO_REP_ACCH_CAP] = { TLV_TYPE_TLV },
[RSL_IE_OSMO_TRAINING_SEQUENCE] = { TLV_TYPE_TLV },
[RSL_IE_OSMO_TEMP_OVP_ACCH_CAP] = { TLV_TYPE_TLV },
+ [RSL_IE_IPAC_SRTP_CONFIG] = { TLV_TYPE_TLV },
[RSL_IE_IPAC_PROXY_UDP] = { TLV_TYPE_FIXED, 2 },
[RSL_IE_IPAC_BSCMPL_TOUT] = { TLV_TYPE_TV },
[RSL_IE_IPAC_REMOTE_IP] = { TLV_TYPE_FIXED, 4 },
@@ -134,6 +135,7 @@
[RSL_IE_IPAC_SPEECH_MODE] = { TLV_TYPE_TV },
[RSL_IE_IPAC_LOCAL_IP] = { TLV_TYPE_FIXED, 4 },
[RSL_IE_IPAC_CONN_STAT] = { TLV_TYPE_TLV, 28 },
+ [RSL_IE_IPAC_HO_C_PARMS]= { TLV_TYPE_TLV },
[RSL_IE_IPAC_CONN_ID] = { TLV_TYPE_FIXED, 2 },
[RSL_IE_IPAC_RTP_CSD_FMT] = { TLV_TYPE_TV },
[RSL_IE_IPAC_RTP_JIT_BUF] = { TLV_TYPE_FIXED, 2 },
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27646
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Id8a679ca43eb0fcc4882780e9a95ec21c7f51972
Gerrit-Change-Number: 27646
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-CC: fixeria
Gerrit-MessageType: merged
Change in osmo-ci[master]: jobs: Add ttcn3-pgw-test jenkins job
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27660 ) Change subject: jobs: Add ttcn3-pgw-test jenkins job .. jobs: Add ttcn3-pgw-test jenkins job Change-Id: I363a7a8eb524abfeb45c81603c29cea96f86a787 --- M jobs/ttcn3-testsuites.yml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/60/27660/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 5fb994d..89915a2 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -154,6 +154,11 @@ blocking: "^(ttcn3|TTCN3-.*)-fr-test.*" timer: 40 10 * * * node: hdlc + - ttcn3-pgw-test: + blocking: "^(ttcn3|TTCN3-.*)-pgw-test.*" + timer: 00 14 * * * + description: | +Test open5gs-smfd + open5gs-upfd PGW main. # debian-stretch latest stable - nplab-m3ua-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I363a7a8eb524abfeb45c81603c29cea96f86a787 Gerrit-Change-Number: 27660 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pgw: Add T_guard
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661 )
Change subject: pgw: Add T_guard
..
pgw: Add T_guard
Change-Id: I9dce4aee4a0b1181bb7dc1a53fb254e6d17cf22e
---
M pgw/PGW_Tests.ttcn
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/61/27661/1
diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn
index d9f4979..a65ca43 100644
--- a/pgw/PGW_Tests.ttcn
+++ b/pgw/PGW_Tests.ttcn
@@ -40,6 +40,16 @@
var DIAMETER_Emulation_CT vc_DIAMETER;
port DIAMETER_PT DIAMETER_UNIT;
port DIAMETEREM_PROC_PT DIAMETER_PROC;
+ /* global test case guard timer (actual timeout value is set in
f_init()) */
+ timer T_guard;
+}
+
+/* global altstep for global guard timer; */
+altstep as_Tguard() runs on PGW_Test_CT {
+ [] T_guard.timeout {
+ setverdict(fail, "Timeout of T_guard");
+ mtc.stop;
+ }
}
/* per-session component; we typically have 1..N per testcase */
@@ -138,7 +148,10 @@
f_diameter_wait_capability(DIAMETER_UNIT);
}
-private function f_init() runs on PGW_Test_CT {
+private function f_init(float guard_timeout := 60.0) runs on PGW_Test_CT {
+ T_guard.start(guard_timeout);
+ activate(as_Tguard());
+
var Gtp2EmulationCfg cfg := {
gtpc_bind_ip := mp_local_hostname_c,
gtpc_bind_port := GTP2C_PORT,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661
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: I9dce4aee4a0b1181bb7dc1a53fb254e6d17cf22e
Gerrit-Change-Number: 27661
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pgw: Add expected_results.xml
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27682 ) Change subject: pgw: Add expected_results.xml .. pgw: Add expected_results.xml Change-Id: I451b10a7b79854e630e7f2d487423dc39ade5bbd --- A pgw/expected_results.xml 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/27682/1 diff --git a/pgw/expected_results.xml b/pgw/expected_results.xml new file mode 100644 index 000..65daf0e --- /dev/null +++ b/pgw/expected_results.xml @@ -0,0 +1,9 @@ + + + + + + + + + -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27682 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: I451b10a7b79854e630e7f2d487423dc39ade5bbd Gerrit-Change-Number: 27682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ci[master]: jobs: Add ttcn3-pgw-test jenkins job
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27660 ) Change subject: jobs: Add ttcn3-pgw-test jenkins job .. jobs: Add ttcn3-pgw-test jenkins job Change-Id: I363a7a8eb524abfeb45c81603c29cea96f86a787 --- M jobs/ttcn3-testsuites.yml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 5fb994d..89915a2 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -154,6 +154,11 @@ blocking: "^(ttcn3|TTCN3-.*)-fr-test.*" timer: 40 10 * * * node: hdlc + - ttcn3-pgw-test: + blocking: "^(ttcn3|TTCN3-.*)-pgw-test.*" + timer: 00 14 * * * + description: | +Test open5gs-smfd + open5gs-upfd PGW main. # debian-stretch latest stable - nplab-m3ua-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I363a7a8eb524abfeb45c81603c29cea96f86a787 Gerrit-Change-Number: 27660 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pgw: Fix typo in expected-results.xml name
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27685 ) Change subject: pgw: Fix typo in expected-results.xml name .. pgw: Fix typo in expected-results.xml name Change-Id: I49342db43e81d3e95fa5d13de4cd77b6a67a7af7 --- R pgw/expected-results.xml 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/27685/1 diff --git a/pgw/expected_results.xml b/pgw/expected-results.xml similarity index 100% rename from pgw/expected_results.xml rename to pgw/expected-results.xml -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27685 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: I49342db43e81d3e95fa5d13de4cd77b6a67a7af7 Gerrit-Change-Number: 27685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pgw: Fix typo in expected-results.xml name
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27685 ) Change subject: pgw: Fix typo in expected-results.xml name .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27685 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: I49342db43e81d3e95fa5d13de4cd77b6a67a7af7 Gerrit-Change-Number: 27685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 07 Apr 2022 17:27:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pgw: Fix typo in expected-results.xml name
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27685 ) Change subject: pgw: Fix typo in expected-results.xml name .. pgw: Fix typo in expected-results.xml name Change-Id: I49342db43e81d3e95fa5d13de4cd77b6a67a7af7 --- R pgw/expected-results.xml 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/pgw/expected_results.xml b/pgw/expected-results.xml similarity index 100% rename from pgw/expected_results.xml rename to pgw/expected-results.xml -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27685 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: I49342db43e81d3e95fa5d13de4cd77b6a67a7af7 Gerrit-Change-Number: 27685 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27684 ) Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode .. Patch Set 2: Code-Review+1 (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27684/comment/b8cbf07d_95ff5980 PS1, Line 265: * intentionally invalidate RSSI, so that this report gets dropped in "intentionally invalidate RSSI for speech blocks" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Gerrit-Change-Number: 27684 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 07 Apr 2022 17:29:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
Attention is currently required from: fixeria.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27683 )
Change subject: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
..
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27683
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d
Gerrit-Change-Number: 27683
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: pespin
Gerrit-CC: Jenkins Builder
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Thu, 07 Apr 2022 17:30:50 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-test: Use process name in log file
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27688 ) Change subject: ttcn3-pgw-test: Use process name in log file .. ttcn3-pgw-test: Use process name in log file This way it becomes similar to what we use in ttcn3-ggsn-tests-ogs. Change-Id: Ibac0e6bc9dc7c2e576a4f5d1ccb730211d1e1427 --- M ttcn3-pgw-test/open5gs-nrf.yaml M ttcn3-pgw-test/open5gs-smf.yaml M ttcn3-pgw-test/open5gs-upf.yaml 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/88/27688/1 diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf.yaml index 3deec92..2680098 100644 --- a/ttcn3-pgw-test/open5gs-nrf.yaml +++ b/ttcn3-pgw-test/open5gs-nrf.yaml @@ -21,7 +21,7 @@ #domain: core,sbi,nrf,event,mem,sock # logger: -file: /data/open5gs-nrf.log +file: /data/open5gs-nrfd.log # # nrf: diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml index 5b8384b..ee88407 100644 --- a/ttcn3-pgw-test/open5gs-smf.yaml +++ b/ttcn3-pgw-test/open5gs-smf.yaml @@ -19,7 +19,7 @@ #domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock # logger: -file: /data/open5gs-smf.log +file: /data/open5gs-smfd.log # # smf: # diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf.yaml index e051d31..735d121 100644 --- a/ttcn3-pgw-test/open5gs-upf.yaml +++ b/ttcn3-pgw-test/open5gs-upf.yaml @@ -19,7 +19,7 @@ #domain: core,pfcp,gtp,upf,event,tlv,mem,sock # logger: -file: /data/open5gs-upf.log +file: /data/open5gs-upfd.log # # upf: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibac0e6bc9dc7c2e576a4f5d1ccb730211d1e1427 Gerrit-Change-Number: 27688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-ggsn-ogs: Rename config files
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/27686 )
Change subject: ttcn3-ggsn-ogs: Rename config files
..
ttcn3-ggsn-ogs: Rename config files
Let's make names similar to what's used in PGW_Tests. Also, in
open5gs.git, config files don't contain the "d" at the end.
Change-Id: If56d1a890a4f1b80b4f04ae22644f9cb9cdd35f4
---
M ttcn3-ggsn-test/jenkins-ogs.sh
R ttcn3-ggsn-test/ogs/open5gs-smf.yaml
R ttcn3-ggsn-test/ogs/open5gs-upf.yaml
3 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/86/27686/1
diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh
index 172821f..205abbc 100755
--- a/ttcn3-ggsn-test/jenkins-ogs.sh
+++ b/ttcn3-ggsn-test/jenkins-ogs.sh
@@ -19,8 +19,7 @@
write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg"
mkdir $VOL_BASE_DIR/ggsn
-cp ogs/smfd.yaml $VOL_BASE_DIR/ggsn/
-cp ogs/upfd.yaml $VOL_BASE_DIR/ggsn/
+cp ogs/open5gs-*.yaml $VOL_BASE_DIR/ggsn/
cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/
cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/
cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/
@@ -39,7 +38,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 201) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-smfd -c /data/smfd.yaml
>/data/open5gs-smfd.out 2>&1"
+ /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
docker run --cap-add=NET_ADMIN \
--device /dev/net/tun:/dev/net/tun \
@@ -51,7 +50,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 222) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "/data/upfd.sh -c /data/upfd.yaml
>/data/open5gs-upfd.out 2>&1"
+ /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml
>/data/open5gs-upfd.out 2>&1"
# start docker container with testsuite in foreground
docker run --rm \
@@ -63,4 +62,3 @@
--name ${BUILD_TAG}-ggsn-test \
$DOCKER_ARGS \
$REPO_USER/ttcn3-ggsn-test
-
diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml
b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/smfd.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-smf.yaml
diff --git a/ttcn3-ggsn-test/ogs/upfd.yaml
b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/upfd.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-upf.yaml
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27686
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If56d1a890a4f1b80b4f04ae22644f9cb9cdd35f4
Gerrit-Change-Number: 27686
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-{pgw,ggsn}-tests: Add comment with procedure to get open5gs-smf...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/27689 )
Change subject: ttcn3-{pgw,ggsn}-tests: Add comment with procedure to get
open5gs-smfd bt automatically
..
ttcn3-{pgw,ggsn}-tests: Add comment with procedure to get open5gs-smfd bt
automatically
Some specific gdb commands need to be run in open5gs-smfd to get the
desired result (some signals need to be ignored).
gdb use is not enabled by default. Furthermore, if one wants to use it,
editing the Dockerfile to install gdb is required.
Change-Id: I1ac8b77e84d57040fc09964356bc8a01e5d721e3
---
M ttcn3-ggsn-test/jenkins-ogs.sh
M ttcn3-pgw-test/jenkins.sh
2 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/89/27689/1
diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh
index 205abbc..b6500f0 100755
--- a/ttcn3-ggsn-test/jenkins-ogs.sh
+++ b/ttcn3-ggsn-test/jenkins-ogs.sh
@@ -39,6 +39,8 @@
$(docker_network_params $SUBNET 201) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
/bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
+ #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex
'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
+ #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes
--show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c
/data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1"
docker run --cap-add=NET_ADMIN \
--device /dev/net/tun:/dev/net/tun \
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index ef10f41..7205af2 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -59,6 +59,7 @@
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
/bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
+ #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex
'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
# start container with osmo-ugcups-daemon in background; SYS_ADMIN required
for CLONE_NEWNS
docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27689
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I1ac8b77e84d57040fc09964356bc8a01e5d721e3
Gerrit-Change-Number: 27689
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-pgw-test: Log stdout to find crashes
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/27687 )
Change subject: ttcn3-pgw-test: Log stdout to find crashes
..
ttcn3-pgw-test: Log stdout to find crashes
Change-Id: I573637866787ce1f613bd56a009251578c98cbf3
---
M ttcn3-pgw-test/jenkins.sh
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/87/27687/1
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index bd6967c..ef10f41 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -42,7 +42,7 @@
--name ${BUILD_TAG}-upf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- open5gs-upfd -c /data/open5gs-upf.yaml
+ /bin/sh -c "open5gs-upfd -c /data/open5gs-upf.yaml
>/data/open5gs-upfd.out 2>&1"
# configure the 'ogstun' device for open5gs-upfd
docker exec${BUILD_TAG}-upf /data/ogstun-setup.sh
@@ -58,7 +58,7 @@
--name ${BUILD_TAG}-smf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- open5gs-smfd -c /data/open5gs-smf.yaml
+ /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
# start container with osmo-ugcups-daemon in background; SYS_ADMIN required
for CLONE_NEWNS
docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27687
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I573637866787ce1f613bd56a009251578c98cbf3
Gerrit-Change-Number: 27687
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27684 ) Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Gerrit-Change-Number: 27684 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 07 Apr 2022 17:50:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/27690 )
Change subject: ttcn3-pgw-tests: use same bootstrap for upfd as in
ttcn-ggsn-tests-ogs
..
ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs
This approach has several benefits:
* We end up with ip/tun setup output in the same log file as
open5gs-upfd process output.
* We configure all ip/tun *before* the open5gs-upfd process starts.
Furthermore, we have same procedure as in ttcn3-ggsn-tests-ogs, which
simplifies maintainment/use.
The IP address pool for UEs is still different in pgw-tests and
ggsn-tests-ogs. We can make them the same in subsequent patches.
Change-Id: I94219abbeb5e004ce707407b5aa5ee8ad6c3a80e
---
M ttcn3-pgw-test/jenkins.sh
D ttcn3-pgw-test/ogstun-setup.sh
M ttcn3-pgw-test/open5gs-smf.yaml
M ttcn3-pgw-test/open5gs-upf.yaml
A ttcn3-pgw-test/upfd-setup.sh
A ttcn3-pgw-test/upfd.sh
6 files changed, 40 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/90/27690/1
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index 7205af2..bb4b0b1 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -16,7 +16,8 @@
mkdir $VOL_BASE_DIR/pgw
cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/
cp open5gs-*.yaml $VOL_BASE_DIR/pgw/
-cp ogstun-setup.sh $VOL_BASE_DIR/pgw/
+cp ogs/upfd.sh $VOL_BASE_DIR/pgw/
+cp ogs/upfd-setup.sh $VOL_BASE_DIR/pgw/
SUBNET=18
network_create $SUBNET
@@ -42,10 +43,7 @@
--name ${BUILD_TAG}-upf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-upfd -c /data/open5gs-upf.yaml
>/data/open5gs-upfd.out 2>&1"
-
-# configure the 'ogstun' device for open5gs-upfd
-docker exec${BUILD_TAG}-upf /data/ogstun-setup.sh
+ /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml
>/data/open5gs-upfd.out 2>&1"
# start container with open5gs-smfd in background
docker run --cap-add=NET_ADMIN \
diff --git a/ttcn3-pgw-test/ogstun-setup.sh b/ttcn3-pgw-test/ogstun-setup.sh
deleted file mode 100755
index 58693fd..000
--- a/ttcn3-pgw-test/ogstun-setup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if ! grep "ogstun" /proc/net/dev > /dev/null; then
-ip tuntap add name ogstun mode tun
-fi
-ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null
-ip addr add 10.45.0.1/16 dev ogstun
-ip addr del cafe::1/64 dev ogstun 2> /dev/null
-ip addr add cafe::1/64 dev ogstun
-ip link set ogstun up
diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml
index ee88407..57a145e 100644
--- a/ttcn3-pgw-test/open5gs-smf.yaml
+++ b/ttcn3-pgw-test/open5gs-smf.yaml
@@ -339,7 +339,9 @@
- addr: 172.18.18.4
subnet:
- addr: 10.45.0.1/16
+dnn: internet
- addr: cafe::1/64
+dnn: internet
dns:
- 8.8.8.8
- 8.8.4.4
diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf.yaml
index 735d121..28092a5 100644
--- a/ttcn3-pgw-test/open5gs-upf.yaml
+++ b/ttcn3-pgw-test/open5gs-upf.yaml
@@ -155,7 +155,11 @@
- addr: 172.18.18.7
subnet:
- addr: 10.45.0.1/16
+dnn: internet
+dev: ogstun46
- addr: cafe::1/64
+dnn: internet
+dev: ogstun46
#
# smf:
diff --git a/ttcn3-pgw-test/upfd-setup.sh b/ttcn3-pgw-test/upfd-setup.sh
new file mode 100755
index 000..8c0687b
--- /dev/null
+++ b/ttcn3-pgw-test/upfd-setup.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+create_tun() {
+name="$1"
+if ! grep "$name" /proc/net/dev > /dev/null; then
+ip tuntap add name $name mode tun
+fi
+}
+
+add_addr() {
+name="$1"
+addr="$2"
+ip addr del "$addr" dev "$name" 2> /dev/null
+ip addr add "$addr" dev "$name"
+}
+
+create_tun "ogstun4"
+create_tun "ogstun6"
+create_tun "ogstun46"
+
+add_addr "ogstun46" "10.45.0.1/16"
+add_addr "ogstun46" "cafe::1/64"
+
+ip link set ogstun4 up
+ip link set ogstun6 up
+ip link set ogstun46 up
diff --git a/ttcn3-pgw-test/upfd.sh b/ttcn3-pgw-test/upfd.sh
new file mode 100644
index 000..efbabfb
--- /dev/null
+++ b/ttcn3-pgw-test/upfd.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+set -x
+/data/upfd-setup.sh
+su - osmocom -c "open5gs-upfd $*"
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27690
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I94219abbeb5e004ce707407b5aa5ee8ad6c3a80e
Gerrit-Change-Number: 27690
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-pgw-test: Log stdout to find crashes
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27687 ) Change subject: ttcn3-pgw-test: Log stdout to find crashes .. Patch Set 1: (1 comment) Patchset: PS1: > Please edit the configuration files and disable logging to a file there. […] do you know how to disable logging? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I573637866787ce1f613bd56a009251578c98cbf3 Gerrit-Change-Number: 27687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 07 Apr 2022 18:21:19 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/27690 to look at the new patch set (#2). Change subject: ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs .. ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs This approach has several benefits: * We end up with ip/tun setup output in the same log file as open5gs-upfd process output. * We configure all ip/tun *before* the open5gs-upfd process starts. Furthermore, we have same procedure as in ttcn3-ggsn-tests-ogs, which simplifies maintainment/use. The IP address pool for UEs is still different in pgw-tests and ggsn-tests-ogs. We can make them the same in subsequent patches. Change-Id: I94219abbeb5e004ce707407b5aa5ee8ad6c3a80e --- M ttcn3-pgw-test/jenkins.sh D ttcn3-pgw-test/ogstun-setup.sh M ttcn3-pgw-test/open5gs-smf.yaml M ttcn3-pgw-test/open5gs-upf.yaml A ttcn3-pgw-test/upfd-setup.sh A ttcn3-pgw-test/upfd.sh 6 files changed, 40 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/27690/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I94219abbeb5e004ce707407b5aa5ee8ad6c3a80e Gerrit-Change-Number: 27690 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in docker-playground[master]: ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/27690 to look at the new patch set (#3). Change subject: ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs .. ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs This approach has several benefits: * We end up with ip/tun setup output in the same log file as open5gs-upfd process output. * We configure all ip/tun *before* the open5gs-upfd process starts. Furthermore, we have same procedure as in ttcn3-ggsn-tests-ogs, which simplifies maintainment/use. The IP address pool for UEs is still different in pgw-tests and ggsn-tests-ogs. We can make them the same in subsequent patches. Change-Id: I94219abbeb5e004ce707407b5aa5ee8ad6c3a80e --- M ttcn3-pgw-test/jenkins.sh D ttcn3-pgw-test/ogstun-setup.sh M ttcn3-pgw-test/open5gs-smf.yaml M ttcn3-pgw-test/open5gs-upf.yaml A ttcn3-pgw-test/upfd-setup.sh A ttcn3-pgw-test/upfd.sh 6 files changed, 40 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/27690/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I94219abbeb5e004ce707407b5aa5ee8ad6c3a80e Gerrit-Change-Number: 27690 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in docker-playground[master]: ttcn3-pgw-test: Log open5gs-nrfd stdout/stderr
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/27691 )
Change subject: ttcn3-pgw-test: Log open5gs-nrfd stdout/stderr
..
ttcn3-pgw-test: Log open5gs-nrfd stdout/stderr
This way we see potential crashes.
Change-Id: I31f2ff2dd5daa68756e910c4cb91acefdad50cb1
---
M ttcn3-pgw-test/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/91/27691/1
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index f336e1b..b30d050 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -30,7 +30,7 @@
--name ${BUILD_TAG}-nrf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- open5gs-nrfd -c /data/open5gs-nrf.yaml
+ /bin/sh -c "open5gs-nrfd -c /data/open5gs-nrf.yaml
>/data/open5gs-nrf.out 2>&1"
# start container with open5gs-upfd in background
docker run --cap-add=NET_ADMIN \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27691
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I31f2ff2dd5daa68756e910c4cb91acefdad50cb1
Gerrit-Change-Number: 27691
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-{ggsn,pgw}-test: Avoid open5gs itself logging to a file
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/27692 )
Change subject: ttcn3-{ggsn,pgw}-test: Avoid open5gs itself logging to a file
..
ttcn3-{ggsn,pgw}-test: Avoid open5gs itself logging to a file
We already log stdout/stderr to a file, so there's no need to log a file
internally. We prefer logging that through stdout/stderr in order to
catch more stuff, like segfaults.
Change-Id: Ifdc010f26abdc8cefeec0c72a1f617911ec375d7
---
M ttcn3-ggsn-test/ogs/open5gs-smf.yaml
M ttcn3-ggsn-test/ogs/open5gs-upf.yaml
M ttcn3-pgw-test/open5gs-nrf.yaml
M ttcn3-pgw-test/open5gs-smf.yaml
M ttcn3-pgw-test/open5gs-upf.yaml
5 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/92/27692/1
diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
index 1c8e284..0751ab5 100644
--- a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
+++ b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
@@ -19,7 +19,6 @@
#domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock
#
logger:
-file: /data/open5gs-smfd.log
level: info
#
# smf:
diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
index aa64613..96368b7 100644
--- a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
+++ b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
@@ -19,7 +19,6 @@
#domain: core,pfcp,gtp,upf,event,tlv,mem,sock
#
logger:
-file: /data/open5gs-upfd.log
level: info
#
diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf.yaml
index 2680098..4743377 100644
--- a/ttcn3-pgw-test/open5gs-nrf.yaml
+++ b/ttcn3-pgw-test/open5gs-nrf.yaml
@@ -21,7 +21,7 @@
#domain: core,sbi,nrf,event,mem,sock
#
logger:
-file: /data/open5gs-nrfd.log
+level: info
#
# nrf:
diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml
index 57a145e..5e8cf1b 100644
--- a/ttcn3-pgw-test/open5gs-smf.yaml
+++ b/ttcn3-pgw-test/open5gs-smf.yaml
@@ -19,7 +19,7 @@
#domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock
#
logger:
-file: /data/open5gs-smfd.log
+level: info
#
# smf:
#
diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf.yaml
index 28092a5..10fe4d4 100644
--- a/ttcn3-pgw-test/open5gs-upf.yaml
+++ b/ttcn3-pgw-test/open5gs-upf.yaml
@@ -19,7 +19,7 @@
#domain: core,pfcp,gtp,upf,event,tlv,mem,sock
#
logger:
-file: /data/open5gs-upfd.log
+level: info
#
# upf:
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27692
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ifdc010f26abdc8cefeec0c72a1f617911ec375d7
Gerrit-Change-Number: 27692
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-pgw-test: Log stdout to find crashes
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27687 ) Change subject: ttcn3-pgw-test: Log stdout to find crashes .. Patch Set 1: (1 comment) Patchset: PS1: > We agreed to disable it in a separate change, using '/dev/null'. Done here https://gerrit.osmocom.org/c/docker-playground/+/27692/1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I573637866787ce1f613bd56a009251578c98cbf3 Gerrit-Change-Number: 27687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 07 Apr 2022 18:46:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-ggsn-ogs: Rename config files
pespin has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/27686 )
Change subject: ttcn3-ggsn-ogs: Rename config files
..
ttcn3-ggsn-ogs: Rename config files
Let's make names similar to what's used in PGW_Tests. Also, in
open5gs.git, config files don't contain the "d" at the end.
Change-Id: If56d1a890a4f1b80b4f04ae22644f9cb9cdd35f4
---
M ttcn3-ggsn-test/jenkins-ogs.sh
R ttcn3-ggsn-test/ogs/open5gs-smf.yaml
R ttcn3-ggsn-test/ogs/open5gs-upf.yaml
3 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh
index 172821f..205abbc 100755
--- a/ttcn3-ggsn-test/jenkins-ogs.sh
+++ b/ttcn3-ggsn-test/jenkins-ogs.sh
@@ -19,8 +19,7 @@
write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg"
mkdir $VOL_BASE_DIR/ggsn
-cp ogs/smfd.yaml $VOL_BASE_DIR/ggsn/
-cp ogs/upfd.yaml $VOL_BASE_DIR/ggsn/
+cp ogs/open5gs-*.yaml $VOL_BASE_DIR/ggsn/
cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/
cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/
cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/
@@ -39,7 +38,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 201) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-smfd -c /data/smfd.yaml
>/data/open5gs-smfd.out 2>&1"
+ /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
docker run --cap-add=NET_ADMIN \
--device /dev/net/tun:/dev/net/tun \
@@ -51,7 +50,7 @@
$DOCKER_ARGS \
$(docker_network_params $SUBNET 222) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "/data/upfd.sh -c /data/upfd.yaml
>/data/open5gs-upfd.out 2>&1"
+ /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml
>/data/open5gs-upfd.out 2>&1"
# start docker container with testsuite in foreground
docker run --rm \
@@ -63,4 +62,3 @@
--name ${BUILD_TAG}-ggsn-test \
$DOCKER_ARGS \
$REPO_USER/ttcn3-ggsn-test
-
diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml
b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/smfd.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-smf.yaml
diff --git a/ttcn3-ggsn-test/ogs/upfd.yaml
b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
similarity index 100%
rename from ttcn3-ggsn-test/ogs/upfd.yaml
rename to ttcn3-ggsn-test/ogs/open5gs-upf.yaml
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27686
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If56d1a890a4f1b80b4f04ae22644f9cb9cdd35f4
Gerrit-Change-Number: 27686
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-pgw-test: Log stdout to find crashes
pespin has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/27687 )
Change subject: ttcn3-pgw-test: Log stdout to find crashes
..
ttcn3-pgw-test: Log stdout to find crashes
Change-Id: I573637866787ce1f613bd56a009251578c98cbf3
---
M ttcn3-pgw-test/jenkins.sh
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index bd6967c..ef10f41 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -42,7 +42,7 @@
--name ${BUILD_TAG}-upf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- open5gs-upfd -c /data/open5gs-upf.yaml
+ /bin/sh -c "open5gs-upfd -c /data/open5gs-upf.yaml
>/data/open5gs-upfd.out 2>&1"
# configure the 'ogstun' device for open5gs-upfd
docker exec${BUILD_TAG}-upf /data/ogstun-setup.sh
@@ -58,7 +58,7 @@
--name ${BUILD_TAG}-smf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- open5gs-smfd -c /data/open5gs-smf.yaml
+ /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
# start container with osmo-ugcups-daemon in background; SYS_ADMIN required
for CLONE_NEWNS
docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27687
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I573637866787ce1f613bd56a009251578c98cbf3
Gerrit-Change-Number: 27687
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-pgw-test: Use process name in log file
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27688 ) Change subject: ttcn3-pgw-test: Use process name in log file .. ttcn3-pgw-test: Use process name in log file This way it becomes similar to what we use in ttcn3-ggsn-tests-ogs. Change-Id: Ibac0e6bc9dc7c2e576a4f5d1ccb730211d1e1427 --- M ttcn3-pgw-test/open5gs-nrf.yaml M ttcn3-pgw-test/open5gs-smf.yaml M ttcn3-pgw-test/open5gs-upf.yaml 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf.yaml index 3deec92..2680098 100644 --- a/ttcn3-pgw-test/open5gs-nrf.yaml +++ b/ttcn3-pgw-test/open5gs-nrf.yaml @@ -21,7 +21,7 @@ #domain: core,sbi,nrf,event,mem,sock # logger: -file: /data/open5gs-nrf.log +file: /data/open5gs-nrfd.log # # nrf: diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml index 5b8384b..ee88407 100644 --- a/ttcn3-pgw-test/open5gs-smf.yaml +++ b/ttcn3-pgw-test/open5gs-smf.yaml @@ -19,7 +19,7 @@ #domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock # logger: -file: /data/open5gs-smf.log +file: /data/open5gs-smfd.log # # smf: # diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf.yaml index e051d31..735d121 100644 --- a/ttcn3-pgw-test/open5gs-upf.yaml +++ b/ttcn3-pgw-test/open5gs-upf.yaml @@ -19,7 +19,7 @@ #domain: core,pfcp,gtp,upf,event,tlv,mem,sock # logger: -file: /data/open5gs-upf.log +file: /data/open5gs-upfd.log # # upf: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibac0e6bc9dc7c2e576a4f5d1ccb730211d1e1427 Gerrit-Change-Number: 27688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-{pgw,ggsn}-tests: Add comment with procedure to get open5gs-smf...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/27689 )
Change subject: ttcn3-{pgw,ggsn}-tests: Add comment with procedure to get
open5gs-smfd bt automatically
..
ttcn3-{pgw,ggsn}-tests: Add comment with procedure to get open5gs-smfd bt
automatically
Some specific gdb commands need to be run in open5gs-smfd to get the
desired result (some signals need to be ignored).
gdb use is not enabled by default. Furthermore, if one wants to use it,
editing the Dockerfile to install gdb is required.
Change-Id: I1ac8b77e84d57040fc09964356bc8a01e5d721e3
---
M ttcn3-ggsn-test/jenkins-ogs.sh
M ttcn3-pgw-test/jenkins.sh
2 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh
index 205abbc..b6500f0 100755
--- a/ttcn3-ggsn-test/jenkins-ogs.sh
+++ b/ttcn3-ggsn-test/jenkins-ogs.sh
@@ -39,6 +39,8 @@
$(docker_network_params $SUBNET 201) \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
/bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
+ #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex
'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
+ #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes
--show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c
/data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1"
docker run --cap-add=NET_ADMIN \
--device /dev/net/tun:/dev/net/tun \
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index ef10f41..7205af2 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -59,6 +59,7 @@
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
/bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
+ #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex
'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml
>/data/open5gs-smfd.out 2>&1"
# start container with osmo-ugcups-daemon in background; SYS_ADMIN required
for CLONE_NEWNS
docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27689
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I1ac8b77e84d57040fc09964356bc8a01e5d721e3
Gerrit-Change-Number: 27689
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs
pespin has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/27690 )
Change subject: ttcn3-pgw-tests: use same bootstrap for upfd as in
ttcn-ggsn-tests-ogs
..
ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs
This approach has several benefits:
* We end up with ip/tun setup output in the same log file as
open5gs-upfd process output.
* We configure all ip/tun *before* the open5gs-upfd process starts.
Furthermore, we have same procedure as in ttcn3-ggsn-tests-ogs, which
simplifies maintainment/use.
The IP address pool for UEs is still different in pgw-tests and
ggsn-tests-ogs. We can make them the same in subsequent patches.
Change-Id: I94219abbeb5e004ce707407b5aa5ee8ad6c3a80e
---
M ttcn3-pgw-test/jenkins.sh
D ttcn3-pgw-test/ogstun-setup.sh
M ttcn3-pgw-test/open5gs-smf.yaml
M ttcn3-pgw-test/open5gs-upf.yaml
A ttcn3-pgw-test/upfd-setup.sh
A ttcn3-pgw-test/upfd.sh
6 files changed, 40 insertions(+), 15 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index 7205af2..f336e1b 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -16,7 +16,8 @@
mkdir $VOL_BASE_DIR/pgw
cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/
cp open5gs-*.yaml $VOL_BASE_DIR/pgw/
-cp ogstun-setup.sh $VOL_BASE_DIR/pgw/
+cp upfd.sh $VOL_BASE_DIR/pgw/
+cp upfd-setup.sh $VOL_BASE_DIR/pgw/
SUBNET=18
network_create $SUBNET
@@ -42,10 +43,7 @@
--name ${BUILD_TAG}-upf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- /bin/sh -c "open5gs-upfd -c /data/open5gs-upf.yaml
>/data/open5gs-upfd.out 2>&1"
-
-# configure the 'ogstun' device for open5gs-upfd
-docker exec${BUILD_TAG}-upf /data/ogstun-setup.sh
+ /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml
>/data/open5gs-upfd.out 2>&1"
# start container with open5gs-smfd in background
docker run --cap-add=NET_ADMIN \
diff --git a/ttcn3-pgw-test/ogstun-setup.sh b/ttcn3-pgw-test/ogstun-setup.sh
deleted file mode 100755
index 58693fd..000
--- a/ttcn3-pgw-test/ogstun-setup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if ! grep "ogstun" /proc/net/dev > /dev/null; then
-ip tuntap add name ogstun mode tun
-fi
-ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null
-ip addr add 10.45.0.1/16 dev ogstun
-ip addr del cafe::1/64 dev ogstun 2> /dev/null
-ip addr add cafe::1/64 dev ogstun
-ip link set ogstun up
diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml
index ee88407..57a145e 100644
--- a/ttcn3-pgw-test/open5gs-smf.yaml
+++ b/ttcn3-pgw-test/open5gs-smf.yaml
@@ -339,7 +339,9 @@
- addr: 172.18.18.4
subnet:
- addr: 10.45.0.1/16
+dnn: internet
- addr: cafe::1/64
+dnn: internet
dns:
- 8.8.8.8
- 8.8.4.4
diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf.yaml
index 735d121..28092a5 100644
--- a/ttcn3-pgw-test/open5gs-upf.yaml
+++ b/ttcn3-pgw-test/open5gs-upf.yaml
@@ -155,7 +155,11 @@
- addr: 172.18.18.7
subnet:
- addr: 10.45.0.1/16
+dnn: internet
+dev: ogstun46
- addr: cafe::1/64
+dnn: internet
+dev: ogstun46
#
# smf:
diff --git a/ttcn3-pgw-test/upfd-setup.sh b/ttcn3-pgw-test/upfd-setup.sh
new file mode 100755
index 000..8c0687b
--- /dev/null
+++ b/ttcn3-pgw-test/upfd-setup.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+create_tun() {
+name="$1"
+if ! grep "$name" /proc/net/dev > /dev/null; then
+ip tuntap add name $name mode tun
+fi
+}
+
+add_addr() {
+name="$1"
+addr="$2"
+ip addr del "$addr" dev "$name" 2> /dev/null
+ip addr add "$addr" dev "$name"
+}
+
+create_tun "ogstun4"
+create_tun "ogstun6"
+create_tun "ogstun46"
+
+add_addr "ogstun46" "10.45.0.1/16"
+add_addr "ogstun46" "cafe::1/64"
+
+ip link set ogstun4 up
+ip link set ogstun6 up
+ip link set ogstun46 up
diff --git a/ttcn3-pgw-test/upfd.sh b/ttcn3-pgw-test/upfd.sh
new file mode 100755
index 000..efbabfb
--- /dev/null
+++ b/ttcn3-pgw-test/upfd.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+set -x
+/data/upfd-setup.sh
+su - osmocom -c "open5gs-upfd $*"
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27690
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I94219abbeb5e004ce707407b5aa5ee8ad6c3a80e
Gerrit-Change-Number: 27690
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-{ggsn,pgw}-test: Avoid open5gs itself logging to a file
pespin has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/27692 )
Change subject: ttcn3-{ggsn,pgw}-test: Avoid open5gs itself logging to a file
..
ttcn3-{ggsn,pgw}-test: Avoid open5gs itself logging to a file
We already log stdout/stderr to a file, so there's no need to log a file
internally. We prefer logging that through stdout/stderr in order to
catch more stuff, like segfaults.
Change-Id: Ifdc010f26abdc8cefeec0c72a1f617911ec375d7
---
M ttcn3-ggsn-test/ogs/open5gs-smf.yaml
M ttcn3-ggsn-test/ogs/open5gs-upf.yaml
M ttcn3-pgw-test/open5gs-nrf.yaml
M ttcn3-pgw-test/open5gs-smf.yaml
M ttcn3-pgw-test/open5gs-upf.yaml
5 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
index 1c8e284..0751ab5 100644
--- a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
+++ b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml
@@ -19,7 +19,6 @@
#domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock
#
logger:
-file: /data/open5gs-smfd.log
level: info
#
# smf:
diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
index aa64613..96368b7 100644
--- a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
+++ b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml
@@ -19,7 +19,6 @@
#domain: core,pfcp,gtp,upf,event,tlv,mem,sock
#
logger:
-file: /data/open5gs-upfd.log
level: info
#
diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf.yaml
index 2680098..4743377 100644
--- a/ttcn3-pgw-test/open5gs-nrf.yaml
+++ b/ttcn3-pgw-test/open5gs-nrf.yaml
@@ -21,7 +21,7 @@
#domain: core,sbi,nrf,event,mem,sock
#
logger:
-file: /data/open5gs-nrfd.log
+level: info
#
# nrf:
diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml
index 57a145e..5e8cf1b 100644
--- a/ttcn3-pgw-test/open5gs-smf.yaml
+++ b/ttcn3-pgw-test/open5gs-smf.yaml
@@ -19,7 +19,7 @@
#domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock
#
logger:
-file: /data/open5gs-smfd.log
+level: info
#
# smf:
#
diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf.yaml
index 28092a5..10fe4d4 100644
--- a/ttcn3-pgw-test/open5gs-upf.yaml
+++ b/ttcn3-pgw-test/open5gs-upf.yaml
@@ -19,7 +19,7 @@
#domain: core,pfcp,gtp,upf,event,tlv,mem,sock
#
logger:
-file: /data/open5gs-upfd.log
+level: info
#
# upf:
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27692
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ifdc010f26abdc8cefeec0c72a1f617911ec375d7
Gerrit-Change-Number: 27692
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-pgw-test: Log open5gs-nrfd stdout/stderr
pespin has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/27691 )
Change subject: ttcn3-pgw-test: Log open5gs-nrfd stdout/stderr
..
ttcn3-pgw-test: Log open5gs-nrfd stdout/stderr
This way we see potential crashes.
Change-Id: I31f2ff2dd5daa68756e910c4cb91acefdad50cb1
---
M ttcn3-pgw-test/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index f336e1b..b30d050 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -30,7 +30,7 @@
--name ${BUILD_TAG}-nrf -d \
$DOCKER_ARGS \
$REPO_USER/open5gs-$IMAGE_SUFFIX \
- open5gs-nrfd -c /data/open5gs-nrf.yaml
+ /bin/sh -c "open5gs-nrfd -c /data/open5gs-nrf.yaml
>/data/open5gs-nrf.out 2>&1"
# start container with open5gs-upfd in background
docker run --cap-add=NET_ADMIN \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27691
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I31f2ff2dd5daa68756e910c4cb91acefdad50cb1
Gerrit-Change-Number: 27691
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bsc[master]: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27694 ) Change subject: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3d4b481cbfacf27004787616e22b6f8a863b47b Gerrit-Change-Number: 27694 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 08 Apr 2022 09:52:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: Move power control related definitions to power_control.h
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27695 ) Change subject: Move power control related definitions to power_control.h .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1cb3f6bfba0306e8f371dcd5162d1813beb3a088 Gerrit-Change-Number: 27695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 08 Apr 2022 09:52:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697 ) Change subject: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up .. Patch Set 1: (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697/comment/966c28f7_726ca039 PS1, Line 3047: timer T1 := 9.0 * 1.92; You may need to leave some extra offset to avoid timing race conditions? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697 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: I9266f7284fcdb0afa3473f575640689e334e89a8 Gerrit-Change-Number: 27697 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 08 Apr 2022 09:53:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27696 ) Change subject: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If7c804e51eb104d9fe73294a3867ab3b551d83c3 Gerrit-Change-Number: 27696 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 08 Apr 2022 09:54:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
Attention is currently required from: neels, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27684 ) Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Gerrit-Change-Number: 27684 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 08 Apr 2022 12:27:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_tchf_fn(): clarify indexes in the AMR CMI lookup table
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27700 ) Change subject: osmo-bts-trx: rx_tchf_fn(): clarify indexes in the AMR CMI lookup table .. Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/27700/comment/9f0f524b_18df8211 PS1, Line 58: [16] = 1, /* TCH/F: a=8 / h=16 */ shouldn't this be 15 instead of 16? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If81ff0bd449fe20da43cc3d96dadf38568507054 Gerrit-Change-Number: 27700 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 08 Apr 2022 16:21:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: move AMR CMI lookup tables to the respective files
Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27698 ) Change subject: osmo-bts-trx: move AMR CMI lookup tables to the respective files .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibdebfb9b1ef78c960b08240ebdb4c7af92cbed11 Gerrit-Change-Number: 27698 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 08 Apr 2022 16:21:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix indexes in the AMR CMI lookup table
Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27699 ) Change subject: osmo-bts-trx: rx_tchh_fn(): fix indexes in the AMR CMI lookup table .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4f22cf49fd52ed26f8017f76461059a701c181e1 Gerrit-Change-Number: 27699 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 08 Apr 2022 16:23:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc-nat[master]: bssap: make "not implemented" log msgs consistent
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27701 ) Change subject: bssap: make "not implemented" log msgs consistent .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ice8d67a30064a91d68256f43dcfb052d237e5594 Gerrit-Change-Number: 27701 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Fri, 08 Apr 2022 16:39:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
