Merge pull request #1 from neuqlz/internal-dev-appplatform-Microsoft.…

…AppPlatform-2020-11-01-preview add optional field: ResourceRequests in the swagger
Azure · Mar 9, 2021 · ae88e43 · ae88e43
2 parents c13fc89 + 31133b1
commit ae88e43
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 4 deletions.
diff --git a/...atform/resource-manager/Microsoft.AppPlatform/preview/2020-11-01-preview/appplatform.json b/...atform/resource-manager/Microsoft.AppPlatform/preview/2020-11-01-preview/appplatform.json
@@ -3925,16 +3925,20 @@
       "properties": {
         "cpu": {
           "format": "int32",
-          "description": "Required CPU, basic tier should be 1, standard tier should be in range (1, 4)",
+          "description": "Required CPU. This should be 1 for Basic tier, and in range [1, 4] for Standard tier. This is deprecated starting from API version 2020-11-01-preview. Please use the resourceRequests field to set the CPU size.",
           "default": 1,
           "type": "integer"
         },
         "memoryInGB": {
           "format": "int32",
-          "description": "Required Memory size in GB, basic tier should be in range (1, 2), standard tier should be in range (1, 8)",
+          "description": "Required Memory size in GB. This should be in range [1, 2] for Basic tier, and in range [1, 8] for Standard tier. This is deprecated starting from API version 2020-11-01-preview. Please use the resourceRequests field to set the the memory size.",
           "default": 1,
           "type": "integer"
         },
+        "resourceRequests": {
+          "$ref": "#/definitions/ResourceRequests",
+          "description": "The requested resource quantity."
+        },
         "jvmOptions": {
           "description": "JVM parameter",
           "type": "string"
@@ -4014,6 +4018,20 @@
         }
       }
     },
+    "ResourceRequests": {
+      "description": "Deployment resource request payload",
+      "type": "object",
+      "properties": {
+        "cpu": {
+          "description": "Required CPU. 1 core can be represented by 1 or 1000m. This should be 500m or 1 for Basic tier, and {500m, 1, 2, 3, 4} for Standard tier.",
+          "type": "string"
+        },
+        "memory": {
+          "description": "Required memory. 1 GB can be represented by 1Gi or 1024Mi. This should be {512Mi, 1Gi, 2Gi} for Basic tier, and {512Mi, 1Gi, 2Gi, ..., 8Gi} for Standard tier.",
+          "type": "string"
+        }
+      }
+    },
     "LogFileUrlResponse": {
       "description": "Log file URL payload",
       "required": [

diff --git a/...Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_CreateOrUpdate.json b/...Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_CreateOrUpdate.json
@@ -9,8 +9,10 @@
           "artifactSelector": "sub-module-1"
         },
         "deploymentSettings": {
-          "cpu": 1,
-          "memoryInGB": 3,
+          "resourceRequests": {
+            "cpu": "1000m",
+            "memory": "3Gi"
+          },
           "jvmOptions": "-Xms1G -Xmx3G",
           "environmentVariables": {
             "env": "test"
@@ -46,6 +48,10 @@
           "deploymentSettings": {
             "cpu": 1,
             "memoryInGB": 3,
+            "resourceRequests": {
+              "cpu": "1000m",
+              "memory": "3Gi"
+            },
             "jvmOptions": "-Xms1G -Xmx3G",
             "environmentVariables": {
               "env": "test"
@@ -87,6 +93,10 @@
           "deploymentSettings": {
             "cpu": 1,
             "memoryInGB": 3,
+            "resourceRequests": {
+              "cpu": "1000m",
+              "memory": "3Gi"
+            },
             "jvmOptions": "-Xms1G -Xmx3G",
             "environmentVariables": {
               "env": "test"
@@ -128,6 +138,10 @@
           "deploymentSettings": {
             "cpu": 1,
             "memoryInGB": 3,
+            "resourceRequests": {
+              "cpu": "1000m",
+              "memory": "3Gi"
+            },
             "jvmOptions": "-Xms1G -Xmx3G",
             "environmentVariables": {
               "env": "test"

diff --git a/...ce-manager/Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_Get.json b/...ce-manager/Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_Get.json
@@ -21,6 +21,10 @@
           "deploymentSettings": {
             "cpu": 1,
             "memoryInGB": 3,
+            "resourceRequests": {
+              "cpu": "1000m",
+              "memory": "3Gi"
+            },
             "jvmOptions": "-Xms1G -Xmx3G",
             "environmentVariables": {
               "env": "test"

diff --git a/...e-manager/Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_List.json b/...e-manager/Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_List.json
@@ -22,6 +22,10 @@
               "deploymentSettings": {
                 "cpu": 1,
                 "memoryInGB": 3,
+                "resourceRequests": {
+                  "cpu": "1000m",
+                  "memory": "3Gi"
+                },
                 "jvmOptions": "-Xms1G -Xmx3G",
                 "environmentVariables": {
                   "env": "test"

diff --git a/...Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_ListForCluster.json b/...Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_ListForCluster.json
@@ -22,6 +22,10 @@
               "deploymentSettings": {
                 "cpu": 1,
                 "memoryInGB": 3,
+                "resourceRequests": {
+                  "cpu": "1000m",
+                  "memory": "3Gi"
+                },
                 "jvmOptions": "-Xms1G -Xmx3G",
                 "environmentVariables": {
                   "env": "test"

diff --git a/...manager/Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_Update.json b/...manager/Microsoft.AppPlatform/preview/2020-11-01-preview/examples/Deployments_Update.json
@@ -32,6 +32,10 @@
           "deploymentSettings": {
             "cpu": 1,
             "memoryInGB": 3,
+            "resourceRequests": {
+              "cpu": "1000m",
+              "memory": "3Gi"
+            },
             "jvmOptions": "-Xms1G -Xmx3G",
             "environmentVariables": {
               "env": "test"
@@ -73,6 +77,10 @@
           "deploymentSettings": {
             "cpu": 1,
             "memoryInGB": 3,
+            "resourceRequests": {
+              "cpu": "1000m",
+              "memory": "3Gi"
+            },
             "jvmOptions": "-Xms1G -Xmx3G",
             "environmentVariables": {
               "env": "test"