Merge branch '7.0-dev' into 8.0-dev

gomorpheus · Oct 28, 2024 · ac70b2e · ac70b2e
2 parents d63c05f + 31b688d
commit ac70b2e
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 3 deletions.
diff --git a/components/examples/clusterDatastoreCreateNFS.json b/components/examples/clusterDatastoreCreateNFS.json
@@ -0,0 +1,25 @@
+{
+  "datastore": {
+    "name": "NFS",
+    "datastoreType": {
+      "id": 3
+    },
+    "active": true,
+    "config": {
+      "sourceHostname": "10.32.150.167",
+      "sourceDirPath": "/var/nfs/mvm"
+    },
+    "defaultStore": true,
+    "resourcePermissions": {
+      "allSites": true
+    },
+    "tenants": [
+      {
+        "id": 1,
+        "defaultStore": false,
+        "defaultTarget": false
+      }
+    ],
+    "visibility": "private"
+  }
+}
diff --git a/components/schemas/clusterDatastoreConfigGFS2.yaml b/components/schemas/clusterDatastoreConfigGFS2.yaml
@@ -0,0 +1,5 @@
+type: object
+properties:
+  blockDevice:
+    type: string
+    description: Block device for target GFS2.
diff --git a/components/schemas/clusterDatastoreConfigNFS.yaml b/components/schemas/clusterDatastoreConfigNFS.yaml
@@ -0,0 +1,8 @@
+type: object
+properties:
+  sourceHostname:
+    type: string
+    description: Host name or IP address for target NFS instance.
+  sourceDirPath:
+    type: string
+    description: Path to the target NFS export directory.
diff --git a/components/schemas/clusterDatastoreCreate.yaml b/components/schemas/clusterDatastoreCreate.yaml
@@ -20,6 +20,10 @@ properties:
     type: boolean
   defaultStore:
     type: boolean
+  config:
+    anyOf:
+      - $ref: clusterDatastoreConfigNFS.yaml
+      - $ref: clusterDatastoreConfigGFS2.yaml
   tenants:
     type: array
     items: 

diff --git a/paths/api@clusters@[email protected] b/paths/api@clusters@[email protected]
@@ -54,9 +54,9 @@ post:
             cluster:
               $ref: ../components/schemas/clusterDatastoreCreate.yaml
         examples:
-          Cluster Datastore Request:
+          NFS Datastore Request:
             value:
-              $ref: ../components/examples/clusterDatastore.json
+              $ref: ../components/examples/clusterDatastoreCreateNFS.json
   responses:
     '200':
       description: Successful Request

diff --git a/paths/api@library@layouts@[email protected] b/paths/api@library@layouts@[email protected]
@@ -1,4 +1,4 @@
-put: 
+post: 
   summary: Update Layout Permissions
   description: Use this command to update permissions for an existing layout.
   operationId: updateLayoutPermissions