Merge pull request #6 from Azure/master

merge into douge for review
Azure · Nov 13, 2016 · c82a473 · c82a473
2 parents 200fe0f + 886231c
commit c82a473
Show file tree

Hide file tree

Showing 41 changed files with 10,328 additions and 4,564 deletions.
diff --git a/arm-authorization/2015-07-01/swagger/authorization.json b/arm-authorization/2015-07-01/swagger/authorization.json
diff --git a/arm-batch/2015-12-01/swagger/BatchManagement.json b/arm-batch/2015-12-01/swagger/BatchManagement.json
diff --git a/arm-cdn/2016-10-02/swagger/cdn.json b/arm-cdn/2016-10-02/swagger/cdn.json
diff --git a/arm-compute/2016-03-30/swagger/compute.json b/arm-compute/2016-03-30/swagger/compute.json
diff --git a/arm-compute/2016-09-30/swagger/containerService.json b/arm-compute/2016-09-30/swagger/containerService.json
@@ -23,7 +23,7 @@
         ],
         "operationId": "ContainerServices_List",
         "summary": "Gets a list of container services in the specified subscription.",
-        "description":"Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, number of masters and agents, and FQDNs of masters and agents.",
+        "description":"Gets a list of container services in the specified subscription. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.",
         "parameters": [
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -111,8 +111,8 @@
           "ContainerService"
         ],
         "operationId": "ContainerServices_Get",
-        "summary":"Gets the specified container service.",
-        "description": "Gets the specified container service in the specified subscription and resource group. The operation returns the properties for the specified container service including state, number of masters and agents, and FQDNs of masters and agents. ",
+        "summary":"Gets the properties of the specified container service.",
+        "description": "Gets the properties of the specified container service in the specified subscription and resource group. The operation returns the properties including state, orchestrator, number of masters and agents, and FQDNs of masters and agents. ",
         "parameters": [
           {
             "name": "resourceGroupName",
@@ -191,7 +191,7 @@
         ],
         "operationId": "ContainerServices_ListByResourceGroup",
         "summary": "Gets a list of container services in the specified resource group.",
-        "description": "Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, number of masters and agents, and FQDNs of masters and agents.",
+        "description": "Gets a list of container services in the specified subscription and resource group. The operation returns properties of each container service including state, orchestrator, number of masters and agents, and FQDNs of masters and agents.",
         "parameters": [
           {
             "name": "resourceGroupName",
@@ -264,7 +264,7 @@
               "description": "The name of the custom orchestrator to use."
             }
           },
-          "description": "Properties to configure custom clusters.",
+          "description": "Properties to configure a custom container service cluster.",
           "required": ["orchestrator"]
         },
         "ContainerServiceServicePrincipalProfile": {
@@ -291,16 +291,17 @@
               "enum": [
                 "Swarm",
                 "DCOS",
-                "Custom"
+                "Custom",
+                "Kubernetes"
               ],
               "x-ms-enum": {
                 "name": "ContainerServiceOchestratorTypes",
                 "modelAsString": false
               },
-              "description": "Specifies the orchestrator to use to manage container service cluster resources."
+              "description": "The orchestrator to use to manage container service cluster resources. Valid values are Swarm, DCOS, and Custom."
             }
           },
-          "description": "Profile for orchestrator.",
+          "description": "Profile for the container service orchestrator.",
           "required": [ "orchestratorType" ]
         },
         "ContainerServiceMasterProfile": {
@@ -313,12 +314,12 @@
                 3,
                 5
               ],
-              "description": "Number of masters (VMs) in the container service cluster.",
+              "description": "Number of masters (VMs) in the container service cluster. Allowed values are 1, 3, and 5. The default value is 1.",
               "default": 1
             },
             "dnsPrefix": {
               "type": "string",
-              "description": "DNS prefix to be used to create FQDN for master."
+              "description": "DNS prefix to be used to create the FQDN for master."
             },
             "fqdn": {
               "readOnly": true,
@@ -329,20 +330,20 @@
           "required": [
             "dnsPrefix"
           ],
-          "description": "Profile for container service master."
+          "description": "Profile for the container service master."
         },
         "ContainerServiceAgentPoolProfile": {
           "properties": {
             "name": {
               "type": "string",
-              "description": "Unique name of the agent pool profile within the context of the subscription and resource group"
+              "description": "Unique name of the agent pool profile in the context of the subscription and resource group."
             },
             "count": {
               "type": "integer",
               "format": "int32",
               "maximum": 100,
               "minimum": 1,
-              "description": "Number of agents (VMs) to host docker containers"
+              "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. "
             },
             "vmSize": {
               "type": "string",
@@ -417,7 +418,7 @@
             "count",
             "vmSize"
           ],
-          "description": "Profile for container service agent pool."
+          "description": "Profile for the container service agent pool."
         },
         "ContainerServiceWindowsProfile": {
           "properties": {
@@ -436,7 +437,7 @@
             "adminUsername",
             "adminPassword"
           ],
-          "description": "Profile for Windows VMs."
+          "description": "Profile for Windows VMs in the container service cluster."
         },
         "ContainerServiceLinuxProfile": {
           "properties": {
@@ -454,7 +455,7 @@
             "adminUsername",
             "ssh"
           ],
-          "description": "Profile for Linux VMs."
+          "description": "Profile for Linux VMs in the container service cluster."
         },
         "ContainerServiceSshConfiguration": {
           "properties": {
@@ -494,15 +495,15 @@
           "properties": {
             "enabled": {
               "type": "boolean",
-              "description": "Whether the VM diagnostic agent should be provisioned on the VM."
+              "description": "Whether the VM diagnostic agent is provisioned on the VM."
             },
             "storageUri": {
               "readOnly": true,
               "type": "string",
               "description": "The URI of the storage account where diagnostics are stored."
             }
           },
-          "description": "Describes VM diagnostics.",
+          "description": "Profile for diagnostics on the container service VMs.",
           "required": [
             "enabled"
           ]
@@ -535,14 +536,14 @@
               "description": "The URL to get the next set of container service results."
             }
           },
-          "description": "The List Container Service operation response."
+          "description": "The response from the List Container Services operation."
         },
         "ContainerServiceProperties": {
           "properties": {
             "provisioningState": {
               "readOnly": true,
               "type": "string",
-              "description": "The provisioning state, which only appears in the response."
+              "description": "The current deployment or provisioning state, which only appears in the response."
             },
             "orchestratorProfile": {
               "$ref": "#/definitions/ContainerServiceOrchestratorProfile",
@@ -565,7 +566,7 @@
               "items": {
                 "$ref": "#/definitions/ContainerServiceAgentPoolProfile"
               },
-              "description": "Properties of agent pools."
+              "description": "Properties of the agent pool."
             },
             "windowsProfile": {
               "$ref": "#/definitions/ContainerServiceWindowsProfile",