Merge branch '7.0-dev' into 8.0-dev

gomorpheus · Oct 25, 2024 · 76dac48 · 76dac48
2 parents fbfea80 + 4003743
commit 76dac48
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 6 deletions.
diff --git a/components/examples/license.json b/components/examples/license.json
@@ -11,6 +11,7 @@
     "maxDiscoveredServers": 100,
     "maxHosts": 20,
     "maxMvm": 5,
+    "maxMvmSockets": 12,
     "maxIac": 5,
     "maxXaas": 5,
     "maxExecutions": 1000,
@@ -91,7 +92,8 @@
     "managedServers": 14,
     "discoveredServers": 21,
     "hosts": 5,
-    "mvm": 0,
+    "mvm": 3,
+    "mvmSockets": 6,
     "iac": 0,
     "xaas": 5,
     "executions": 43,

diff --git a/components/schemas/clusterDatastoreCreate.yaml b/components/schemas/clusterDatastoreCreate.yaml
@@ -0,0 +1,76 @@
+type: object
+properties: 
+  name:
+    type: string
+  datastoreType:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+  storageServer:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+  visibility:
+    type: string
+  active:
+    type: boolean
+  defaultStore:
+    type: boolean
+  tenants:
+    type: array
+    items: 
+      type: object
+      properties: 
+        id: 
+          type: integer
+          format: int64
+        name: 
+          type: string
+        defaultStore:
+          type: boolean
+        defaultTarget:
+          type: boolean
+  resourcePermissions:
+    type: object
+    properties:
+      allGroups:
+        type: boolean
+      defaultStore:
+        type: boolean
+      allPlans:
+        type: boolean
+      defaultTarget:
+        type: boolean
+      morpheusResourceType:
+        type: string
+      morpheusResourceId:
+        type: integer
+        format: int64
+      canManage:
+        type: boolean
+      all:
+        type: boolean
+      account:
+        type: object
+        properties:
+          id:
+            type: integer
+            format: int64
+      sites:
+        type: array
+        nullable: true
+        items:
+          type: object
+      plans:
+        type: array
+        nullable: true
+        items:
+          type: object
+  datastores: 
+    type: array
+    items:
+      type: object
diff --git a/components/schemas/license.yaml b/components/schemas/license.yaml
@@ -51,7 +51,12 @@ properties:
         type: integer
         format: int64
         nullable: true
-        description: MVM Host Limit. 0 is enforced and null is used for unlimited.
+        description: HPE VM Host Limit. 0 is enforced and null is used for unlimited.
+      maxMvmSockets: 
+        type: integer
+        format: int64
+        nullable: true
+        description: HPE VM Host Limit. 0 is enforced and null is used for unlimited.
       maxIac: 
         type: integer
         format: int64
@@ -247,7 +252,11 @@ properties:
       mvm:
         type: integer
         format: int64
-        description: Total MVM Hosts
+        description: Total HPE VM Hosts
+      mvmSockets:
+        type: integer
+        format: int64
+        description: Total HPE VM Sockets
       iac:
         type: integer
         format: int64

diff --git a/paths/api@clusters@[email protected] b/paths/api@clusters@[email protected]
@@ -52,7 +52,7 @@ post:
           type: object
           properties:
             cluster:
-              $ref: ../components/schemas/clusterDatastore.yaml
+              $ref: ../components/schemas/clusterDatastoreCreate.yaml
         examples:
           Cluster Datastore Request:
             value:

diff --git a/paths/api@servers@[email protected] b/paths/api@servers@[email protected]
@@ -1,6 +1,6 @@
 put:
   summary: Leave Maintenance Mode
-  description: This will leave maintenance mode on the host. Only available for supported server types such as MVM hosts.
+  description: This will leave maintenance mode on the host. Only available for supported server types such as HPE VM hosts.
   operationId: leaveMaintenanceMode
   tags:
     - Hosts

diff --git a/paths/api@servers@[email protected] b/paths/api@servers@[email protected]
@@ -1,6 +1,6 @@
 put:
   summary: Manage Host Placement
-  description: This will update the host placement settings for the virtual machine. Only available for supported server types such as MVM virtual machines.
+  description: This will update the host placement settings for the virtual machine. Only available for supported server types such as HPE VM virtual machines.
   operationId: serverMaintenanceMode
   tags:
     - Hosts