fix(dedicated.pcc): fix order label when SAP HANA is unavailable (#14288

) ref: MANAGER-14373 Signed-off-by: David Arsène <[email protected]> Co-authored-by: CDS Translator Agent <[email protected]>
ovh · Dec 9, 2024 · d294eb6 · d294eb6
1 parent 5f4c959
commit d294eb6
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 21 deletions.
diff --git a/...nts/dedicated-cloud/datacenter/vmware-vdc-add/dedicatedCloud-vmware-vdc-add.controller.js b/...nts/dedicated-cloud/datacenter/vmware-vdc-add/dedicatedCloud-vmware-vdc-add.controller.js
@@ -30,6 +30,18 @@ export default class VmwareVdcAddCtrl {
     this.hostList = [];
 
     this.model = { vdc: null, host: null, datastoreRequired: false };
+    this.manageSapHanaOrder();
+  }
+
+  manageSapHanaOrder() {
+    this.hostTypes = Object.values(HOST_TYPE).filter(
+      (host) => this.orderSapHana || host !== HOST_TYPE.SAPHANA,
+    );
+    this.step1DescriptionLabel = this.$translate.instant(
+      `dedicatedCloud_configuration_add_datacenter_step_1_description${
+        !this.orderSapHana ? '_no_saphana' : ''
+      }`,
+    );
   }
 
   datacentersLoad() {
@@ -64,21 +76,15 @@ export default class VmwareVdcAddCtrl {
     this.hostsLoading = true;
     return this.checkDatastore()
       .then((data) => {
-        const hostType = { ...HOST_TYPE };
-        if (!this.orderSapHana) {
-          delete hostType.SAPHANA;
-        }
         this.model.datastoreRequired = !data;
-        this.hostList = Object.values(hostType).map((host) => {
-          return {
-            name:
-              host !== HOST_TYPE.STANDARD
-                ? `${this.model.vdc.vdc}_${host}`
-                : this.model.vdc.vdc,
-            range: this.model.vdc.vdc,
-            host,
-          };
-        });
+        this.hostList = this.hostTypes.map((host) => ({
+          name:
+            host !== HOST_TYPE.STANDARD
+              ? `${this.model.vdc.vdc}_${host}`
+              : this.model.vdc.vdc,
+          range: this.model.vdc.vdc,
+          host,
+        }));
       })
       .catch((err) => {
         return this.goBack(

diff --git a/...p/components/dedicated-cloud/datacenter/vmware-vdc-add/dedicatedCloud-vmware-vdc-add.html b/...p/components/dedicated-cloud/datacenter/vmware-vdc-add/dedicatedCloud-vmware-vdc-add.html
@@ -10,7 +10,7 @@
 >
     <oui-step-form
         data-header="{{ :: 'dedicatedCloud_configuration_add_datacenter_step_1_title' | translate }}"
-        data-description="{{ :: 'dedicatedCloud_configuration_add_datacenter_step_1_description' | translate }}"
+        data-description="{{ :: $ctrl.step1DescriptionLabel }}"
         data-on-cancel="$ctrl.onCancel()"
         data-cancel-text="{{ :: 'dedicatedCloud_configuration_add_datacenter_cta_cancel' | translate }}"
         data-on-submit="$ctrl.hostsLoad()"

diff --git a/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_de_DE.json b/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_de_DE.json
@@ -24,5 +24,6 @@
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_label": "SAP HANA-Hosts",
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_description": "Ihr neues Virtual Data Center besteht aus einer hyperkonvergenten Infrastruktur, die speziell für SAP HANA konzipiert und zertifiziert wurde (die Auswahl der Host-Merkmale erfolgt im nächsten Schritt).",
   "dedicatedCloud_configuration_add_datacenter_message_edge_information": "2 NSX-Edges werden in der neuen Umgebung bereitgestellt. Für diese VM kommen standardmäßig 2 vCPUs, 8 GB RAM und 200 GB Speicher pro Edge zum Einsatz. Für das Hosting des Edge-Clusters müssen eine CPU und mindestens zwei globale Datastores sowie Speicherplatz verfügbar sein. Ist das nicht der Fall, bestellen Sie 2 Datastores für das neue VDC.",
-  "dedicatedCloud_datacenters_adding_load_error": "Beim Laden der Informationen zum Hinzufügen des Datacenters ist ein Fehler aufgetreten."
+  "dedicatedCloud_datacenters_adding_load_error": "Beim Laden der Informationen zum Hinzufügen des Datacenters ist ein Fehler aufgetreten.",
+  "dedicatedCloud_configuration_add_datacenter_step_1_description_no_saphana": "Fügen Sie Ihrer VMware-Infrastruktur ein VDC hinzu. Die Auswahl der Hosts (Standard oder vSAN) erfolgt im nächsten Schritt."
 }
diff --git a/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_en_GB.json b/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_en_GB.json
@@ -24,5 +24,6 @@
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_label": "SAP HANA hosts",
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_description": "Your new virtual datacentre will comprise hyperconverged infrastructure that is specially designed and SAP HANA-certified (you can choose host specifications in the next step).",
   "dedicatedCloud_configuration_add_datacenter_message_edge_information": "2 NSX Edges will be deployed in the new environment. By default, this VM will use 2vCPU / 8 GB RAM / 200 GB storage per Edge. You must have a CPU to host Edge cluster, and at least two global data stores and space. If you do not, you will have to order 2 data stores for the new vDC.",
-  "dedicatedCloud_datacenters_adding_load_error": "An error has occurred loading the information for the datacentre addition."
+  "dedicatedCloud_datacenters_adding_load_error": "An error has occurred loading the information for the datacentre addition.",
+  "dedicatedCloud_configuration_add_datacenter_step_1_description_no_saphana": "Add a vDC to your VMware infrastructure. You can select hosts (standard or vSAN) in the next step."
 }
diff --git a/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_es_ES.json b/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_es_ES.json
@@ -24,5 +24,6 @@
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_label": "Hosts SAP HANA",
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_description": "Su nuevo datacenter virtual estará compuesto por una infraestructura hiperconvergente especialmente diseñada y certificada para SAP HANA (podrá elegir las características de los hosts en la siguiente etapa).",
   "dedicatedCloud_configuration_add_datacenter_message_edge_information": "Se desplegarán 2 Edges NSX en el nuevo entorno. Por defecto, esta MV utilizará 2vCPU con 8 GB de RAM y 200 GB de almacenamiento por Edge. Deberá tener CPU disponible para alojar el clúster Edge, espacio y un mínimo de dos datastores globales. En caso contrario, deberá contratar 2 datastores para el nuevo vDC.",
-  "dedicatedCloud_datacenters_adding_load_error": "Se ha producido un error al cargar los datos para la adición de un datacenter."
+  "dedicatedCloud_datacenters_adding_load_error": "Se ha producido un error al cargar los datos para la adición de un datacenter.",
+  "dedicatedCloud_configuration_add_datacenter_step_1_description_no_saphana": "Añada un VDC a su infraestructura VMware. La selección de los hosts (estándar o vSAN) se realizará en la siguiente etapa."
 }
diff --git a/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_fr_CA.json b/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_fr_CA.json
@@ -3,6 +3,7 @@
   "dedicatedCloud_configuration_add_datacenter_description": "Tous les virtual data centers (VDC) bénéficient du module d'observabilité Aria Operations et de la license vSphere Entreprise Plus par défaut. Les 'management fees' représentent le coût des VMs de management (par exemple votre vCenter, Aria Operations) qui sont hébergées en dehors de vos hôtes dédiés, ce qui vous permet de disposer de 100% de leurs capacités (CPU, RAM).",
   "dedicatedCloud_configuration_add_datacenter_step_1_title": "Sélectionnez votre nouveau virtual Datacenter",
   "dedicatedCloud_configuration_add_datacenter_step_1_description": "Ajoutez un VDC à votre infrastructure VMware. La sélection des hôtes (standard, vSAN ou SAP HANA) se fera à la prochaine étape.",
+  "dedicatedCloud_configuration_add_datacenter_step_1_description_no_saphana": "Ajoutez un VDC à votre infrastructure VMware. La sélection des hôtes (standard ou vSAN) se fera à la prochaine étape.",
   "dedicatedCloud_configuration_add_datacenter_step_2_title": "Sélectionnez le type d'hôtes",
   "dedicatedCloud_configuration_add_datacenter_step_2_description": "Ajoutez les hôtes qui composeront initialement votre VDC. Si vos besoins évoluent, vous pourrez compléter avec d'autres types d'hôtes ultérieurement.",
   "dedicatedCloud_configuration_add_datacenter_cta_submit": "Ajouter un datacentre",

diff --git a/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_fr_FR.json b/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_fr_FR.json
@@ -3,6 +3,7 @@
   "dedicatedCloud_configuration_add_datacenter_description": "Tous les virtual data centers (VDC) bénéficient du module d'observabilité Aria Operations et de la license vSphere Entreprise Plus par défaut. Les 'management fees' représentent le coût des VMs de management (par exemple votre vCenter, Aria Operations) qui sont hébergées en dehors de vos hôtes dédiés, ce qui vous permet de disposer de 100% de leurs capacités (CPU, RAM).",
   "dedicatedCloud_configuration_add_datacenter_step_1_title": "Sélectionnez votre nouveau virtual Datacenter",
   "dedicatedCloud_configuration_add_datacenter_step_1_description": "Ajoutez un VDC à votre infrastructure VMware. La sélection des hôtes (standard, vSAN ou SAP HANA) se fera à la prochaine étape.",
+  "dedicatedCloud_configuration_add_datacenter_step_1_description_no_saphana": "Ajoutez un VDC à votre infrastructure VMware. La sélection des hôtes (standard ou vSAN) se fera à la prochaine étape.",
   "dedicatedCloud_configuration_add_datacenter_step_2_title": "Sélectionnez le type d'hôtes",
   "dedicatedCloud_configuration_add_datacenter_step_2_description": "Ajoutez les hôtes qui composeront initialement votre VDC. Si vos besoins évoluent, vous pourrez compléter avec d'autres types d'hôtes ultérieurement.",
   "dedicatedCloud_configuration_add_datacenter_cta_submit": "Ajouter un datacentre",

diff --git a/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_it_IT.json b/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_it_IT.json
@@ -24,5 +24,6 @@
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_label": "Host SAP HANA",
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_description": "Il nuovo Virtual Data Center sarà composto da un'infrastruttura iperconvergente appositamente progettata e certificata per SAP HANA (la scelta delle caratteristiche degli host sarà disponibile nel prossimo step).",
   "dedicatedCloud_configuration_add_datacenter_message_edge_information": "2 Edge NSX saranno configurati sul nuovo ambiente. Questa VM utilizzerà di default 2vCPU 8GB RAM 200GB di storage per Edge. Per ospitare il cluster Edge è necessario disporre di CPU, spazio e almeno due datastore globali. In caso contrario, bisognerà ordinare 2 datastore per il nuovo VDC.",
-  "dedicatedCloud_datacenters_adding_load_error": "Si è verificato un errore durante il caricamento delle informazioni di aggiunta del datacenter "
+  "dedicatedCloud_datacenters_adding_load_error": "Si è verificato un errore durante il caricamento delle informazioni di aggiunta del datacenter ",
+  "dedicatedCloud_configuration_add_datacenter_step_1_description_no_saphana": "Aggiungi un VDC alla tua infrastruttura VMware. La selezione degli host (standard o vSAN) sarà disponibile nel prossimo step."
 }
diff --git a/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_pl_PL.json b/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_pl_PL.json
@@ -24,5 +24,6 @@
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_label": "Hosty SAP HANA",
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_description": "Twoje nowe wirtualne centrum danych będzie się składać z hiperkonwergentnej infrastruktury specjalnie zaprojektowanej i certyfikowanej dla SAP HANA (wybór parametrów hostów zostanie dokonany w kolejnym etapie).",
   "dedicatedCloud_configuration_add_datacenter_message_edge_information": "2 Edges NSX zostaną wdrożone w nowym środowisku. Domyślnie ta wirtualna maszyna będzie używać 2vCPU, 8GB RAM, 200 GB przestrzeni dyskowej per Edges. Aby hostować klaster Edge i minimum dwa globalne datastores oraz przestrzeń dyskową, musisz mieć dostępny procesor CPU. Jeśli nie spełniasz tych warunków, zamów 2 datastores dla nowego vDC.",
-  "dedicatedCloud_datacenters_adding_load_error": "Wystąpił błąd podczas pobierania informacji o dodawaniu centrum danych."
+  "dedicatedCloud_datacenters_adding_load_error": "Wystąpił błąd podczas pobierania informacji o dodawaniu centrum danych.",
+  "dedicatedCloud_configuration_add_datacenter_step_1_description_no_saphana": "Dodaj VDC do infrastruktury VMware. Hosty (standard lub vSAN) wybierzesz w kolejnym kroku."
 }
diff --git a/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_pt_PT.json b/...app/components/dedicated-cloud/datacenter/vmware-vdc-add/translations/Messages_pt_PT.json
@@ -24,5 +24,6 @@
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_label": "Hosts SAP HANA",
   "dedicatedCloud_configuration_add_datacenter_card_host_vsphere_saphana_description": "O seu novo virtual data center será composto por uma infraestrutura hiperconvergente especialmente concebida e certificada para SAP HANA (a escolha das características dos hosts será feita no próximo passo).",
   "dedicatedCloud_configuration_add_datacenter_message_edge_information": "2 Edges NSX serão implementados no novo ambiente. Por predefinição, esta VM utilizará 2vCPU 8GB RAM 200GB de armazenamento por Edges. Deve ter CPU disponível para alojar o cluster Edges e um mínimo de dois datastores globais e de espaço. Se não for o caso, terá de encomendar 2 datastores para o novo vDC.",
-  "dedicatedCloud_datacenters_adding_load_error": "Erro ao processar alteração informações relativas à criação de um datacenter."
+  "dedicatedCloud_datacenters_adding_load_error": "Erro ao processar alteração informações relativas à criação de um datacenter.",
+  "dedicatedCloud_configuration_add_datacenter_step_1_description_no_saphana": "Adicione um VDC à sua infraestrutura VMware. A seleção dos hosts (standard ou vSAN) será efetuada na próxima etapa."
 }