Skip to content

Commit

Permalink
Merge pull request #865 from AutorestCI/RestAPI-PR686
Browse files Browse the repository at this point in the history
Automatic PR from RestAPI-PR686
  • Loading branch information
lmazuel committed Nov 10, 2016
2 parents 96725c8 + 7faafe8 commit 1deb78a
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class ContainerService(Resource):
:type location: str
:param tags: Resource tags.
:type tags: dict
:ivar provisioning_state: The provisioning state, which only appears in
the response.
:ivar provisioning_state: The current deployment or provisioning state,
which only appears in the response.
:vartype provisioning_state: str
:param orchestrator_profile: Properties of the orchestrator.
:type orchestrator_profile: :class:`ContainerServiceOrchestratorProfile
Expand All @@ -45,7 +45,7 @@ class ContainerService(Resource):
:param master_profile: Properties of master agents.
:type master_profile: :class:`ContainerServiceMasterProfile
<azure.mgmt.compute.models.ContainerServiceMasterProfile>`
:param agent_pool_profiles: Properties of agent pools.
:param agent_pool_profiles: Properties of the agent pool.
:type agent_pool_profiles: list of
:class:`ContainerServiceAgentPoolProfile
<azure.mgmt.compute.models.ContainerServiceAgentPoolProfile>`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@


class ContainerServiceAgentPoolProfile(Model):
"""Profile for container service agent pool.
"""Profile for the container service agent pool.
Variables are only populated by the server, and will be ignored when
sending a request.
:param name: Unique name of the agent pool profile within the context of
the subscription and resource group
:param name: Unique name of the agent pool profile in the context of the
subscription and resource group.
:type name: str
:param count: Number of agents (VMs) to host docker containers
:param count: 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.
:type count: int
:param vm_size: Size of agent VMs. Possible values include:
'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class ContainerServiceCustomProfile(Model):
"""Properties to configure custom clusters.
"""Properties to configure a custom container service cluster.
:param orchestrator: The name of the custom orchestrator to use.
:type orchestrator: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class ContainerServiceLinuxProfile(Model):
"""Profile for Linux VMs.
"""Profile for Linux VMs in the container service cluster.
:param admin_username: The administrator user name to use for Linux VMs.
:type admin_username: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@


class ContainerServiceMasterProfile(Model):
"""Profile for container service master.
"""Profile for the container service master.
Variables are only populated by the server, and will be ignored when
sending a request.
:param count: Number of masters (VMs) in the container service cluster.
Default value: 1 .
Allowed values are 1, 3, and 5. The default value is 1. Default value: 1
.
:type count: int
:param dns_prefix: DNS prefix to be used to create FQDN for master.
:param dns_prefix: DNS prefix to be used to create the FQDN for master.
:type dns_prefix: str
:ivar fqdn: FDQN for the master.
:vartype fqdn: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@


class ContainerServiceOrchestratorProfile(Model):
"""Profile for orchestrator.
"""Profile for the container service orchestrator.
:param orchestrator_type: Specifies the orchestrator to use to manage
container service cluster resources. Possible values include: 'Swarm',
'DCOS', 'Custom'
:param orchestrator_type: The orchestrator to use to manage container
service cluster resources. Valid values are Swarm, DCOS, and Custom.
Possible values include: 'Swarm', 'DCOS', 'Custom'
:type orchestrator_type: str or :class:`ContainerServiceOchestratorTypes
<azure.mgmt.compute.models.ContainerServiceOchestratorTypes>`
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@


class ContainerServiceVMDiagnostics(Model):
"""Describes VM diagnostics.
"""Profile for diagnostics on the container service VMs.
Variables are only populated by the server, and will be ignored when
sending a request.
:param enabled: Whether the VM diagnostic agent should be provisioned on
the VM.
:param enabled: Whether the VM diagnostic agent is provisioned on the VM.
:type enabled: bool
:ivar storage_uri: The URI of the storage account where diagnostics are
stored.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


class ContainerServiceWindowsProfile(Model):
"""Profile for Windows VMs.
"""Profile for Windows VMs in the container service cluster.
:param admin_username: The administrator user name to use for Windows VMs.
:type admin_username: str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ def list(
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.
state, orchestrator, number of masters and agents, and FQDNs of
masters and agents.
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
Expand Down Expand Up @@ -206,11 +207,11 @@ def get_long_running_output(response):

def get(
self, resource_group_name, container_service_name, custom_headers=None, raw=False, **operation_config):
"""Gets the specified container service.
"""Gets the properties of the specified container service.
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
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. .
:param resource_group_name: The name of the resource group.
Expand Down Expand Up @@ -363,8 +364,8 @@ def list_by_resource_group(
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.
service including state, orchestrator, number of masters and agents,
and FQDNs of masters and agents.
:param resource_group_name: The name of the resource group.
:type resource_group_name: str
Expand Down

0 comments on commit 1deb78a

Please sign in to comment.