From 96085100aebabd94978d364252e322d79309f7ff Mon Sep 17 00:00:00 2001
From: Lukasz Lopatowski <llopat@man.poznan.pl>
Date: Fri, 16 May 2025 15:44:57 +0200
Subject: [PATCH] Updated content of two new email templates
---
.../shell/data/mails/clusterSupportEmail.json | 17 ++++++++---------
.../shell/data/mails/clusterUnavailable.json | 17 ++++++++---------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/test/shell/data/mails/clusterSupportEmail.json b/src/test/shell/data/mails/clusterSupportEmail.json
index 192f7daa3..91d233386 100644
--- a/src/test/shell/data/mails/clusterSupportEmail.json
+++ b/src/test/shell/data/mails/clusterSupportEmail.json
@@ -8,10 +8,10 @@
"templates": [
{
"language": "en",
- "subject": "nmaas: Cluster support",
+ "subject": "nmaas: Remote cluster support",
"template": {
"HEADER": "Dear ${username}",
- "CONTENT": "<p>Your email address is added to support remote cluster <b>${clusterCodename}</b>. </p> <p>If you do not agree or do not proceed this action please contact administration for further information.</p>",
+ "CONTENT": "<p>Your email address was set as a support contact for remote cluster <b>${clusterCodename}</b> added to nmaas.</p> <p>If you do not agree or consider this as a mistake please contact the nmaas administrator for further information.</p>",
"SENDER": "Best regards,<br />nmaas Team",
"NOREPLY": "This is an automatically generated message, please do not reply.",
"SENDER_POLICY": ""
@@ -19,11 +19,10 @@
},
{
"language": "fr",
- "subject": "nmaas: Cluster is unavailable",
+ "subject": "nmaas: Remote cluster support",
"template": {
"HEADER": "Dear ${username}",
- "CONTENT": "<p>Your email address is added to support remote cluster <b>${clusterCodename}</b>. </p> <p>If you do not agree or do not proceed this action please contact administration for further information.</p>",
-
+ "CONTENT": "<p>Your email address was set as a support contact for remote cluster <b>${clusterCodename}</b> added to nmaas.</p> <p>If you do not agree or consider this as a mistake please contact the nmaas administrator for further information.</p>",
"SENDER": "Best regards,<br />nmaas Team",
"NOREPLY": "This is an automatically generated message, please do not reply.",
"SENDER_POLICY": ""
@@ -31,10 +30,10 @@
},
{
"language": "de",
- "subject": "nmaas: Cluster is unavailable",
+ "subject": "nmaas: Remote cluster support",
"template": {
"HEADER": "Dear ${username}",
- "CONTENT": "<p>Your email address is added to support remote cluster <b>${clusterCodename}</b>. </p> <p>If you do not agree or do not proceed this action please contact administration for further information.</p>",
+ "CONTENT": "<p>Your email address was set as a support contact for remote cluster <b>${clusterCodename}</b> added to nmaas.</p> <p>If you do not agree or consider this as a mistake please contact the nmaas administrator for further information.</p>",
"SENDER": "Best regards,<br />nmaas Team",
"NOREPLY": "This is an automatically generated message, please do not reply.",
"SENDER_POLICY": ""
@@ -42,10 +41,10 @@
},
{
"language": "pl",
- "subject": "nmaas: Cluster jest niedostępny",
+ "subject": "nmaas: Wsparcie zdalnego klastra",
"template": {
"HEADER": "Drogi ${username}",
- "CONTENT": "<p>Your email address is added to support remote cluster <b>${clusterCodename}</b>. </p> <p>If you do not agree or do not proceed this action please contact administration for further information.</p>",
+ "CONTENT": "<p>Twój adres e-mail został ustawiony jako kontakt pomocy technicznej dla zdalnego klastra <b>${clusterCodename}</b> dodanego do nmaas.</p> <p>Jeśli się z tym nie zgadzasz lub uważasz to za pomyłkę, skontaktuj się z administratorem nmaas, aby uzyskać dalsze informacje.</p>",
"SENDER": "Z pozdrowieniami,<br />Zespół nmaas",
"NOREPLY": "Ta wiadomość została wygenerowana automatycznie.",
"SENDER_POLICY": ""
diff --git a/src/test/shell/data/mails/clusterUnavailable.json b/src/test/shell/data/mails/clusterUnavailable.json
index b126a6d6f..b6d76247d 100644
--- a/src/test/shell/data/mails/clusterUnavailable.json
+++ b/src/test/shell/data/mails/clusterUnavailable.json
@@ -8,10 +8,10 @@
"templates": [
{
"language": "en",
- "subject": "nmaas: Cluster is unavailable",
+ "subject": "nmaas: Remote cluster is unavailable",
"template": {
"HEADER": "Dear ${username}",
- "CONTENT": "<p> Cluster <b>${clusterCodename}</b> is unavailable.</p> <p><b> Cluster ID:<b> ${clusterId}</p> <p><b> Cluster CodeName:<b> ${clusterCodename}</p> <p>Please contact the administration for further information.</p>",
+ "CONTENT": "<p>Internal nmaas monitoring indicates that cluster <b>${clusterCodename}</b> became unavailable.</p> <p><b> Cluster ID:<b> ${clusterId}</p> <p><b> Cluster CodeName:<b> ${clusterCodename}</p> <p>Please contact the nmaas administrator for further information.</p>",
"SENDER": "Best regards,<br />nmaas Team",
"NOREPLY": "This is an automatically generated message, please do not reply.",
"SENDER_POLICY": ""
@@ -19,11 +19,10 @@
},
{
"language": "fr",
- "subject": "nmaas: Cluster is unavailable",
+ "subject": "nmaas: Remote cluster is unavailable",
"template": {
"HEADER": "Dear ${username}",
- "CONTENT": "<p> Cluster <b>${clusterCodename}</b> is unavailable.</p> <p><b> Cluster ID:<b> ${clusterId}</p> <p><b> Cluster CodeName:<b> ${clusterCodename}</p> <p>Please contact the administration for further information.</p>",
-
+ "CONTENT": "<p>Internal nmaas monitoring indicates that cluster <b>${clusterCodename}</b> became unavailable.</p> <p><b> Cluster ID:<b> ${clusterId}</p> <p><b> Cluster CodeName:<b> ${clusterCodename}</p> <p>Please contact the nmaas administrator for further information.</p>",
"SENDER": "Best regards,<br />nmaas Team",
"NOREPLY": "This is an automatically generated message, please do not reply.",
"SENDER_POLICY": ""
@@ -31,10 +30,10 @@
},
{
"language": "de",
- "subject": "nmaas: Cluster is unavailable",
+ "subject": "nmaas: Remote cluster is unavailable",
"template": {
"HEADER": "Dear ${username}",
- "CONTENT": "<p> Cluster <b>${clusterCodename}</b> is unavailable.</p> <p><b> Cluster ID:<b> ${clusterId}</p> <p><b> Cluster CodeName:<b> ${clusterCodename}</p> <p>Please contact the administration for further information.</p>",
+ "CONTENT": "<p>Internal nmaas monitoring indicates that cluster <b>${clusterCodename}</b> became unavailable.</p> <p><b> Cluster ID:<b> ${clusterId}</p> <p><b> Cluster CodeName:<b> ${clusterCodename}</p> <p>Please contact the nmaas administrator for further information.</p>",
"SENDER": "Best regards,<br />nmaas Team",
"NOREPLY": "This is an automatically generated message, please do not reply.",
"SENDER_POLICY": ""
@@ -42,10 +41,10 @@
},
{
"language": "pl",
- "subject": "nmaas: Cluster jest niedostępny",
+ "subject": "nmaas: Zdalny klaster jest niedostępny",
"template": {
"HEADER": "Drogi ${username}",
- "CONTENT": "<p> Cluster <b>${clusterCodename}</b> is unavailable.</p> <p><b> Cluster ID:</b> ${clusterId}</p> <p><b> Cluster CodeName:</b> ${clusterCodename}</p> <p> <i>Please contact the administration for further information. </i></p>",
+ "CONTENT": "<p>Wewnętrzny monitoring nmaas wskazuje, że klaster <b>${clusterCodename</b> stał się niedostępny.</p> <p><b> Identyfikator klastra:<b> ${clusterId</p> <p><b> Nazwa kodowa klastra:<b> ${clusterCodename</p> <p>Aby uzyskać więcej informacji, skontaktuj się z administratorem nmaas.</p>",
"SENDER": "Z pozdrowieniami,<br />Zespół nmaas",
"NOREPLY": "Ta wiadomość została wygenerowana automatycznie.",
"SENDER_POLICY": ""
--
GitLab