pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40785?usp=email )
Change subject: library: Comment out debugging for NGAP/5G-NAS
......................................................................
library: Comment out debugging for NGAP/5G-NAS
The current NGAP and 5G auth code is now working fine, so disable debug
logging. Keep it commented out so it can be re-enabled at any time if
some related topic needs to be debugged (will eventually happen).
Change-Id: I4250766644742f0fd11ca5e24b1a1a581dc81b4b
---
M library/NGAP_Emulation.ttcn
M library/milenage/milenage.c
2 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/40785/1
diff --git a/library/NGAP_Emulation.ttcn b/library/NGAP_Emulation.ttcn
index 4cb2f05..9fbaddc 100644
--- a/library/NGAP_Emulation.ttcn
+++ b/library/NGAP_Emulation.ttcn
@@ -143,7 +143,7 @@
NGapExpectTable[i].amf_id := omit;
NGapExpectTable[i].ran_id := omit;
NGapExpectTable[i].vc_conn := null;
- log("Found Expect[", i, "] for ", msg, " handled at ", ret);
+ //log("Found Expect[", i, "] for ", msg, " handled at ", ret);
return ret;
}
}
@@ -222,18 +222,18 @@
template (omit) RAN_UE_NGAP_ID ran_id)
runs on NGAP_Emulation_CT return boolean {
var integer i;
- log("f_ngap_ids_known(",amf_id,", ",ran_id,")");
+ //log("f_ngap_ids_known(",amf_id,", ",ran_id,")");
for (i := 0; i < sizeof(NGapAssociationTable); i := i+1) {
- log("tbl[",i,"]: amf=", NGapAssociationTable[i].amf_ue_ngap_id,
- ", ran=", NGapAssociationTable[i].ran_ue_ngap_id);
+ //log("tbl[",i,"]: amf=", NGapAssociationTable[i].amf_ue_ngap_id,
+ // ", ran=", NGapAssociationTable[i].ran_ue_ngap_id);
/* skip empty records */
if (NGapAssociationTable[i].amf_ue_ngap_id == omit and
NGapAssociationTable[i].ran_ue_ngap_id == omit) {
- log("skipping empty ", i);
+ //log("skipping empty ", i);
continue;
}
if (NGapAssociationTable[i].amf_ue_ngap_id == omit) {
- log("entry ", i, " has no AMF ID yet (ran=", NGapAssociationTable[i].ran_ue_ngap_id);
+ //log("entry ", i, " has no AMF ID yet (ran=", NGapAssociationTable[i].ran_ue_ngap_id);
/* Table doesn't yet know the AMF side ID, let's look-up only
* based on the eNB side ID */
if (match(NGapAssociationTable[i].ran_ue_ngap_id, ran_id)) {
diff --git a/library/milenage/milenage.c b/library/milenage/milenage.c
index d079a3d..f7a6f74 100644
--- a/library/milenage/milenage.c
+++ b/library/milenage/milenage.c
@@ -90,7 +90,7 @@
return 0;
}
-#define DEBUG
+//#define DEBUG
#ifdef DEBUG
void hexdump(const char *text, const uint8_t *data, int len)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40785?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4250766644742f0fd11ca5e24b1a1a581dc81b4b
Gerrit-Change-Number: 40785
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/40783?usp=email )
Change subject: Revert "ttcn3-bts-test: do not use respawn.sh"
......................................................................
Revert "ttcn3-bts-test: do not use respawn.sh"
This reverts commit 57f680439f378f5bb5c6582297ae0636db6650f8.
We're observing a lot of turbulence in ttcn3-bts-test due to the
clock instability:
Shutting down BTS, exit 1, reason: PC clock skew too high
Even though it's no longer necessary to respawn osmo-bts-trx,
let's restore the respawn.sh to recover from such failures.
Related: OS#6794
Change-Id: I1177e9068c49bf31a4010cd21700839dfa8d5050
---
M ttcn3-bts-test/jenkins.sh
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index edb7030..5d5629d 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -44,6 +44,7 @@
start_bts() {
local variant
variant="$1"
+ sleep_time_respawn="$2"
echo Starting container with BTS
if [ -z "$variant" ]; then
echo ERROR: You have to specify a BTS variant
@@ -56,10 +57,11 @@
--ulimit core=-1 \
-v $VOL_BASE_DIR/bts:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
+ -e "SLEEP_BEFORE_RESPAWN=$sleep_time_respawn" \
--name ${BUILD_TAG}-bts -d \
$DOCKER_ARGS \
$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
- /bin/sh -c "osmo-bts-$variant -c /data/osmo-bts.gen.cfg >>/data/osmo-bts.log 2>&1"
+ /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-$variant -c /data/osmo-bts.gen.cfg >>/data/osmo-bts.log 2>&1"
}
start_fake_trx() {
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/40783?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I1177e9068c49bf31a4010cd21700839dfa8d5050
Gerrit-Change-Number: 40783
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>