Change in osmo-ttcn3-hacks[master]: bsc: Fix f_establish_fully() for cases where we expect ASSIGN FAIL

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9468 )

Change subject: bsc: Fix f_establish_fully() for cases where we expect ASSIGN FAIL
......................................................................

bsc: Fix f_establish_fully() for cases where we expect ASSIGN FAIL

When f_ass_patch_lcls() was recently introduced during LCLS support
patches, we broke any testcases that *expected* an ASSIGNMENT FAIL
by overwriting the ASSIGNMENT FAIL with an ASSIGNMENT COMPL.

This patch fixes f_ass_patch_lcls() to only patch 'assignmentComplete'
members, if this assignmentComplete is actually chosen.

This fixes BSC_Tests.TC_assignment_fr_a5_1_codec_missing

Change-Id: I64fbf4cc3178a91913143960475a0d3758779ced
---
M bsc/MSC_ConnectionHandler.ttcn
1 file changed, 6 insertions(+), 4 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 225e86b..0846762 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -742,10 +742,12 @@
 	if (ispresent(g_pars.lcls.csc)) {
 		ass_tpl.pdu.bssmap.assignmentRequest.lCLS_ConnectionStatusControl := ts_BSSMAP_IE_LclsCsc(g_pars.lcls.csc);
 	}
-	if (ispresent(g_pars.lcls.exp_sts)) {
-		ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status := tr_BSSMAP_IE_LclsSts(g_pars.lcls.exp_sts);
-	} else {
-		ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status := omit;
+	if (ischosen(ass_cpl.pdu.bssmap.assignmentComplete)) {
+		if (ispresent(g_pars.lcls.exp_sts)) {
+			ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status := tr_BSSMAP_IE_LclsSts(g_pars.lcls.exp_sts);
+		} else {
+			ass_cpl.pdu.bssmap.assignmentComplete.lCLS_BSS_Status := omit;
+		}
 	}
 }
 

-- 
To view, visit https://gerrit.osmocom.org/9468
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I64fbf4cc3178a91913143960475a0d3758779ced
Gerrit-Change-Number: 9468
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180605/adc399b3/attachment.htm>