laforge submitted this change.

View Change



1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified
V1.2: Add new error codes to EnableProfileResult, DisableProfileResult, DeleteProfileResult, AddEimResult

Reference: SGP.32 Section 2.11.2

New error code of AddEimResult is used at IoT eUICC emulation.

Related: SYS#8101
Change-Id: Idb023c994770fe4ee048da128026f566bd7fe146
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/AddEimResult.h
M src/ipa/libasn/DeleteProfileResult.h
M src/ipa/libasn/DisableProfileResult.h
M src/ipa/libasn/EnableProfileResult.h
M src/ipa/libipa/es10b_load_euicc_pkg.c
6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index c793453..1b31f80 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -211,18 +211,26 @@
ok(0),
iccidOrAidNotFound(1),
profileNotInDisabledState(2),
+ disallowedByPolicy(3),
+ catBusy(5),
+ rollbackNotAvailable(20),
undefinedError(127)
}
DisableProfileResult ::= INTEGER {
ok(0),
iccidOrAidNotFound(1),
profileNotInEnabledState(2),
+ disallowedByPolicy(3),
+ catBusy(5),
undefinedError(127)
}
DeleteProfileResult ::= INTEGER {
ok(0),
iccidOrAidNotFound(1),
profileNotInDisabledState(2),
+ disallowedByPolicy(3),
+ rollbackNotAvailable(20),
+ returnFallbackProfile(21),
undefinedError(127)
}
SGP32-ProfileInfoListResponse ::= [45] CHOICE {
@@ -257,6 +265,7 @@
addEimResultCode INTEGER {
ok(0),
insufficientMemory(1),
+ associatedEimAlreadyExists(2),
ciPKUnknown(3),
invalidAssociationToken(5),
counterValueOutOfRange(6),
diff --git a/src/ipa/libasn/AddEimResult.h b/src/ipa/libasn/AddEimResult.h
index ac93610..69aca83 100644
--- a/src/ipa/libasn/AddEimResult.h
+++ b/src/ipa/libasn/AddEimResult.h
@@ -30,6 +30,7 @@
typedef enum AddEimResult__addEimResultCode {
AddEimResult__addEimResultCode_ok = 0,
AddEimResult__addEimResultCode_insufficientMemory = 1,
+ AddEimResult__addEimResultCode_associatedEimAlreadyExists = 2,
AddEimResult__addEimResultCode_ciPKUnknown = 3,
AddEimResult__addEimResultCode_invalidAssociationToken = 5,
AddEimResult__addEimResultCode_counterValueOutOfRange = 6,
diff --git a/src/ipa/libasn/DeleteProfileResult.h b/src/ipa/libasn/DeleteProfileResult.h
index 20f06a4..8853150 100644
--- a/src/ipa/libasn/DeleteProfileResult.h
+++ b/src/ipa/libasn/DeleteProfileResult.h
@@ -23,6 +23,9 @@
DeleteProfileResult_ok = 0,
DeleteProfileResult_iccidOrAidNotFound = 1,
DeleteProfileResult_profileNotInDisabledState = 2,
+ DeleteProfileResult_disallowedByPolicy = 3,
+ DeleteProfileResult_rollbackNotAvailable = 20,
+ DeleteProfileResult_returnFallbackProfile = 21,
DeleteProfileResult_undefinedError = 127
} e_DeleteProfileResult;

diff --git a/src/ipa/libasn/DisableProfileResult.h b/src/ipa/libasn/DisableProfileResult.h
index f563caa..71528f5 100644
--- a/src/ipa/libasn/DisableProfileResult.h
+++ b/src/ipa/libasn/DisableProfileResult.h
@@ -23,6 +23,8 @@
DisableProfileResult_ok = 0,
DisableProfileResult_iccidOrAidNotFound = 1,
DisableProfileResult_profileNotInEnabledState = 2,
+ DisableProfileResult_disallowedByPolicy = 3,
+ DisableProfileResult_catBusy = 5,
DisableProfileResult_undefinedError = 127
} e_DisableProfileResult;

diff --git a/src/ipa/libasn/EnableProfileResult.h b/src/ipa/libasn/EnableProfileResult.h
index a86a8f8..17559b3 100644
--- a/src/ipa/libasn/EnableProfileResult.h
+++ b/src/ipa/libasn/EnableProfileResult.h
@@ -23,6 +23,9 @@
EnableProfileResult_ok = 0,
EnableProfileResult_iccidOrAidNotFound = 1,
EnableProfileResult_profileNotInDisabledState = 2,
+ EnableProfileResult_disallowedByPolicy = 3,
+ EnableProfileResult_catBusy = 5,
+ EnableProfileResult_rollbackNotAvailable = 20,
EnableProfileResult_undefinedError = 127
} e_EnableProfileResult;

diff --git a/src/ipa/libipa/es10b_load_euicc_pkg.c b/src/ipa/libipa/es10b_load_euicc_pkg.c
index dc09612..a86d31f 100644
--- a/src/ipa/libipa/es10b_load_euicc_pkg.c
+++ b/src/ipa/libipa/es10b_load_euicc_pkg.c
@@ -342,7 +342,7 @@
"IoT eUICC emulation active, addEim eCO failed, eIM with specified eimId already exists!\n");
euicc_result_data->choice.addEimResult.present = AddEimResult_PR_addEimResultCode;
euicc_result_data->choice.addEimResult.choice.addEimResultCode =
- AddEimResult__addEimResultCode_commandError;
+ AddEimResult__addEimResultCode_associatedEimAlreadyExists;
goto error;
}
}

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

Gerrit-MessageType: merged
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: Idb023c994770fe4ee048da128026f566bd7fe146
Gerrit-Change-Number: 43038
Gerrit-PatchSet: 2
Gerrit-Owner: jolly <andreas@eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>