dexter has uploaded this change for review.

View Change

eIM, REST: use template to encode eimConfigurationData

We currently use a hardcoded binary blob for the testcases that test the
addEim and updateEim eCOs. Let's use the enc_EimConfigurationData encoder
function, which we already have, to encode the eimConfigurationData
instead.

Related: SYS#8100
Change-Id: Ic51731da355cd9a209837d4015c02943367ed90b
---
M eim/REST_Types_JSON.ttcn
1 file changed, 6 insertions(+), 9 deletions(-)

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

diff --git a/eim/REST_Types_JSON.ttcn b/eim/REST_Types_JSON.ttcn
index 93168cb..32dc4e9 100644
--- a/eim/REST_Types_JSON.ttcn
+++ b/eim/REST_Types_JSON.ttcn
@@ -10,6 +10,10 @@
 
 module REST_Types_JSON {
 
+import from SGP32Definitions all;
+import from SGP32Definitions_Types all;
+import from SGP32Definitions_Templates all;
+
 type record JSON_REST_download {
        charstring activationCode
 };
@@ -262,16 +266,9 @@
 	order := { psmo := { { configureImmediateEnable := { immediateEnableFlag := true, defaultSmdpOid := objid {1 2 3}, defaultSmdpAddress := "smdp.example.com" } } } }
 }
 
-const octetstring eimConfigurationData :=
-'3079800465494D32810E3132372E302E302E313A383030308301018401FF
-A55BA059301306072A8648CE3D020106082A8648CE3D03010703420004FE
-584A6F450459574AECA195D0299737F74C89BA2D36DF9286EC25D973037A
-0FBA70D14DF3E1F7D0A305E57B95B731C4DE218D2D7F9F22113ED5D18C2E
-3DDF1C'O
-
 template (value) JSON_REST_Resource ts_JSON_REST_eco_order_addEim(octetstring eidValue) := {
 	eidValue := oct2str(eidValue),
-	order := { eco := { { addEim := { eimConfigurationData := eimConfigurationData } } } }
+	order := { eco := { { addEim := { eimConfigurationData := enc_EimConfigurationData(valueof(ts_eimConfigurationData("127.0.0.1"))) } } } }
 }
 
 template (value) JSON_REST_Resource ts_JSON_REST_eco_order_deleteEim(octetstring eidValue) := {
@@ -281,7 +278,7 @@
 
 template (value) JSON_REST_Resource ts_JSON_REST_eco_order_updateEim(octetstring eidValue) := {
 	eidValue := oct2str(eidValue),
-	order := { eco := { { updateEim := { eimConfigurationData := eimConfigurationData } } } }
+	order := { eco := { { updateEim := { eimConfigurationData := enc_EimConfigurationData(valueof(ts_eimConfigurationData("127.0.0.1"))) } } } }
 }
 
 template (value) JSON_REST_Resource ts_JSON_REST_eco_order_listEim(octetstring eidValue) := {

To view, visit change 42957. To unsubscribe, or for help writing mail filters, visit settings.