feat(nutanix): revert add VLAN ID field in cluster redeployment (#14482…

…)" (#14898) ref: MANAGER-14545 Signed-off-by: Nicolas Pierre-charles <[email protected]>
ovh · Jan 16, 2025 · 925ab7b · 925ab7b
1 parent 2cde734
commit 925ab7b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 41 deletions.
diff --git a/packages/manager/modules/nutanix/src/dashboard/general-info/redeploy/controller.js b/packages/manager/modules/nutanix/src/dashboard/general-info/redeploy/controller.js
@@ -125,7 +125,6 @@ export default class NutanixGeneralInfoRedeployCtrl {
         erasureCoding,
         prismCentral,
         prismElementVip,
-        infraVlanNumber,
         gatewayCidr,
         version,
         nodes,
@@ -134,7 +133,6 @@ export default class NutanixGeneralInfoRedeployCtrl {
         erasureCoding,
         prismCentral,
         prismElementVip,
-        infraVlanNumber,
         gatewayCidr,
         version,
         nodes: this.getNodesWithDisplayName(nodes),
@@ -152,7 +150,6 @@ export default class NutanixGeneralInfoRedeployCtrl {
     erasureCoding,
     prismCentral,
     prismElementVip,
-    infraVlanNumber,
     gatewayCidr,
     version,
     nodes,
@@ -169,7 +166,6 @@ export default class NutanixGeneralInfoRedeployCtrl {
       }),
       ...(redundancyFactor && { redundancyFactor }),
       ...(prismElementVip && { prismElementVip }),
-      ...(infraVlanNumber && { infraVlanNumber }),
       ...(gatewayCidr && { gatewayCidr }),
       ...(version && { version }),
     };

diff --git a/packages/manager/modules/nutanix/src/dashboard/general-info/redeploy/template.html b/packages/manager/modules/nutanix/src/dashboard/general-info/redeploy/template.html
@@ -187,7 +187,7 @@ <h2 data-translate="nutanix_redeploy_title"></h2>
                     >
                         <strong data-ng-bind="node.displayName"></strong>
                         <oui-field
-                            data-error-messages="{
+                            data-error-messages="{ 
                                 ipSubnetValidator: ('nutanix_redeploy_custom_config_ip_not_in_cidr_subnet_error' | translate),
                                 uniqueIpValidator: ('nutanix_redeploy_custom_config_ip_unique_error' | translate),
                                 pattern: ('nutanix_redeploy_custom_config_ip_format_error' | translate)
@@ -210,7 +210,7 @@ <h2 data-translate="nutanix_redeploy_title"></h2>
                             />
                         </oui-field>
                         <oui-field
-                            data-error-messages="{
+                            data-error-messages="{ 
                                 ipSubnetValidator: ('nutanix_redeploy_custom_config_ip_not_in_cidr_subnet_error' | translate),
                                 uniqueIpValidator: ('nutanix_redeploy_custom_config_ip_unique_error' | translate),
                                 pattern: ('nutanix_redeploy_custom_config_ip_format_error' | translate)
@@ -287,7 +287,7 @@ <h5 data-translate="nutanix_redeploy_erasure_coding"></h5>
                     <oui-field
                         data-label="{{:: 'nutanix_redeploy_prism_central_vip' | translate}}"
                         data-label-popover="{{:: 'nutanix_redeploy_prism_central_virtual_ip_description' | translate}}"
-                        data-error-messages="{
+                        data-error-messages="{ 
                             ipSubnetValidator: ('nutanix_redeploy_custom_config_ip_not_in_cidr_subnet_error' | translate),
                             uniqueIpValidator: ('nutanix_redeploy_custom_config_ip_unique_error' | translate),
                             pattern: ('nutanix_redeploy_custom_config_ip_format_error' | translate)
@@ -359,7 +359,7 @@ <h5 data-translate="nutanix_redeploy_erasure_coding"></h5>
                         data-translate="nutanix_redeploy_prism_element_vip_description"
                     ></p>
                     <oui-field
-                        data-error-messages="{
+                        data-error-messages="{ 
                             ipSubnetValidator: ('nutanix_redeploy_custom_config_ip_not_in_cidr_subnet_error' | translate),
                             uniqueIpValidator: ('nutanix_redeploy_custom_config_ip_unique_error' | translate),
                             pattern: ('nutanix_redeploy_custom_config_ip_format_error' | translate)
@@ -377,35 +377,6 @@ <h5 data-translate="nutanix_redeploy_erasure_coding"></h5>
                         />
                     </oui-field>
                 </div>
-                <div class="mb-3">
-                    <h5 data-translate="nutanix_redeploy_vlan_id"></h5>
-                    <p
-                        data-translate="nutanix_redeploy_vlan_id_description"
-                    ></p>
-                    <oui-field
-                        data-error-messages="{
-                            min: ('nutanix_redeploy_vlan_id_helper' | translate),
-                            max: ('nutanix_redeploy_vlan_id_helper' | translate),
-                        }"
-                    >
-                        <input
-                            class="oui-input w-50"
-                            maxlength="4"
-                            name="vlanId"
-                            required
-                            type="number"
-                            data-ng-model="$ctrl.config.infraVlanNumber"
-                            data-ng-model-options="{ debounce: 500 }"
-                            data-ng-min="1"
-                            data-ng-max="4000"
-                        />
-                        <p
-                            class="oui-field__helper"
-                            data-ng-if="!customConfig.vlanId.$error.max && !customConfig.vlanId.$error.min"
-                            data-translate="nutanix_redeploy_vlan_id_helper"
-                        ></p>
-                    </oui-field>
-                </div>
                 <div class="mb-3">
                     <h5 data-translate="nutanix_redeploy_gateway_CIDR"></h5>
                     <p

diff --git a/...ager/modules/nutanix/src/dashboard/general-info/redeploy/translations/Messages_fr_FR.json b/...ager/modules/nutanix/src/dashboard/general-info/redeploy/translations/Messages_fr_FR.json
@@ -40,8 +40,5 @@
   "nutanix_redeploy_erasure_coding": "Fonction Erasure Coding",
   "nutanix_redeploy_aos": "AOS Version",
   "nutanix_redeploy_node_ahv_ip": "AHV IP",
-  "nutanix_redeploy_node_cvm_ip": "CVM IP",
-  "nutanix_redeploy_vlan_id": "VLAN ID",
-  "nutanix_redeploy_vlan_id_description": "Désignez le VLAN ID utilisé pour le déploiement du cluster.",
-  "nutanix_redeploy_vlan_id_helper": "le VLAN ID doit être compris entre 1 et 4000."
+  "nutanix_redeploy_node_cvm_ip": "CVM IP"
 }