Merge pull request Azure#60 from amarzavery/df

Merging public master to private master as of 04/11/2017 3:20 PM PST
matthchr · Apr 11, 2017 · ff14264 · ff14264
2 parents 7e1058c + 0944b6d
commit ff14264
Show file tree

Hide file tree

Showing 186 changed files with 39,296 additions and 2,219 deletions.
diff --git a/arm-analysisservices/2016-05-16/swagger/analysisservices.json b/arm-analysisservices/2016-05-16/swagger/analysisservices.json
@@ -475,6 +475,9 @@
         "name": {
           "type": "string",
           "enum": [
+            "B1",
+            "B2",
+            "S0",
             "S1",
             "S2",
             "S4",
@@ -484,19 +487,20 @@
             "name": "SkuName",
             "modelAsString": true
           },
-          "description": "Name of the SKU level for the server being provisioned. Possible values are: 'S1', 'S2', 'S4', and 'D1'."
+          "description": "Name of the SKU level for the server being provisioned."
         },
         "tier": {
           "type": "string",
           "enum": [
             "Development",
+            "Basic",
             "Standard"
           ],
           "x-ms-enum": {
             "name": "SkuTier",
             "modelAsString": true
           },
-          "description": "The name of the Azure pricing tier to which the SKU applies. Possible values are: 'Development' and 'Standard'."
+          "description": "The name of the Azure pricing tier to which the SKU applies."
         }
       },
       "required": [

diff --git a/arm-automation/2015-10-31/examples/account/createOrUpdateAutomationAccount.json b/arm-automation/2015-10-31/examples/account/createOrUpdateAutomationAccount.json
@@ -0,0 +1,63 @@
+{
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "automationAccountName": "myAutomationAccount9",
+    "api-version": "2015-10-31",
+    "parameters": {
+      "properties": {
+        "sku": {
+          "name": "Free"
+        }
+      },
+      "name": "myAutomationAccount9",
+      "location": "East US 2"
+    }
+  },
+  "responses": {
+    "201": {
+      "headers": {},
+      "body": {
+        "name": "myAutomationAccount9",
+        "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount9",
+        "type": "Microsoft.Automation/AutomationAccounts",
+        "location": "East US 2",
+        "tags": {},
+        "etag": null,
+        "properties": {
+          "sku": {
+            "name": "Free",
+            "family": null,
+            "capacity": null
+          },
+          "state": "Ok",
+          "creationTime": "2017-03-26T01:13:43.267+00:00",
+          "lastModifiedBy": "[email protected]",
+          "lastModifiedTime": "2017-03-26T01:13:43.267+00:00"
+        }
+      }
+    },
+    "200": {
+      "headers": {},
+      "body": {
+        "name": "ContoseAutomationAccount",
+        "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount9",
+        "type": "Microsoft.Automation/AutomationAccounts",
+        "location": "East US 2",
+        "tags": {},
+        "etag": null,
+        "properties": {
+          "sku": {
+            "name": "Free",
+            "family": null,
+            "capacity": null
+          },
+          "state": "Ok",
+          "creationTime": "2017-03-28T18:21:15.187+00:00",
+          "lastModifiedBy": "[email protected]",
+          "lastModifiedTime": "2017-03-28T18:21:15.187+00:00"
+        }
+      }
+    }
+  }
+}
diff --git a/arm-automation/2015-10-31/examples/account/deleteAutomationAccount.json b/arm-automation/2015-10-31/examples/account/deleteAutomationAccount.json
@@ -0,0 +1,12 @@
+{
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "automationAccountName": "myAutomationAccount9",
+    "api-version": "2015-10-31"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/arm-automation/2015-10-31/examples/account/deleteNonExisitingAutomationAccount.json b/arm-automation/2015-10-31/examples/account/deleteNonExisitingAutomationAccount.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "automationAccountName": "myAutomationAccount9",
+    "api-version": "2015-10-31"
+  },
+  "responses": {
+    "204": {
+      "headers": {},
+      "body": {}
+    }
+  }
+}
diff --git a/arm-automation/2015-10-31/examples/account/getAutomationAccount.json b/arm-automation/2015-10-31/examples/account/getAutomationAccount.json
@@ -0,0 +1,32 @@
+{
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "automationAccountName": "myAutomationAccount9",
+    "api-version": "2015-10-31"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "name": "myAutomationAccount9",
+        "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount9",
+        "type": "Microsoft.Automation/AutomationAccounts",
+        "location": "East US 2",
+        "tags": {},
+        "etag": null,
+        "properties": {
+          "sku": {
+            "name": "Free",
+            "family": null,
+            "capacity": null
+          },
+          "state": "Ok",
+          "creationTime": "2017-03-26T01:13:43.267+00:00",
+          "lastModifiedBy": "[email protected]",
+          "lastModifiedTime": "2017-03-26T01:13:43.267+00:00"
+        }
+      }
+    }
+  }
+}
diff --git a/arm-automation/2015-10-31/examples/account/getStatisticsOfAutomationAccount.json b/arm-automation/2015-10-31/examples/account/getStatisticsOfAutomationAccount.json
@@ -0,0 +1,108 @@
+{
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "automationAccountName": "myAutomationAccount11",
+    "api-version": "2015-10-31"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/New",
+            "counterProperty": "New",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Activating",
+            "counterProperty": "Activating",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Running",
+            "counterProperty": "Running",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Completed",
+            "counterProperty": "Completed",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Failed",
+            "counterProperty": "Failed",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Stopped",
+            "counterProperty": "Stopped",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Blocked",
+            "counterProperty": "Blocked",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Suspended",
+            "counterProperty": "Suspended",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Disconnected",
+            "counterProperty": "Disconnected",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Suspending",
+            "counterProperty": "Suspending",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Stopping",
+            "counterProperty": "Stopping",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Resuming",
+            "counterProperty": "Resuming",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          },
+          {
+            "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount11/statistics/Removing",
+            "counterProperty": "Removing",
+            "counterValue": 0,
+            "startTime": "2017-03-19T02:11:49.9879197+00:00",
+            "endTime": "2017-03-26T02:11:49.9879197+00:00"
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/arm-automation/2015-10-31/examples/account/getUsagesOfAutomationAccount.json b/arm-automation/2015-10-31/examples/account/getUsagesOfAutomationAccount.json
@@ -0,0 +1,47 @@
+{
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "automationAccountName": "myAutomationAccount11",
+    "api-version": "2015-10-31"
+  },
+  "responses": {
+    "200": {
+      "headers": {},
+      "body": {
+        "value": [
+          {
+            "name": {
+              "value": "AccountUsage",
+              "localizedValue": "AccountUsage"
+            },
+            "unit": "Minute",
+            "currentValue": 0.0,
+            "limit": 500,
+            "throttleStatus": "NotThrottled"
+          },
+          {
+            "name": {
+              "value": "SubscriptionUsage",
+              "localizedValue": "SubscriptionUsage"
+            },
+            "unit": "Minute",
+            "currentValue": 429.0,
+            "limit": 500,
+            "throttleStatus": "NotThrottled"
+          },
+          {
+            "name": {
+              "value": "DscSubscriptionUsage",
+              "localizedValue": "DscSubscriptionUsage"
+            },
+            "unit": "Count",
+            "currentValue": 8.0,
+            "limit": 5,
+            "throttleStatus": "ThrottledAtSubscriptionLevel"
+          }
+        ]
+      }
+    }
+  }
+}