osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40037?usp=email )

Change subject: Revert "hnbgw: Support configuring RAC on each hnb conn" ......................................................................

Revert "hnbgw: Support configuring RAC on each hnb conn"

This reverts commit 4e4398aac6d19fe16c40be88290e0da08588fd2d: caused regression in several other tests.

Related: OS#6762 Change-Id: I077c584219bfa54468bd796a1fc2e85fd60b7a02 --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 2 insertions(+), 4 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/40037/1

diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index 90d264d..efba060 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -227,7 +227,6 @@

type record HnbConfig { LocationAreaIdentification lai, - uint8_t rac, integer sac }

@@ -480,7 +479,7 @@ } var template RANAP_PDU ret; if (pars.ps_domain) { - var RANAP_IEs.RAC rac := int2oct(pars.hnb.rac, 1); + var RANAP_IEs.RAC rac := '00'O; ret := ts_RANAP_initialUE_PS(lai, rac, sai, nas, pars.sigc_id, grnc_id); } else { ret := ts_RANAP_initialUE_CS(lai, sai, nas, pars.sigc_id, grnc_id); diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 862bff9..e18cff1 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -501,7 +501,6 @@ mcc_mnc := '00F110'H, lac := 2342 + i }, - rac := 11 + i, sac := 55 }; f_init_hnodeb(testcasename(), i, rua_ops); @@ -677,7 +676,7 @@ hex2oct(g_hnb_cfg[hnb_idx].lai.mcc_mnc), int2bit(1 + cell_id, 28), int2oct(g_hnb_cfg[hnb_idx].lai.lac, 2), - int2oct(g_hnb_cfg[hnb_idx].rac, 1), + int2oct(0, 1), int2oct(g_hnb_cfg[hnb_idx].sac, 2)));

T.start;