renamed clusters custom server plan options from plan.options to serv…

…icePlanOptions
gomorpheus · Sep 4, 2024 · d9c29ec · d9c29ec
1 parent b54c928
commit d9c29ec
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 103 deletions.
diff --git a/components/examples/clusterRequest.json b/components/examples/clusterRequest.json
@@ -1,57 +1,69 @@
 {
-  "cluster": {
-    "type": "kubernetes-cluster",
-    "group": {
-      "id": 1
-    },
-    "name": "testcluster",
-    "cloud": {
-      "id": 15
-    },
-    "layout": {
-      "id": 219
-    },
-    "server": {
-      "config": {
-        "resourcePoolId": 75,
-        "hostId": "",
-        "podCidr": "172.20.0.0/16",
-        "serviceCidr": "172.30.0.0/16",
-        "nodeCount": 3,
-        "createUser": true,
-        "defaultRepoAccount": 22
-      },
-      "name": "testpool",
-      "plan": {
-        "id": 365,
-        "code": "vm-8192",
-        "options": {}
-      },
-      "volumes": [
+    "cluster":
+    {
+        "type": "kubernetes-cluster",
+        "group":
         {
-          "id": -1,
-          "rootVolume": true,
-          "name": "root",
-          "size": 80,
-          "sizeId": null,
-          "storageType": 1,
-          "datastoreId": "auto"
-        }
-      ],
-      "networkInterfaces": [
+            "id": 1
+        },
+        "name": "testcluster",
+        "cloud":
+        {
+            "id": 15
+        },
+        "layout":
+        {
+            "id": 219
+        },
+        "server":
         {
-          "network": {
-            "id": "network-110"
-          },
-          "networkInterfaceTypeId": 4,
-          "ipMode": "dhcp"
+            "config":
+            {
+                "resourcePoolId": 75,
+                "hostId": "",
+                "podCidr": "172.20.0.0/16",
+                "serviceCidr": "172.30.0.0/16",
+                "nodeCount": 3,
+                "createUser": true,
+                "defaultRepoAccount": 22
+            },
+            "name": "testpool",
+            "plan":
+            {
+                "id": 365,
+                "code": "vm-8192"
+            },
+            "servicePlanOptions":
+            {},
+            "volumes":
+            [
+                {
+                    "id": -1,
+                    "rootVolume": true,
+                    "name": "root",
+                    "size": 80,
+                    "sizeId": null,
+                    "storageType": 1,
+                    "datastoreId": "auto"
+                }
+            ],
+            "networkInterfaces":
+            [
+                {
+                    "network":
+                    {
+                        "id": "network-110"
+                    },
+                    "networkInterfaceTypeId": 4,
+                    "ipMode": "dhcp"
+                }
+            ],
+            "securityGroups":
+            [],
+            "visibility": "private",
+            "nodeCount": 3,
+            "networkDomain": null,
+            "hostname": "kubehostname"
         }
-      ],
-      "securityGroups": [],
-      "visibility": "private",
-      "nodeCount": 3,
-      "networkDomain": null,
-      "hostname": "kubehostname"
     }
-  }
 }
diff --git a/components/examples/clusterServerCreate.json b/components/examples/clusterServerCreate.json
@@ -1,51 +1,59 @@
 {
-  "server": {
-    "config": {
-      "resourcePool": 35856,
-      "publicIpType": "subnet",
-      "createUser": false
-    },
-    "serverType": {
-      "id": 196
-    },
-    "name": "api-kube-host-new-worker-4-1666905432",
-    "description": "API Test: This is my Kubernetes host",
-    "plan": {
-      "code": "amazon-t2.medium",
-      "options": {
-      }
-    },
-    "volumes": [
-      {
-        "id": -1,
-        "rootVolume": true,
-        "name": "root",
-        "size": 40,
-        "sizeId": null,
-        "storageType": 7,
-        "datastoreId": null
-      },
-      {
-        "rootVolume": false,
-        "name": "data",
-        "size": 40,
-        "sizeId": null,
-        "storageType": 7,
-        "datastoreId": null
-      }
-    ],
-    "networkInterfaces": [
-      {
-        "network": {
-          "id": "network-6"
-        }
-      }
-    ],
-    "securityGroups": [
-      "sg-fe44ed9a"
-    ],
-    "nodeCount": 1,
-    "networkDomain": null,
-    "hostname": "api-kube-host-new-worker-4"
-  }
+    "server":
+    {
+        "config":
+        {
+            "resourcePool": 35856,
+            "publicIpType": "subnet",
+            "createUser": false
+        },
+        "serverType":
+        {
+            "id": 196
+        },
+        "name": "api-kube-host-new-worker-4-1666905432",
+        "description": "API Test: This is my Kubernetes host",
+        "plan":
+        {
+            "code": "amazon-t2.medium"
+        },
+        "servicePlanOptions":
+        {},
+        "volumes":
+        [
+            {
+                "id": -1,
+                "rootVolume": true,
+                "name": "root",
+                "size": 40,
+                "sizeId": null,
+                "storageType": 7,
+                "datastoreId": null
+            },
+            {
+                "rootVolume": false,
+                "name": "data",
+                "size": 40,
+                "sizeId": null,
+                "storageType": 7,
+                "datastoreId": null
+            }
+        ],
+        "networkInterfaces":
+        [
+            {
+                "network":
+                {
+                    "id": "network-6"
+                }
+            }
+        ],
+        "securityGroups":
+        [
+            "sg-fe44ed9a"
+        ],
+        "nodeCount": 1,
+        "networkDomain": null,
+        "hostname": "api-kube-host-new-worker-4"
+    }
 }
diff --git a/components/schemas/clusterServerCreate.yaml b/components/schemas/clusterServerCreate.yaml
@@ -34,9 +34,8 @@ properties:
       code: 
         type: string
         description: The code for the memory and storage option pre-configured within Morpheus.
-      options: 
-        type: object
-        description: Map of custom options depending on selected service plan . An example would be `maxMemory`, or `maxCores`.
+  servicePlanOptions: 
+    $ref: servicePlanOptions.yaml
   volumes: 
     type: array
     description: The (optional) volumes parameter is for LV configuration, can create additional LVs at provision It should be passed as an array of Objects