Change in ...osmo-ttcn3-hacks[master]: library/GSM_RR_Types.ttcn: fix ImmediateAssignment coding regressions

[laforge]

laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15446 )

Change subject: library/GSM_RR_Types.ttcn: fix ImmediateAssignment coding regressions
......................................................................

library/GSM_RR_Types.ttcn: fix ImmediateAssignment coding regressions

Since I403d2141536303a966be7ff51b06c3de202412e6, IA Rest Octets is
a mandatory IE. When changing the definition of ts_IMM_ASS, I forgot
to mark its optional 'lh', 'hl', and 'hh' as omitted explicitly.

As a result, many of our TTCN-3 test cases were broken:

  Dynamic test case error: Using an unbound optional field.

Also, in Ifdcdcf50709fcc03195cb8ef6092977e26f910ec I added an
optional field 'pad' to record 'IaRestOctets'. That was not the
best solution, because padding should be handled transparently.

Let's get rid of that dummy field and equip both 'ImmediateAssignment'
and 'IaRestOctets' records with proper padding attributes. The later
one needs to be marked with 'CSN.1 L/H' attribute in the future, but
for now we should keep it octet-aligned.

Change-Id: I69d5fbd8e3388e287bfa54f02454d207e62ee640
---
M library/GSM_RR_Types.ttcn
1 file changed, 6 insertions(+), 4 deletions(-)

Approvals:
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn
index f313e23..b098118 100644
--- a/library/GSM_RR_Types.ttcn
+++ b/library/GSM_RR_Types.ttcn
@@ -543,13 +543,13 @@
 		IaRestOctLL	ll optional,
 		IaRestOctLH	lh optional,
 		IaRestOctHL	hl optional,
-		IaRestOctHH	hh optional,
-		bitstring	pad optional
+		IaRestOctHH	hh optional
 	} with {
 		variant (ll) "PRESENCE(presence = '00'B)"
 		variant (lh) "PRESENCE(presence = '01'B)"
 		variant (hl) "PRESENCE(presence = '10'B)"
 		variant (hh) "PRESENCE(presence = '11'B)"
+		variant "PADDING(yes), PADDING_PATTERN('00101011'B)"
 	};
 
 	type record MeasurementResults {
@@ -590,7 +590,8 @@
 		/* TODO: starting time TLV */
 		IaRestOctets			rest_octets
 	} with { variant (chan_desc) "PRESENCE(ded_or_tbf.tbf = false)"
-		 variant (pkt_chan_desc) "PRESENCE(ded_or_tbf.tbf = true)" };
+		 variant (pkt_chan_desc) "PRESENCE(ded_or_tbf.tbf = true)"
+		 variant "PADDING(168), PADDING_PATTERN('00101011'B)" };
 
 	/* 9.1.20 */
 	type record ReqRefWaitInd {
@@ -744,7 +745,8 @@
 						/* Compressed INTER RAT HO INFO: shall not be used (L)
 						 * TODO: use variant "CSN.1 L/H" to avoid confusion. */
 						compressed_irat_ho_info_ind := '1'B
-					}
+					},
+					lh := omit, hl := omit, hh := omit
 				}
 			}
 		}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15446
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: I69d5fbd8e3388e287bfa54f02454d207e62ee640
Gerrit-Change-Number: 15446
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190908/06b76773/attachment.htm>