Change in ...osmo-ttcn3-hacks[master]: CBSP: Hack to make receive templates work

[laforge]

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

Change subject: CBSP: Hack to make receive templates work
......................................................................

CBSP: Hack to make receive templates work

For some reason, the 'ifpresent' annotation doesn't work in lists
of templates.  This means we have to re-think the CBSP template
structure at some point.  However, this would be a significant detour
and I'd rather have working tests right now, so we can verify the
actual functionality merged into the BSC right now.

Change-Id: I3fa174b4352c17feaea4d33f773877104d4913c4
---
M library/CBSP_Templates.ttcn
1 file changed, 5 insertions(+), 5 deletions(-)

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



diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn
index 3c60f14..86eaf69 100644
--- a/library/CBSP_Templates.ttcn
+++ b/library/CBSP_Templates.ttcn
@@ -454,7 +454,7 @@
 		tr_CbspFailList(fail_list)
 	};
 	if (istemplatekind(compl_list, "*")) {
-		ies[lengthof(ies)] := tr_CbspNumComplList ifpresent;
+		//ies[lengthof(ies)] := tr_CbspNumComplList ifpresent;
 	} else if (istemplatekind(compl_list, "?")) {
 		ies[lengthof(ies)] := tr_CbspNumComplList(?);
 	} else if (not istemplatekind(compl_list, "omit")) {
@@ -507,14 +507,14 @@
 		tr_CbspFailList(fail_list)
 	};
 	if (istemplatekind(compl_list, "*")) {
-		ies[lengthof(ies)] := tr_CbspCellList ifpresent;
+		//ies[lengthof(ies)] := tr_CbspCellList ifpresent;
 	} else if (istemplatekind(compl_list, "?")) {
 		ies[lengthof(ies)] := tr_CbspNumComplList(?);
 	} else if (not istemplatekind(compl_list, "omit")) {
 		ies[lengthof(ies)] := tr_CbspNumComplList(compl_list);
 	}
 	if (istemplatekind(cell_list, "*")) {
-		ies[lengthof(ies)] := tr_CbspCellList ifpresent;
+		//ies[lengthof(ies)] := tr_CbspCellList ifpresent;
 	} else if (istemplatekind(cell_list, "?")) {
 		ies[lengthof(ies)] := tr_CbspCellList(?);
 	} else if (not istemplatekind(cell_list, "omit")) {
@@ -626,12 +626,12 @@
 		tr_CbspFailList(fail_list)
 	};
 	if (istemplatekind(compl_list, "*")) {
-		ies[lengthof(ies)] := tr_CbspNumComplList ifpresent;
+		//ies[lengthof(ies)] := tr_CbspNumComplList ifpresent;
 	} else if (not istemplatekind(compl_list, "omit")) {
 		ies[lengthof(ies)] := tr_CbspNumComplList(compl_list);
 	}
 	if (istemplatekind(compl_list, "*")) {
-		ies[lengthof(ies)] := tr_CbspCellList ifpresent;
+		//ies[lengthof(ies)] := tr_CbspCellList ifpresent;
 	} else if (not istemplatekind(cell_list, "omit")) {
 		ies[lengthof(ies)] := tr_CbspCellList(cell_list);
 	}

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15412
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: I3fa174b4352c17feaea4d33f773877104d4913c4
Gerrit-Change-Number: 15412
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.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/20190905/7a615611/attachment.htm>