feat(netapp): add mount path during volume creation

ref: MANAGER-16848 Signed-off-by: Sachin Ramesh <[email protected]>
ovh · Feb 18, 2025 · 8380333 · 8380333
1 parent 4c11a52
commit 8380333
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/packages/manager/modules/netapp/src/dashboard/Share.class.js b/packages/manager/modules/netapp/src/dashboard/Share.class.js
@@ -1,5 +1,14 @@
 export default class Share {
-  constructor({ id, createdAt, description, name, protocol, size, status }) {
+  constructor({
+    id,
+    createdAt,
+    description,
+    name,
+    protocol,
+    size,
+    status,
+    path,
+  }) {
     Object.assign(this, {
       id,
       createdAt,
@@ -8,6 +17,7 @@ export default class Share {
       protocol,
       size,
       status,
+      path,
     });
   }
 

diff --git a/packages/manager/modules/netapp/src/dashboard/constants.js b/packages/manager/modules/netapp/src/dashboard/constants.js
@@ -99,6 +99,8 @@ export const LABELS = {
 
 export const NETAPP_NAME_PATTERN = /^[a-zA-Z0-9._-]{1,64}$/;
 
+export const MOUNT_PATH_PATTERN = /^[a-zA-Z0-9_]{1,255}$/;
+
 export default {
   MINIMUM_VOLUME_SIZE,
   COMMIT_IMPRESSION_TRACKING_DATA,
@@ -110,4 +112,5 @@ export default {
   VRACK_ORDER_URLS,
   LABELS,
   NETAPP_NAME_PATTERN,
+  MOUNT_PATH_PATTERN,
 };
diff --git a/packages/manager/modules/netapp/src/dashboard/routing.js b/packages/manager/modules/netapp/src/dashboard/routing.js
@@ -39,10 +39,16 @@ export default /* @ngInject */ ($stateProvider) => {
         trackClick('configure-network');
         return $state.go('netapp.dashboard.network');
       },
-      volumes: /* @ngInject */ ($http, serviceName) =>
+      volumes: /* @ngInject */ ($http, serviceName, NetAppDashboardService) =>
         $http
           .get(`/storage/netapp/${serviceName}/share?detail=true`)
-          .then(({ data }) => data.map((volume) => new Share(volume))),
+          .then(({ data }) => {
+            return NetAppDashboardService.getListOfAccessPath(
+              serviceName,
+              data,
+            );
+          })
+          .then((volumes) => volumes.map((volume) => new Share(volume))),
       availableVolumeSize: /* @ngInject */ (storage, volumes) => {
         const storageVolumesSize = volumes.reduce(
           (allSizes, volume) => allSizes + volume.size,

diff --git a/packages/manager/modules/netapp/src/dashboard/volumes/create/controller.js b/packages/manager/modules/netapp/src/dashboard/volumes/create/controller.js
@@ -1,4 +1,4 @@
-import { MINIMUM_VOLUME_SIZE } from '../../constants';
+import { MINIMUM_VOLUME_SIZE, MOUNT_PATH_PATTERN } from '../../constants';
 
 export default class VolumeCreateCtrl {
   /* @ngInject */
@@ -16,6 +16,7 @@ export default class VolumeCreateCtrl {
     [this.newVolumeProtocol] = this.protocolList;
     this.minimumVolumeSize = MINIMUM_VOLUME_SIZE;
     this.availableVolumeSize = this.getAvailableSize();
+    this.usedMountPaths = this.volumes.map(({ path }) => path?.split('/')[1]);
   }
 
   getAvailableSize() {
@@ -55,6 +56,12 @@ export default class VolumeCreateCtrl {
       });
   }
 
+  isValidMountPath(value) {
+    return (
+      MOUNT_PATH_PATTERN.test(value) && !this.usedMountPaths?.includes(value)
+    );
+  }
+
   goBack() {
     this.trackClick('create::cancel');
     return this.goToVolumes();

diff --git a/packages/manager/modules/netapp/src/dashboard/volumes/create/template.html b/packages/manager/modules/netapp/src/dashboard/volumes/create/template.html
@@ -67,5 +67,19 @@
                 data-ng-required="true"
             />
         </oui-field>
+        <oui-field
+            data-label="{{:: 'netapp_volume_mount_path' | translate }}"
+            data-error-messages="{ pattern: ('netapp_volume_mount_path_format_error' | translate) }"
+            size="l"
+        >
+            <input
+                class="oui-input"
+                type="text"
+                id="mountPath"
+                name="mountPath"
+                data-ng-model="$ctrl.newVolume.mountPath"
+                data-ui-validate="{ pattern: '$ctrl.isValidMountPath($value)' }"
+            />
+        </oui-field>
     </form>
 </oui-modal>
diff --git a/...ages/manager/modules/netapp/src/dashboard/volumes/create/translations/Messages_fr_FR.json b/...ages/manager/modules/netapp/src/dashboard/volumes/create/translations/Messages_fr_FR.json
@@ -3,6 +3,8 @@
   "netapp_volume_create_cancel": "Annuler",
   "netapp_volume_create_name": "Nom du volume (optionnel)",
   "netapp_volume_create_description": "Description (optionnel)",
+  "netapp_volume_mount_path": "Mount Path(optionnel)",
+  "netapp_volume_mount_path_format_error": "Le mount path est déjà utilisé sur un autre volume. Veuillez en saisir un nouveau.",
   "netapp_volume_create_protocol": "Protocole",
   "netapp_volume_create_protocol_NFS": "NFSv3",
   "netapp_volume_create_size": "Taille du volume",