laforge submitted this change.

View Change

eIM: re-align REST API JSON types

The data types of the REST API responses (outcome) have been
changed. This patch re-alignes the related record definitions.

Depends: onomondo-eim.git Change-Id I16cc063c185727e1b30f26d656bd15154504b087
Change-Id: I078916dd83cf9114ad5d491cb7ecc54babb957cf
Related: SYS#8100
---
M eim/REST_Types_JSON.ttcn
M eim/eIM_Tests.ttcn
2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/eim/REST_Types_JSON.ttcn b/eim/REST_Types_JSON.ttcn
index 3bbf4d7..b3a74b7 100644
--- a/eim/REST_Types_JSON.ttcn
+++ b/eim/REST_Types_JSON.ttcn
@@ -146,49 +146,57 @@
 	charstring enableResult,
 	charstring disableResult,
 	charstring deleteResult,
-	record {
-		charstring finalResult,
-		record of JSON_REST_ProfileInfo profileInfoList optional
-	} listProfileInfoResult,
+	record of JSON_REST_ProfileInfo listProfileInfoResult,
 	record of JSON_REST_ProfilePolicyAuthorisationRule getRATResult,
 	charstring configureImmediateEnableResult,
-	charstring setFallbackAttributeResult,
-	charstring unsetFallbackAttributeResult,
-	charstring setDefaultDpAddressResult,
 	record {
-	       charstring addEimResultCode,
+	       charstring addEimResultCode optional,
 	       integer associationToken optional
 	} addEimResult,
 	charstring deleteEimResult,
 	charstring updateEimResult,
-	record {
-		charstring finalResult,
-		record of JSON_REST_EimIdList eimIdList optional
-	} listEimResult,
+	record of JSON_REST_EimIdList listEimResult,
 	charstring rollbackResult,
+	charstring setFallbackAttributeResult,
+	charstring unsetFallbackAttributeResult,
 	charstring processingTerminated,
-	charstring notificationResult,
-	charstring cancelSessionResult,
+	charstring setDefaultDpAddressResult,
 	record {
-		charstring finalResult,
-		charstring iccid optional
+		charstring defaultSmdpAddress optional,
+		octetstring euiccInfo1 optional,
+		octetstring euiccInfo2 optional,
+		charstring rootSmdsAddress optional,
+		integer associationToken optional,
+		octetstring eumCertificate optional,
+		octetstring euiccCertificate optional,
+		octetstring ipaCapabilities optional,
+		octetstring deviceInfo optional,
+		octetstring notificationsList optional
+	} euiccDataResult,
+	record {
+		charstring iccid,
+		charstring aid,
+		charstring simaResponse
 	} profileInstallationResult,
 	record of JSON_REST_Euicc_State euiccStateResult,
+	charstring cancelSessionReason,
+	charstring euiccPackageError,
+	charstring ipaEuiccDataError,
+	charstring eimPackageResultError,
+	charstring initiateAuthenticationError,
+	charstring authenticateResponseError,
+	charstring authenticateClientError,
+	charstring downloadResponseError,
+	charstring getBoundProfilePackageError,
+	charstring cancelSessionResponseError,
+	charstring profileInfoListError,
+	charstring listEimError,
 	record {
-		charstring edrResult,
-		record {
-			charstring defaultSmdpAddress optional,
-			octetstring euiccInfo1 optional,
-			octetstring euiccInfo2 optional,
-			charstring rootSmdsAddress optional,
-			integer associationToken optional,
-			octetstring eumCertificate optional,
-			octetstring euiccCertificate optional,
-			octetstring ipaCapabilities optional,
-			octetstring deviceInfo optional,
-			octetstring notificationsList optional
-		} euiccData optional
-	} euiccDataResult
+		charstring BppCommandId,
+		charstring ErrorReason,
+		charstring simaResponse
+	} profileInstallationError,
+	charstring eimProcedureError
 }
 
 type record of JSON_REST_Result JSON_REST_Results;
diff --git a/eim/eIM_Tests.ttcn b/eim/eIM_Tests.ttcn
index b263eb8..410fb25 100644
--- a/eim/eIM_Tests.ttcn
+++ b/eim/eIM_Tests.ttcn
@@ -918,7 +918,7 @@
 	var template EsipaMessageFromEimToIpa esipa_res;
 	var template octetstring eimTransactionId;
 	var template JSON_REST_Results expected_outcome :=
-		{ { euiccDataResult := { edrResult := "undefinedError", euiccData := omit } } };
+		{ { ipaEuiccDataError := "undefinedError" } };
 
 	/* Create a new download at the eIM */
 	resource_id := f_rest_create_order("edr", ts_JSON_REST_edr_order(eID, '80BF20BF228384A5A688A9BF2B'O));

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