Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-batch/azure/batch/batch_service_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def __init__(
super(BatchServiceClient, self).__init__(self.config.credentials, self.config)

client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
self.api_version = '2018-03-01.6.1'
self.api_version = '2018-08-01.7.0'
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)

Expand Down
5 changes: 3 additions & 2 deletions azure-batch/azure/batch/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
from .affinity_information_py3 import AffinityInformation
from .task_execution_information_py3 import TaskExecutionInformation
from .compute_node_information_py3 import ComputeNodeInformation
from .node_agent_information_py3 import NodeAgentInformation
from .multi_instance_settings_py3 import MultiInstanceSettings
from .task_statistics_py3 import TaskStatistics
from .task_id_range_py3 import TaskIdRange
Expand Down Expand Up @@ -290,6 +291,7 @@
from .affinity_information import AffinityInformation
from .task_execution_information import TaskExecutionInformation
from .compute_node_information import ComputeNodeInformation
from .node_agent_information import NodeAgentInformation
from .multi_instance_settings import MultiInstanceSettings
from .task_statistics import TaskStatistics
from .task_id_range import TaskIdRange
Expand Down Expand Up @@ -449,7 +451,6 @@
JobPreparationTaskState,
TaskExecutionResult,
JobReleaseTaskState,
TaskCountValidationStatus,
PoolState,
AllocationState,
TaskState,
Expand Down Expand Up @@ -545,6 +546,7 @@
'AffinityInformation',
'TaskExecutionInformation',
'ComputeNodeInformation',
'NodeAgentInformation',
'MultiInstanceSettings',
'TaskStatistics',
'TaskIdRange',
Expand Down Expand Up @@ -703,7 +705,6 @@
'JobPreparationTaskState',
'TaskExecutionResult',
'JobReleaseTaskState',
'TaskCountValidationStatus',
'PoolState',
'AllocationState',
'TaskState',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
class AccountListPoolNodeCountsOptions(Model):
"""Additional parameters for list_pool_node_counts operation.

:param filter: An OData $filter clause.
:param filter: An OData $filter clause. For more information on
constructing this filter, see
https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch.
:type filter: str
:param max_results: The maximum number of items to return in the response.
Default value: 10 .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
class AccountListPoolNodeCountsOptions(Model):
"""Additional parameters for list_pool_node_counts operation.

:param filter: An OData $filter clause.
:param filter: An OData $filter clause. For more information on
constructing this filter, see
https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch.
:type filter: str
:param max_results: The maximum number of items to return in the response.
Default value: 10 .
Expand Down
6 changes: 0 additions & 6 deletions azure-batch/azure/batch/models/batch_service_client_enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,6 @@ class JobReleaseTaskState(str, Enum):
completed = "completed" #: The task has exited with exit code 0, or the task has exhausted its retry limit, or the Batch service was unable to start the task due to task preparation errors (such as resource file download failures).


class TaskCountValidationStatus(str, Enum):

validated = "validated" #: The Batch service has validated the state counts against the task states as reported in the List Tasks API.
unvalidated = "unvalidated" #: The Batch service has not been able to check state counts against the task states as reported in the List Tasks API. The validationStatus may be unvalidated if the job contains more than 200,000 tasks.


class PoolState(str, Enum):

active = "active" #: The pool is available to run tasks subject to the availability of compute nodes.
Expand Down
15 changes: 3 additions & 12 deletions azure-batch/azure/batch/models/cloud_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,9 @@ class CloudPool(Model):
:type allocation_state_transition_time: datetime
:param vm_size: The size of virtual machines in the pool. All virtual
machines in a pool are the same size. For information about available
sizes of virtual machines for Cloud Services pools (pools created with
cloudServiceConfiguration), see Sizes for Cloud Services
(https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/).
Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and
A2V2. For information about available VM sizes for pools using images from
the Virtual Machines Marketplace (pools created with
virtualMachineConfiguration) see Sizes for Virtual Machines (Linux)
(https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/)
or Sizes for Virtual Machines (Windows)
(https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/).
Batch supports all Azure VM sizes except STANDARD_A0 and those with
premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
sizes of virtual machines in pools, see Choose a VM size for compute nodes
in an Azure Batch pool
(https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes).
:type vm_size: str
:param cloud_service_configuration: The cloud service configuration for
the pool. This property and virtualMachineConfiguration are mutually
Expand Down
15 changes: 3 additions & 12 deletions azure-batch/azure/batch/models/cloud_pool_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,9 @@ class CloudPool(Model):
:type allocation_state_transition_time: datetime
:param vm_size: The size of virtual machines in the pool. All virtual
machines in a pool are the same size. For information about available
sizes of virtual machines for Cloud Services pools (pools created with
cloudServiceConfiguration), see Sizes for Cloud Services
(https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/).
Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and
A2V2. For information about available VM sizes for pools using images from
the Virtual Machines Marketplace (pools created with
virtualMachineConfiguration) see Sizes for Virtual Machines (Linux)
(https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/)
or Sizes for Virtual Machines (Windows)
(https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/).
Batch supports all Azure VM sizes except STANDARD_A0 and those with
premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
sizes of virtual machines in pools, see Choose a VM size for compute nodes
in an Azure Batch pool
(https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes).
:type vm_size: str
:param cloud_service_configuration: The cloud service configuration for
the pool. This property and virtualMachineConfiguration are mutually
Expand Down
21 changes: 8 additions & 13 deletions azure-batch/azure/batch/models/compute_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,9 @@ class ComputeNode(Model):
task is scheduled, then the task will be scheduled elsewhere.
:type affinity_id: str
:param vm_size: The size of the virtual machine hosting the compute node.
For information about available sizes of virtual machines for Cloud
Services pools (pools created with cloudServiceConfiguration), see Sizes
for Cloud Services
(https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/).
Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and
A2V2. For information about available VM sizes for pools using images from
the Virtual Machines Marketplace (pools created with
virtualMachineConfiguration) see Sizes for Virtual Machines (Linux)
(https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/)
or Sizes for Virtual Machines (Windows)
(https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/).
Batch supports all Azure VM sizes except STANDARD_A0 and those with
premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
For information about available sizes of virtual machines in pools, see
Choose a VM size for compute nodes in an Azure Batch pool
(https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes).
:type vm_size: str
:param total_tasks_run: The total number of job tasks completed on the
compute node. This includes Job Manager tasks and normal tasks, but not
Expand Down Expand Up @@ -111,6 +101,9 @@ class ComputeNode(Model):
node.
:type endpoint_configuration:
~azure.batch.models.ComputeNodeEndpointConfiguration
:param node_agent_info: Information about the node agent version and the
time the node upgraded to a new version.
:type node_agent_info: ~azure.batch.models.NodeAgentInformation
"""

_attribute_map = {
Expand All @@ -134,6 +127,7 @@ class ComputeNode(Model):
'errors': {'key': 'errors', 'type': '[ComputeNodeError]'},
'is_dedicated': {'key': 'isDedicated', 'type': 'bool'},
'endpoint_configuration': {'key': 'endpointConfiguration', 'type': 'ComputeNodeEndpointConfiguration'},
'node_agent_info': {'key': 'nodeAgentInfo', 'type': 'NodeAgentInformation'},
}

def __init__(self, **kwargs):
Expand All @@ -158,3 +152,4 @@ def __init__(self, **kwargs):
self.errors = kwargs.get('errors', None)
self.is_dedicated = kwargs.get('is_dedicated', None)
self.endpoint_configuration = kwargs.get('endpoint_configuration', None)
self.node_agent_info = kwargs.get('node_agent_info', None)
23 changes: 9 additions & 14 deletions azure-batch/azure/batch/models/compute_node_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,9 @@ class ComputeNode(Model):
task is scheduled, then the task will be scheduled elsewhere.
:type affinity_id: str
:param vm_size: The size of the virtual machine hosting the compute node.
For information about available sizes of virtual machines for Cloud
Services pools (pools created with cloudServiceConfiguration), see Sizes
for Cloud Services
(https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/).
Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and
A2V2. For information about available VM sizes for pools using images from
the Virtual Machines Marketplace (pools created with
virtualMachineConfiguration) see Sizes for Virtual Machines (Linux)
(https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/)
or Sizes for Virtual Machines (Windows)
(https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/).
Batch supports all Azure VM sizes except STANDARD_A0 and those with
premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
For information about available sizes of virtual machines in pools, see
Choose a VM size for compute nodes in an Azure Batch pool
(https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes).
:type vm_size: str
:param total_tasks_run: The total number of job tasks completed on the
compute node. This includes Job Manager tasks and normal tasks, but not
Expand Down Expand Up @@ -111,6 +101,9 @@ class ComputeNode(Model):
node.
:type endpoint_configuration:
~azure.batch.models.ComputeNodeEndpointConfiguration
:param node_agent_info: Information about the node agent version and the
time the node upgraded to a new version.
:type node_agent_info: ~azure.batch.models.NodeAgentInformation
"""

_attribute_map = {
Expand All @@ -134,9 +127,10 @@ class ComputeNode(Model):
'errors': {'key': 'errors', 'type': '[ComputeNodeError]'},
'is_dedicated': {'key': 'isDedicated', 'type': 'bool'},
'endpoint_configuration': {'key': 'endpointConfiguration', 'type': 'ComputeNodeEndpointConfiguration'},
'node_agent_info': {'key': 'nodeAgentInfo', 'type': 'NodeAgentInformation'},
}

def __init__(self, *, id: str=None, url: str=None, state=None, scheduling_state=None, state_transition_time=None, last_boot_time=None, allocation_time=None, ip_address: str=None, affinity_id: str=None, vm_size: str=None, total_tasks_run: int=None, running_tasks_count: int=None, total_tasks_succeeded: int=None, recent_tasks=None, start_task=None, start_task_info=None, certificate_references=None, errors=None, is_dedicated: bool=None, endpoint_configuration=None, **kwargs) -> None:
def __init__(self, *, id: str=None, url: str=None, state=None, scheduling_state=None, state_transition_time=None, last_boot_time=None, allocation_time=None, ip_address: str=None, affinity_id: str=None, vm_size: str=None, total_tasks_run: int=None, running_tasks_count: int=None, total_tasks_succeeded: int=None, recent_tasks=None, start_task=None, start_task_info=None, certificate_references=None, errors=None, is_dedicated: bool=None, endpoint_configuration=None, node_agent_info=None, **kwargs) -> None:
super(ComputeNode, self).__init__(**kwargs)
self.id = id
self.url = url
Expand All @@ -158,3 +152,4 @@ def __init__(self, *, id: str=None, url: str=None, state=None, scheduling_state=
self.errors = errors
self.is_dedicated = is_dedicated
self.endpoint_configuration = endpoint_configuration
self.node_agent_info = node_agent_info
4 changes: 2 additions & 2 deletions azure-batch/azure/batch/models/container_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ContainerConfiguration(Model):
All required parameters must be populated in order to send to Azure.

:ivar type: Required. The container technology to be used. Default value:
"docker" .
"dockerCompatible" .
:vartype type: str
:param container_image_names: The collection of container image names.
This is the full image reference, as would be specified to "docker pull".
Expand All @@ -45,7 +45,7 @@ class ContainerConfiguration(Model):
'container_registries': {'key': 'containerRegistries', 'type': '[ContainerRegistry]'},
}

type = "docker"
type = "dockerCompatible"

def __init__(self, **kwargs):
super(ContainerConfiguration, self).__init__(**kwargs)
Expand Down
4 changes: 2 additions & 2 deletions azure-batch/azure/batch/models/container_configuration_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class ContainerConfiguration(Model):
All required parameters must be populated in order to send to Azure.

:ivar type: Required. The container technology to be used. Default value:
"docker" .
"dockerCompatible" .
:vartype type: str
:param container_image_names: The collection of container image names.
This is the full image reference, as would be specified to "docker pull".
Expand All @@ -45,7 +45,7 @@ class ContainerConfiguration(Model):
'container_registries': {'key': 'containerRegistries', 'type': '[ContainerRegistry]'},
}

type = "docker"
type = "dockerCompatible"

def __init__(self, *, container_image_names=None, container_registries=None, **kwargs) -> None:
super(ContainerConfiguration, self).__init__(**kwargs)
Expand Down
2 changes: 1 addition & 1 deletion azure-batch/azure/batch/models/data_disk.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class DataDisk(Model):
distinct lun.
:type lun: int
:param caching: The type of caching to be enabled for the data disks. The
default value for caching is none. For information about the caching
default value for caching is readwrite. For information about the caching
options see:
https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/.
Possible values include: 'none', 'readOnly', 'readWrite'
Expand Down
2 changes: 1 addition & 1 deletion azure-batch/azure/batch/models/data_disk_py3.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class DataDisk(Model):
distinct lun.
:type lun: int
:param caching: The type of caching to be enabled for the data disks. The
default value for caching is none. For information about the caching
default value for caching is readwrite. For information about the caching
options see:
https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/.
Possible values include: 'none', 'readOnly', 'readWrite'
Expand Down
47 changes: 47 additions & 0 deletions azure-batch/azure/batch/models/node_agent_information.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from msrest.serialization import Model


class NodeAgentInformation(Model):
"""Information about the node agent.

The Batch node agent is a program that runs on each node in the pool and
provides Batch capability on the compute node.

All required parameters must be populated in order to send to Azure.

:param version: Required. The version of the Batch node agent running on
the compute node. This version number can be checked against the node
agent release notes located at
https://github.com/Azure/Batch/blob/master/changelogs/nodeagent/CHANGELOG.md.
:type version: str
:param last_update_time: Required. The time when the node agent was
updated on the compute node. This is the most recent time that the node
agent was updated to a new version.
:type last_update_time: datetime
"""

_validation = {
'version': {'required': True},
'last_update_time': {'required': True},
}

_attribute_map = {
'version': {'key': 'version', 'type': 'str'},
'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'},
}

def __init__(self, **kwargs):
super(NodeAgentInformation, self).__init__(**kwargs)
self.version = kwargs.get('version', None)
self.last_update_time = kwargs.get('last_update_time', None)
47 changes: 47 additions & 0 deletions azure-batch/azure/batch/models/node_agent_information_py3.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from msrest.serialization import Model


class NodeAgentInformation(Model):
"""Information about the node agent.

The Batch node agent is a program that runs on each node in the pool and
provides Batch capability on the compute node.

All required parameters must be populated in order to send to Azure.

:param version: Required. The version of the Batch node agent running on
the compute node. This version number can be checked against the node
agent release notes located at
https://github.com/Azure/Batch/blob/master/changelogs/nodeagent/CHANGELOG.md.
:type version: str
:param last_update_time: Required. The time when the node agent was
updated on the compute node. This is the most recent time that the node
agent was updated to a new version.
:type last_update_time: datetime
"""

_validation = {
'version': {'required': True},
'last_update_time': {'required': True},
}

_attribute_map = {
'version': {'key': 'version', 'type': 'str'},
'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'},
}

def __init__(self, *, version: str, last_update_time, **kwargs) -> None:
super(NodeAgentInformation, self).__init__(**kwargs)
self.version = version
self.last_update_time = last_update_time
3 changes: 2 additions & 1 deletion azure-batch/azure/batch/models/os_disk.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ class OSDisk(Model):
"""Settings for the operating system disk of the virtual machine.

:param caching: The type of caching to enable for the OS disk. The default
value for caching is none. For information about the caching options see:
value for caching is readwrite. For information about the caching options
see:
https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/.
Possible values include: 'none', 'readOnly', 'readWrite'
:type caching: str or ~azure.batch.models.CachingType
Expand Down
Loading