Change in osmo-ttcn3-hacks[master]: library: get rid of Si1RestOctets and Si3RestOctets

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18011 )

Change subject: library: get rid of Si1RestOctets and Si3RestOctets
......................................................................

library: get rid of Si1RestOctets and Si3RestOctets

Both are basically sub-types of GSM_RR_Types.RestOctets with length
constraints. We don't really need to have them as separate symbols,
especially since we have SI3RestOctets and SI4RestOctets now, so
let's apply these constraints within the corresponding records.

Change-Id: I2b126348ae5c5425fea4267ab2b77ea0192795ac
Signed-off-by: Vadim Yanitskiy <axilirator at gmail.com>
---
M library/GSM_SystemInformation.ttcn
1 file changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved



diff --git a/library/GSM_SystemInformation.ttcn b/library/GSM_SystemInformation.ttcn
index f1918c9..a4688cd 100644
--- a/library/GSM_SystemInformation.ttcn
+++ b/library/GSM_SystemInformation.ttcn
@@ -115,16 +115,14 @@
 		AccessControlClass acc
 	} with { variant (acc) "FIELDLENGTH(16)" };
 
-	/* 44.018 10.5.2.32 */
-	type RestOctets Si1RestOctets with { variant "FIELDLENGTH(1)" };
-	type RestOctets Si3RestOctets with { variant "FIELDLENGTH(4)" };
-
 	/* 44.018 9.1.31 */
 	type record SystemInformationType1 {
 		CellChannelDescription	cell_chan_desc,
 		RachControlParameters	rach_control,
-		Si1RestOctets		rest_octets
-	} with { variant "" };
+		RestOctets		rest_octets
+	} with {
+		variant (rest_octets) "FIELDLENGTH(1)"
+	};
 
 	/* 44.018 9.1.32 */
 	type record SystemInformationType2 {
@@ -154,8 +152,10 @@
 		CellOptions			cell_options,
 		CellSelectionParameters		cell_sel_par,
 		RachControlParameters		rach_control,
-		Si3RestOctets			rest_octets
-	} with { variant "" };
+		RestOctets			rest_octets
+	} with {
+		variant (rest_octets) "FIELDLENGTH(4)"
+	};
 
 	template SystemInformationType3 t_SI3 := {
 		cell_id := ?,

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18011
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: I2b126348ae5c5425fea4267ab2b77ea0192795ac
Gerrit-Change-Number: 18011
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200504/df34d2d9/attachment.htm>