Adding cluster sku property bag and moving capacity to sku. Also addi…

…ng metricId property to the custom properties bag.
biberli · Mar 13, 2018 · 54258d5 · 54258d5
1 parent 0ea7773
commit 54258d5
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 10 deletions.
diff --git a/...nthub/resource-manager/Microsoft.EventHub/preview/2018-01-01-preview/EventHubCluster.json b/...nthub/resource-manager/Microsoft.EventHub/preview/2018-01-01-preview/EventHubCluster.json
@@ -284,6 +284,10 @@
   "definitions": {
     "EHCluster": {
       "properties": {
+        "sku": {
+          "$ref": "#/definitions/ClusterSku",
+          "description": "Properties of the cluster SKU."
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "properties": {
@@ -297,11 +301,10 @@
               "type": "string",
               "description": "The UTC time when the Event Hubs Cluster was last updated."
             },
-            "capacity": {
+            "metricId": {
               "readOnly": true,
-              "type": "integer",
-              "format": "int32",
-              "description": "The number of Capacity Units contained in this cluster."
+              "type": "string",
+              "description": "The metric ID of the cluster resource. Provided by the service and not modifiable by the user."
             }
           },
           "description": "Event Hubs Cluster properties supplied in responses in List or Get operations."
@@ -520,6 +523,33 @@
         "name"
       ],
       "description": "SKU parameters supplied to the create namespace operation"
+    },
+    "ClusterSku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of this SKU.",
+          "enum": [
+            "Dedicated"
+          ],
+          "x-ms-enum": {
+            "name": "SkuName",
+            "modelAsString": true
+          }
+        },
+        "capacity": {
+          "format": "int32",
+          "maximum": 32,
+          "minimum": 1,
+          "type": "integer",
+          "description": "The quantity of Event Hubs Cluster Capacity Units contained in this cluster."
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "SKU parameters particular to a cluster instance."
     }
   },
   "parameters": {

diff --git a/...manager/Microsoft.EventHub/preview/2018-01-01-preview/examples/Clusters/EHClusterGet.json b/...manager/Microsoft.EventHub/preview/2018-01-01-preview/examples/Clusters/EHClusterGet.json
@@ -16,10 +16,14 @@
           "tag1": "value1",
           "tag2": "value2"
         },
+        "sku": {
+          "name": "Dedicated",
+          "capacity": 4
+        },
         "properties": {
           "created": "2017-05-24T23:23:27.877Z",
           "updated": "2017-05-24T23:23:27.877Z",
-          "capacity": 2
+          "metricId": "SN6-008"
         }
       }
     }

diff --git a/...nager/Microsoft.EventHub/preview/2018-01-01-preview/examples/Clusters/EHClusterPatch.json b/...nager/Microsoft.EventHub/preview/2018-01-01-preview/examples/Clusters/EHClusterPatch.json
@@ -23,10 +23,14 @@
 					"tag3": "value3",
 					"tag4": "value4"
 				},
+        "sku": {
+          "name": "Dedicated",
+          "capacity": 4
+        },
 				"properties": {
 					"created": "2017-06-01T21:37:04.46Z",
 					"updated": "2017-06-01T21:37:53.413Z",
-					"capacity": 2
+					"metricId": "SN6-008"
 				}
 			}
     },
@@ -39,11 +43,15 @@
 		  	"tags": {
 					"tag3": "value3",
 					"tag4": "value4"
-		  	},
+				},
+        "sku": {
+          "name": "Dedicated",
+          "capacity": 4
+        },
 		  	"properties": {
 					"created": "2017-06-01T21:37:04.46Z",
 					"updated": "2017-06-01T21:37:53.413Z",
-					"capacity": 2
+					"metricId": "SN6-008"
 				}
 			}
     },

diff --git a/....EventHub/preview/2018-01-01-preview/examples/Clusters/EHClustersListByResourceGroup.json b/....EventHub/preview/2018-01-01-preview/examples/Clusters/EHClustersListByResourceGroup.json
@@ -14,10 +14,14 @@
                         "type": "Microsoft.EventHub/Clusters",
                         "location": "South Central US",
                         "tags": {},
+                        "sku": {
+                            "name": "Dedicated",
+                            "capacity": 4
+                        },
                         "properties": {
                             "created": "2016-09-13T23:17:25.24Z",
                             "updated": "2016-09-13T23:17:28.223Z",
-                            "capacity": 2
+                            "metricId": "SN6-008"
                         }
                     }
                 ]

diff --git a/...t.EventHub/preview/2018-01-01-preview/examples/Clusters/EHClustersListBySubscription.json b/...t.EventHub/preview/2018-01-01-preview/examples/Clusters/EHClustersListBySubscription.json
@@ -13,10 +13,14 @@
                         "type": "Microsoft.EventHub/Clusters",
                         "location": "South Central US",
                         "tags": {},
+                        "sku": {
+                            "name": "Dedicated",
+                            "capacity": 4
+                        },
                         "properties": {
                             "created": "2016-09-13T23:17:25.24Z",
                             "updated": "2016-09-13T23:17:28.223Z",
-                            "capacity": 2
+                            "metricId": "SN6-008"
                         }
                     }
                 ]