SGP32Definitions_Templates: improve tr/ts_provideEimPackageResult_ePRAndNotif

The template tr_provideEimPackageResult_ePRAndNotif has a fixed eUICC package,
let's turn the contained eUICC package into a template parameter so that
we can define the eUICC package templates separately. To be complete, let's
also add a ts_provideEimPackageResult_ePRAndNotif

Related: SYS#6824
Change-Id: If04be6407eb41274b378571147ab469d449eac4a
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn
index 191d9e4..e87cb49 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -512,15 +512,169 @@
 }
 
 /* GSMA SGP.32, section 6.3.2.7 */
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_enablePsmo := {
+	euiccPackageResultSigned := {
+		euiccPackageResultDataSigned := {
+			eimId := ?,
+			counterValue := ?,
+			transactionId := *,
+			seqNumber := ?,
+			euiccResult := {
+				{
+				    enableResult := ?
+				}
+			}
+		},
+		euiccSignEPR := ?
+	}
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_enablePsmo := {
+	euiccPackageResultSigned := {
+		euiccPackageResultDataSigned := {
+			eimId := "myEIM",
+			counterValue := 1,
+			transactionId := omit,
+			seqNumber := 123,
+			euiccResult := {
+				{
+				    enableResult := 0
+				}
+			}
+		},
+		euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
+	}
+}
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_disablePsmo := {
+	euiccPackageResultSigned := {
+		euiccPackageResultDataSigned := {
+			eimId := ?,
+			counterValue := ?,
+			transactionId := *,
+			seqNumber := ?,
+			euiccResult := {
+				{
+				    disableResult := ?
+				}
+			}
+		},
+		euiccSignEPR := ?
+	}
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_disablePsmo := {
+	euiccPackageResultSigned := {
+		euiccPackageResultDataSigned := {
+			eimId := "myEIM",
+			counterValue := 1,
+			transactionId := omit,
+			seqNumber := 123,
+			euiccResult := {
+				{
+				    disableResult := 0
+				}
+			}
+		},
+		euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
+	}
+}
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_deletePsmo := {
+	euiccPackageResultSigned := {
+		euiccPackageResultDataSigned := {
+			eimId := ?,
+			counterValue := ?,
+			transactionId := *,
+			seqNumber := ?,
+			euiccResult := {
+				{
+				    deleteResult := ?
+				}
+			}
+		},
+		euiccSignEPR := ?
+	}
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_deletePsmo := {
+	euiccPackageResultSigned := {
+		euiccPackageResultDataSigned := {
+			eimId := "myEIM",
+			counterValue := 1,
+			transactionId := omit,
+			seqNumber := 123,
+			euiccResult := {
+				{
+				    deleteResult := 0
+				}
+			}
+		},
+		euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
+	}
+}
+template (present) EuiccPackageResult
+tr_euiccPackageResultSigned_disableAndDeletePsmo := {
+	euiccPackageResultSigned := {
+		euiccPackageResultDataSigned := {
+			eimId := ?,
+			counterValue := ?,
+			transactionId := *,
+			seqNumber := ?,
+			euiccResult := {
+				{
+				    disableResult := ?
+				},
+				{
+				    deleteResult := ?
+				}
+			}
+		},
+		euiccSignEPR := ?
+	}
+}
+template (value) EuiccPackageResult
+ts_euiccPackageResultSigned_disableAndDeletePsmo := {
+	euiccPackageResultSigned := {
+		euiccPackageResultDataSigned := {
+			eimId := "myEIM",
+			counterValue := 1,
+			transactionId := omit,
+			seqNumber := 123,
+			euiccResult := {
+				{
+				    disableResult := 0
+				},
+				{
+				    deleteResult := 0
+				}
+			}
+		},
+		euiccSignEPR := '00112233445566778899AABBCCDDEEFF'O
+	}
+}
 template (present) EsipaMessageFromIpaToEim
-tr_provideEimPackageResult_ePRAndNotif := {
+tr_provideEimPackageResult_ePRAndNotif(template (present) EuiccPackageResult euiccPackageResult := tr_euiccPackageResultSigned_enablePsmo) := {
 	provideEimPackageResult := {
 		ePRAndNotifications := {
-			euiccPackageResult := ?,
+			euiccPackageResult := euiccPackageResult,
 			notificationList := ?
 		}
 	}
 }
+template (value) EsipaMessageFromIpaToEim
+ts_provideEimPackageResult_ePRAndNotif(template (value) EuiccPackageResult euiccPackageResult := ts_euiccPackageResultSigned_enablePsmo) := {
+	provideEimPackageResult := {
+		ePRAndNotifications := {
+			euiccPackageResult := euiccPackageResult,
+			notificationList := {
+				notificationList := { }
+			}
+		}
+	}
+}
+
 template (present) EsipaMessageFromEimToIpa
 tr_provideEimPackageResultResponse_eimAck := {
 	provideEimPackageResultResponse := {