Change azure-batch-extensions namespace (#64)
* Change azure-batch-extensions namespace * Remove 'experimental' string from our commands.
This commit is contained in:
Xing Wu
GitHub
Родитель
69d889efe1
Коммит
7a2d63e9be
|
|
@ -3,6 +3,11 @@
|
|||
SDK Release History
|
||||
===================
|
||||
|
||||
2.0.0 (2018-6-1)
|
||||
------------------
|
||||
|
||||
* Rename the namespace to azext.batch
|
||||
|
||||
1.1.2 (2018-5-21)
|
||||
------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ class ApplicationTemplate(Model):
|
|||
:param task_factory: A task factory reference to automatically generate a set of
|
||||
tasks to be added to the job.
|
||||
:type task_factory: :class:`TaskFactoryBase
|
||||
<azure.batch_extensions.models.TaskFactoryBase>`
|
||||
<azext.batch.models.TaskFactoryBase>`
|
||||
"""
|
||||
|
||||
_attribute_map = {
|
||||
|
|
@ -105,14 +105,14 @@ class ExtendedJobParameter(JobAddParameter):
|
|||
:param task_factory: A task factory reference to automatically generate a set of
|
||||
tasks to be added to the job.
|
||||
:type task_factory: :class:`TaskFactoryBase
|
||||
<azure.batch_extensions.models.TaskFactoryBase>`
|
||||
<azext.batch.models.TaskFactoryBase>`
|
||||
:param application_template_info: A reference to an application template file to
|
||||
be expanded to complete the job specification. If supplied, the following arugments
|
||||
cannot also be supplied or they will be overwritten: 'job_manager_task',
|
||||
'common_environment_settings', 'uses_task_dependencies', 'on_all_tasks_complete',
|
||||
'on_task_failure', 'task_factory', 'job_preparation_task', 'job_release_task'.
|
||||
:type application_template_info: :class:`ApplicationTemplateInfo
|
||||
<azure.batch_extensions.models.ApplicationTemplateInfo>`
|
||||
<azext.batch.models.ApplicationTemplateInfo>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -17,7 +17,7 @@ class ExtendedOutputFileDestination(Model):
|
|||
:param auto_storage: An auto-storage file group reference. This cannot be
|
||||
combined with container.
|
||||
:type auto_storage: :class:`OutputFileAutoStorageDestination
|
||||
<azure.batch_extensions.models.OutputFileAutoStorageDestination>`
|
||||
<azext.batch.models.OutputFileAutoStorageDestination>`
|
||||
"""
|
||||
|
||||
_attribute_map = {
|
||||
|
|
@ -144,7 +144,7 @@ class ExtendedPoolParameter(PoolAddParameter):
|
|||
nodes. Must be of a Package Manager type in accordance with the selected
|
||||
operating system.
|
||||
:type package_references: list of :class:`PackageReferenceBase
|
||||
<azure.batch_extensions.models.PackageReferenceBase>`
|
||||
<azext.batch.models.PackageReferenceBase>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -140,7 +140,7 @@ class ExtendedPoolSpecification(PoolSpecification):
|
|||
nodes. Must be of a Package Manager type in accordance with the selected
|
||||
operating system.
|
||||
:type package_references: list of :class:`PackageReferenceBase
|
||||
<azure.batch_extensions.models.PackageReferenceBase>`
|
||||
<azext.batch.models.PackageReferenceBase>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -32,7 +32,7 @@ class ExtendedResourceFile(ResourceFile):
|
|||
:param source: A file source reference which could include a collection of files from
|
||||
a Azure Storage container or an auto-storage file group.
|
||||
:type source: :class:`FileSource
|
||||
<azure.batch_extensions.models.FileSource>`
|
||||
<azext.batch.models.FileSource>`
|
||||
"""
|
||||
|
||||
_attribute_map = {
|
||||
|
|
@ -108,12 +108,12 @@ class ExtendedTaskParameter(TaskAddParameter):
|
|||
tasks, the files will only be uploaded from the compute node on which the
|
||||
primary task is executed.
|
||||
:type output_files: list of :class:`OutputFile
|
||||
<azure.batch_extensions.models.OutputFile>`
|
||||
<azext.batch.models.OutputFile>`
|
||||
:param package_references: A list of packages to be installed on the compute
|
||||
nodes. Must be of a Package Manager type in accordance with the selected
|
||||
operating system.
|
||||
:type package_references: list of :class:`PackageReferenceBase
|
||||
<azure.batch_extensions.models.PackageReferenceBase>`
|
||||
<azext.batch.models.PackageReferenceBase>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -12,12 +12,12 @@ class FileCollectionTaskFactory(TaskFactoryBase):
|
|||
will be generated per input file, and automatically added to the job.
|
||||
|
||||
:param source: The input file source from which the tasks will be generated.
|
||||
:type source: :class:`FileSource <azure.batch_extensions.models.FileSource>`
|
||||
:type source: :class:`FileSource <azext.batch.models.FileSource>`
|
||||
:param repeat_task: The task template the will be used to generate each task.
|
||||
:type repeat_task: :class:`RepeatTask <azure.batch_extensions.models.RepeatTask>`
|
||||
:type repeat_task: :class:`RepeatTask <azext.batch.models.RepeatTask>`
|
||||
:param merge_task: An optional additional task to be run after all the other
|
||||
generated tasks have completed successfully.
|
||||
:type merge_task: :class:`MergeTask <azure.batch_extensions.models.MergeTask>`
|
||||
:type merge_task: :class:`MergeTask <azext.batch.models.MergeTask>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -56,7 +56,7 @@ class JobManagerTask(Model):
|
|||
download to the compute node before running the command line. Files listed
|
||||
under this element are located in the task's working directory.
|
||||
:type resource_files: list of :class:`ExtendedResourceFile
|
||||
<azure.batch_extensions.models.ExtendedResourceFile>`
|
||||
<azext.batch.models.ExtendedResourceFile>`
|
||||
:param output_files: A list of files that the Batch service will upload
|
||||
from the compute node after running the command line. For multi-instance
|
||||
tasks, the files will only be uploaded from the compute node on which the
|
||||
|
|
@ -59,7 +59,7 @@ class JobPreparationTask(Model):
|
|||
download to the compute node before running the command line. Files listed
|
||||
under this element are located in the task's working directory.
|
||||
:type resource_files: list of :class:`ExtendedResourceFile
|
||||
<azure.batch_extensions.models.ExtendedResourceFile>`
|
||||
<azext.batch.models.ExtendedResourceFile>`
|
||||
:param environment_settings: A list of environment variable settings for
|
||||
the Job Preparation task.
|
||||
:type environment_settings: list of :class:`EnvironmentSetting
|
||||
|
|
@ -58,7 +58,7 @@ class JobReleaseTask(Model):
|
|||
download to the compute node before running the command line. Files listed
|
||||
under this element are located in the task's working directory.
|
||||
:type resource_files: list of :class:`ExtendedResourceFile
|
||||
<azure.batch_extensions.models.ExtendedResourceFile>`
|
||||
<azext.batch.models.ExtendedResourceFile>`
|
||||
:param environment_settings: A list of environment variable settings for
|
||||
the Job Release task.
|
||||
:type environment_settings: list of :class:`EnvironmentSetting
|
||||
|
|
@ -15,7 +15,7 @@ class JobTemplate(Model):
|
|||
:param api_version: The API version that the template conforms to.
|
||||
:type api_version: str
|
||||
:param properties: The specificaton of the job.
|
||||
:type properties: :class:`ExtendedJobParameter<azure.batch_extensions.models.ExtendedJobParameter>`
|
||||
:type properties: :class:`ExtendedJobParameter<azext.batch.models.ExtendedJobParameter>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -34,7 +34,7 @@ class MergeTask(Model):
|
|||
multi-instance tasks, the resource files will only be downloaded to the
|
||||
compute node on which the primary task is executed.
|
||||
:type resource_files: list of :class:`ExtendedResourceFile
|
||||
<azure.batch_extensions.models.ExtendedResourceFile>`
|
||||
<azext.batch.models.ExtendedResourceFile>`
|
||||
:param environment_settings: A list of environment variable settings for
|
||||
the task.
|
||||
:type environment_settings: list of :class:`EnvironmentSetting
|
||||
|
|
@ -81,12 +81,12 @@ class MergeTask(Model):
|
|||
:param output_files: A list of output file references to up persisted once
|
||||
the task has completed.
|
||||
:type output_files: list of :class:`OutputFile
|
||||
<azure.batch_extensions.models.OutputFile>`
|
||||
<azext.batch.models.OutputFile>`
|
||||
:param package_references: A list of packages to be installed on the compute
|
||||
nodes. Must be of a Package Manager type in accordance with the selected
|
||||
operating system.
|
||||
:type package_references: list of :class:`PackageReferenceBase
|
||||
<azure.batch_extensions.models.PackageReferenceBase>`
|
||||
<azext.batch.models.PackageReferenceBase>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -28,7 +28,7 @@ class MultiInstanceSettings(Model):
|
|||
directory, but instead are downloaded to the task root directory (one
|
||||
directory above the working directory).
|
||||
:type common_resource_files: list of :class:`ExtendedResourceFile
|
||||
<azure.batch_extensions.models.ExtendedResourceFile>`
|
||||
<azext.batch.models.ExtendedResourceFile>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -30,7 +30,7 @@ class OutputFile(Model):
|
|||
:type file_pattern: str
|
||||
:param destination: The destination for the output file(s).
|
||||
:type destination: :class:`ExtendedOutputFileDestination
|
||||
<azure.batch_extensions.models.ExtendedOutputFileDestination>`
|
||||
<azext.batch.models.ExtendedOutputFileDestination>`
|
||||
:param upload_options: Additional options for the upload operation,
|
||||
including under what conditions to perform the upload.
|
||||
:type upload_options: :class:`OutputFileUploadOptions
|
||||
|
|
@ -13,12 +13,12 @@ class ParametricSweepTaskFactory(TaskFactoryBase):
|
|||
parameter sets can be combined for a multi-dimensional sweep.
|
||||
|
||||
:param parameter_sets: A list if parameter sets from which tasks will be generated.
|
||||
:type parameter_sets: A list of :class:`ParameterSet<azure.batch_extensions.models.ParameterSet>`
|
||||
:type parameter_sets: A list of :class:`ParameterSet<azext.batch.models.ParameterSet>`
|
||||
:param repeat_task: The task template the will be used to generate each task.
|
||||
:type repeat_task: :class:`RepeatTask <azure.batch_extensions.models.RepeatTask>`
|
||||
:type repeat_task: :class:`RepeatTask <azext.batch.models.RepeatTask>`
|
||||
:param merge_task: An optional additional task to be run after all the other
|
||||
generated tasks have completed successfully.
|
||||
:type merge_task: :class:`MergeTask <azure.batch_extensions.models.MergeTask>`
|
||||
:type merge_task: :class:`MergeTask <azext.batch.models.MergeTask>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -15,7 +15,7 @@ class PoolTemplate(Model):
|
|||
:param api_version: The API version that the template conforms to.
|
||||
:type api_version: str
|
||||
:param properties: The specificaton of the pool.
|
||||
:type properties: :class:`ExtendedPoolParameter<azure.batch_extensions.models.ExtendedPoolParameter>`
|
||||
:type properties: :class:`ExtendedPoolParameter<azext.batch.models.ExtendedPoolParameter>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -32,7 +32,7 @@ class RepeatTask(Model):
|
|||
:param resource_files: A list of files that the Batch service will
|
||||
download to the compute node before running the command line.
|
||||
:type resource_files: list of :class:`ExtendedResourceFile
|
||||
<azure.batch_extensions.models.ExtendedResourceFile>`
|
||||
<azext.batch.models.ExtendedResourceFile>`
|
||||
:param environment_settings: A list of environment variable settings for
|
||||
the task.
|
||||
:type environment_settings: list of :class:`EnvironmentSetting
|
||||
|
|
@ -71,12 +71,12 @@ class RepeatTask(Model):
|
|||
:param output_files: A list of output file references to up persisted once
|
||||
the task has completed.
|
||||
:type output_files: list of :class:`OutputFile
|
||||
<azure.batch_extensions.models.OutputFile>`
|
||||
<azext.batch.models.OutputFile>`
|
||||
:param package_references: A list of packages to be installed on the compute
|
||||
nodes. Must be of a Package Manager type in accordance with the selected
|
||||
operating system.
|
||||
:type package_references: list of :class:`PackageReferenceBase
|
||||
<azure.batch_extensions.models.PackageReferenceBase>`
|
||||
<azext.batch.models.PackageReferenceBase>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -29,7 +29,7 @@ class StartTask(Model):
|
|||
download to the compute node before running the command line. Files listed
|
||||
under this element are located in the task's working directory.
|
||||
:type resource_files: list of :class:`ExtendedResourceFile
|
||||
<azure.batch_extensions.models.ExtendedResourceFile>`
|
||||
<azext.batch.models.ExtendedResourceFile>`
|
||||
:param environment_settings: A list of environment variable settings for
|
||||
the start task.
|
||||
:type environment_settings: list of :class:`EnvironmentSetting
|
||||
|
|
@ -12,7 +12,7 @@ class TaskCollectionTaskFactory(TaskFactoryBase):
|
|||
|
||||
:param tasks: A list if task parameters, each of which will be added straight to the job.
|
||||
:type tasks: A list of :class:`ExtendedTaskParameter
|
||||
<azure.batch_extensions.models.ExtendedTaskParameter>`
|
||||
<azext.batch.models.ExtendedTaskParameter>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -12,7 +12,7 @@ class TaskFactoryBase(Model):
|
|||
|
||||
:param merge_task: An optional additional task to be run after all the other
|
||||
generated tasks have completed successfully.
|
||||
:type merge_task: :class:`MergeTask <azure.batch_extensions.models.MergeTask>`
|
||||
:type merge_task: :class:`MergeTask <azext.batch.models.MergeTask>`
|
||||
"""
|
||||
|
||||
_validation = {
|
||||
|
|
@ -35,7 +35,7 @@ class ExtendedJobOperations(JobOperations):
|
|||
we will do a GET call on the pool ID.
|
||||
:param job: The job we want to extract the pool info from.
|
||||
:type job: :class:`JobAddParameter<azure.batch.models.JobAddParameter>` or
|
||||
:class:`ExtendedJobParameter<azure.batch_extensions.models.ExtendedJobParameter>`
|
||||
:class:`ExtendedJobParameter<azext.batch.models.ExtendedJobParameter>`
|
||||
:returns: :class:`CloudPool<azure.batch.models.CloudPool>`
|
||||
"""
|
||||
if not job.pool_info:
|
||||
|
|
@ -99,7 +99,7 @@ class ExtendedJobOperations(JobOperations):
|
|||
|
||||
:param job: The job to be added.
|
||||
:type job: :class:`JobAddParameter<azure.batch.models.JobAddParameter>` or
|
||||
:class:`ExtendedJobParameter<azure.batch_extensions.models.ExtendedJobParameter>`
|
||||
:class:`ExtendedJobParameter<azext.batch.models.ExtendedJobParameter>`
|
||||
or :class:`JobTemplate<azure.batch.models.JobTemplate>`
|
||||
:param job_add_options: Additional parameters for the operation
|
||||
:type job_add_options: :class:`JobAddOptions
|
||||
|
|
@ -70,7 +70,7 @@ class ExtendedPoolOperations(PoolOperations):
|
|||
|
||||
:param pool: The pool to be added.
|
||||
:type pool: :class:`PoolAddParameter<azure.batch.models.PoolAddParameter>` or
|
||||
:class:`ExtendedPoolParameter<azure.batch_extensions.models.ExtendedPoolParameter>`
|
||||
:class:`ExtendedPoolParameter<azext.batch.models.ExtendedPoolParameter>`
|
||||
or :class:`PoolTemplate<azure.batch.models.PoolTemplate>`
|
||||
:param pool_add_options: Additional parameters for the operation
|
||||
:type pool_add_options: :class:`PoolAddOptions
|
||||
|
|
@ -3,4 +3,4 @@
|
|||
# Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
# --------------------------------------------------------------------------------------------
|
||||
|
||||
VERSION = "1.1.2"
|
||||
VERSION = "2.0.0"
|
||||
|
|
@ -29,51 +29,51 @@
|
|||
<PtvsTargetsFile>$(MSBuildextensionPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets</PtvsTargetsFile>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="azure\batch_extensions\batch_extensions_client.py" />
|
||||
<Compile Include="azure\batch_extensions\errors.py" />
|
||||
<Compile Include="azure\batch_extensions\models\application_template.py" />
|
||||
<Compile Include="azure\batch_extensions\models\application_template_info.py" />
|
||||
<Compile Include="azure\batch_extensions\models\apt_package_reference.py" />
|
||||
<Compile Include="azure\batch_extensions\models\auto_pool_specification.py" />
|
||||
<Compile Include="azure\batch_extensions\models\chocolatey_package_reference.py" />
|
||||
<Compile Include="azure\batch_extensions\models\constants.py" />
|
||||
<Compile Include="azure\batch_extensions\models\extended_job_parameter.py" />
|
||||
<Compile Include="azure\batch_extensions\models\extended_output_file_destination.py" />
|
||||
<Compile Include="azure\batch_extensions\models\extended_pool_parameter.py" />
|
||||
<Compile Include="azure\batch_extensions\models\extended_pool_specification.py" />
|
||||
<Compile Include="azure\batch_extensions\models\extended_resource_file.py" />
|
||||
<Compile Include="azure\batch_extensions\models\extended_task_parameter.py" />
|
||||
<Compile Include="azure\batch_extensions\models\file_collection_task_factory.py" />
|
||||
<Compile Include="azure\batch_extensions\models\file_source.py" />
|
||||
<Compile Include="azure\batch_extensions\models\job_manager_task.py" />
|
||||
<Compile Include="azure\batch_extensions\models\job_preparation_task.py" />
|
||||
<Compile Include="azure\batch_extensions\models\job_release_task.py" />
|
||||
<Compile Include="azure\batch_extensions\models\job_template.py" />
|
||||
<Compile Include="azure\batch_extensions\models\merge_task.py" />
|
||||
<Compile Include="azure\batch_extensions\models\multi_instance_settings.py" />
|
||||
<Compile Include="azure\batch_extensions\models\output_file.py" />
|
||||
<Compile Include="azure\batch_extensions\models\output_file_auto_storage_destination.py" />
|
||||
<Compile Include="azure\batch_extensions\models\package_reference_base.py" />
|
||||
<Compile Include="azure\batch_extensions\models\parameter_set.py" />
|
||||
<Compile Include="azure\batch_extensions\models\parametric_sweep_task_factory.py" />
|
||||
<Compile Include="azure\batch_extensions\models\pool_template.py" />
|
||||
<Compile Include="azure\batch_extensions\models\repeat_task.py" />
|
||||
<Compile Include="azure\batch_extensions\models\start_task.py" />
|
||||
<Compile Include="azure\batch_extensions\models\task_collection_task_factory.py" />
|
||||
<Compile Include="azure\batch_extensions\models\task_factory_base.py" />
|
||||
<Compile Include="azure\batch_extensions\models\yum_package_reference.py" />
|
||||
<Compile Include="azure\batch_extensions\models\__init__.py" />
|
||||
<Compile Include="azure\batch_extensions\operations\file_operations.py" />
|
||||
<Compile Include="azure\batch_extensions\operations\job_operations.py" />
|
||||
<Compile Include="azure\batch_extensions\operations\pool_operations.py" />
|
||||
<Compile Include="azure\batch_extensions\operations\task_operations.py" />
|
||||
<Compile Include="azure\batch_extensions\operations\__init__.py" />
|
||||
<Compile Include="azure\batch_extensions\version.py" />
|
||||
<Compile Include="azure\batch_extensions\_file_utils.py" />
|
||||
<Compile Include="azure\batch_extensions\_pool_utils.py" />
|
||||
<Compile Include="azure\batch_extensions\_template_utils.py" />
|
||||
<Compile Include="azure\batch_extensions\__init__.py" />
|
||||
<Compile Include="azure\__init__.py" />
|
||||
<Compile Include="azext\batch\batch_extensions_client.py" />
|
||||
<Compile Include="azext\batch\errors.py" />
|
||||
<Compile Include="azext\batch\models\application_template.py" />
|
||||
<Compile Include="azext\batch\models\application_template_info.py" />
|
||||
<Compile Include="azext\batch\models\apt_package_reference.py" />
|
||||
<Compile Include="azext\batch\models\auto_pool_specification.py" />
|
||||
<Compile Include="azext\batch\models\chocolatey_package_reference.py" />
|
||||
<Compile Include="azext\batch\models\constants.py" />
|
||||
<Compile Include="azext\batch\models\extended_job_parameter.py" />
|
||||
<Compile Include="azext\batch\models\extended_output_file_destination.py" />
|
||||
<Compile Include="azext\batch\models\extended_pool_parameter.py" />
|
||||
<Compile Include="azext\batch\models\extended_pool_specification.py" />
|
||||
<Compile Include="azext\batch\models\extended_resource_file.py" />
|
||||
<Compile Include="azext\batch\models\extended_task_parameter.py" />
|
||||
<Compile Include="azext\batch\models\file_collection_task_factory.py" />
|
||||
<Compile Include="azext\batch\models\file_source.py" />
|
||||
<Compile Include="azext\batch\models\job_manager_task.py" />
|
||||
<Compile Include="azext\batch\models\job_preparation_task.py" />
|
||||
<Compile Include="azext\batch\models\job_release_task.py" />
|
||||
<Compile Include="azext\batch\models\job_template.py" />
|
||||
<Compile Include="azext\batch\models\merge_task.py" />
|
||||
<Compile Include="azext\batch\models\multi_instance_settings.py" />
|
||||
<Compile Include="azext\batch\models\output_file.py" />
|
||||
<Compile Include="azext\batch\models\output_file_auto_storage_destination.py" />
|
||||
<Compile Include="azext\batch\models\package_reference_base.py" />
|
||||
<Compile Include="azext\batch\models\parameter_set.py" />
|
||||
<Compile Include="azext\batch\models\parametric_sweep_task_factory.py" />
|
||||
<Compile Include="azext\batch\models\pool_template.py" />
|
||||
<Compile Include="azext\batch\models\repeat_task.py" />
|
||||
<Compile Include="azext\batch\models\start_task.py" />
|
||||
<Compile Include="azext\batch\models\task_collection_task_factory.py" />
|
||||
<Compile Include="azext\batch\models\task_factory_base.py" />
|
||||
<Compile Include="azext\batch\models\yum_package_reference.py" />
|
||||
<Compile Include="azext\batch\models\__init__.py" />
|
||||
<Compile Include="azext\batch\operations\file_operations.py" />
|
||||
<Compile Include="azext\batch\operations\job_operations.py" />
|
||||
<Compile Include="azext\batch\operations\pool_operations.py" />
|
||||
<Compile Include="azext\batch\operations\task_operations.py" />
|
||||
<Compile Include="azext\batch\operations\__init__.py" />
|
||||
<Compile Include="azext\batch\version.py" />
|
||||
<Compile Include="azext\batch\_file_utils.py" />
|
||||
<Compile Include="azext\batch\_pool_utils.py" />
|
||||
<Compile Include="azext\batch\_template_utils.py" />
|
||||
<Compile Include="azext\batch\__init__.py" />
|
||||
<Compile Include="azext\__init__.py" />
|
||||
<Compile Include="batch-cli-extensions\azext_batch\commands.py" />
|
||||
<Compile Include="batch-cli-extensions\azext_batch\custom.py" />
|
||||
<Compile Include="batch-cli-extensions\azext_batch\version.py" />
|
||||
|
|
@ -123,10 +123,10 @@
|
|||
<Compile Include="tests\test_live.py" />
|
||||
<Compile Include="tests\vcr_test_base.py" />
|
||||
<Compile Include="tests\__init__.py" />
|
||||
<Folder Include="azure\" />
|
||||
<Folder Include="azure\batch_extensions\" />
|
||||
<Folder Include="azure\batch_extensions\models\" />
|
||||
<Folder Include="azure\batch_extensions\operations\" />
|
||||
<Folder Include="azext\" />
|
||||
<Folder Include="azext\batch\" />
|
||||
<Folder Include="azext\batch\models\" />
|
||||
<Folder Include="azext\batch\operations\" />
|
||||
<Folder Include="batch-cli-extensions\" />
|
||||
<Folder Include="batch-cli-extensions\azext_batch\" />
|
||||
<Folder Include="doc\" />
|
||||
|
|
|
|||
|
|
@ -3,6 +3,11 @@
|
|||
Release History
|
||||
===============
|
||||
|
||||
2.3.0 (2018-05-25)
|
||||
------------------
|
||||
|
||||
* Change dependency.
|
||||
|
||||
2.2.0 (2018-04-12)
|
||||
------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
def batch_extensions_client(cli_ctx, kwargs): # pylint: disable=unused-argument
|
||||
from knack.util import CLIError
|
||||
import azure.batch_extensions as batch
|
||||
import azext.batch as batch
|
||||
|
||||
account_name = kwargs.pop('account_name', None)
|
||||
account_endpoint = kwargs.pop('account_endpoint', None)
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ from knack.log import get_logger
|
|||
|
||||
from azure.batch import __version__ as batch_version
|
||||
from azure.mgmt.batch import __version__ as batch_mgmt_version
|
||||
from azure.batch_extensions import __version__ as batch_ext_version
|
||||
from azext.batch import __version__ as batch_ext_version
|
||||
|
||||
|
||||
logger = get_logger(__name__)
|
||||
SUPPORTED_BATCH_VERSION = "4.2"
|
||||
SUPPORTED_BMGMT_VERSION = "4.2"
|
||||
SUPPORTED_BATCH_EXT_VERSION = "1.2"
|
||||
SUPPORTED_BATCH_EXT_VERSION = "2.1"
|
||||
|
||||
|
||||
def confirm_version(current, supported, package):
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
# --------------------------------------------------------------------------------------------
|
||||
|
||||
from azure.batch_extensions.models import PoolAddParameter, JobAddParameter, JobConstraints
|
||||
from azext.batch.models import PoolAddParameter, JobAddParameter, JobConstraints
|
||||
from azure.cli.core.util import get_file_json
|
||||
|
||||
from knack.log import get_logger
|
||||
|
|
@ -22,13 +22,12 @@ def create_pool(client, template=None, parameters=None, json_file=None, id=None,
|
|||
start_task_resource_files=None, start_task_wait_for_success=False, application_licenses=None,
|
||||
certificate_references=None, application_package_references=None, metadata=None):
|
||||
# pylint: disable=too-many-branches, too-many-statements
|
||||
from azure.batch_extensions.errors import MissingParameterValue
|
||||
from azure.batch_extensions.models import (
|
||||
from azext.batch.errors import MissingParameterValue
|
||||
from azext.batch.models import (
|
||||
PoolAddOptions, StartTask, ImageReference,
|
||||
CloudServiceConfiguration, VirtualMachineConfiguration)
|
||||
if template or json_file:
|
||||
if template:
|
||||
logger.warning('You are using an experimental feature {Pool Template}.')
|
||||
json_obj = None
|
||||
parameters = get_file_json(parameters) if parameters else {}
|
||||
template_obj = get_file_json(template)
|
||||
|
|
@ -49,9 +48,6 @@ def create_pool(client, template=None, parameters=None, json_file=None, id=None,
|
|||
pool = client.pool.poolparameter_from_json(json_obj)
|
||||
if pool is None:
|
||||
raise ValueError("JSON pool parameter is not in correct format.")
|
||||
|
||||
if hasattr(pool, 'package_references') and pool.package_references:
|
||||
logger.warning('You are using an experimental feature {Package Management}.')
|
||||
else:
|
||||
if not id:
|
||||
raise ValueError('Please supply template, json_file, or id')
|
||||
|
|
@ -119,11 +115,10 @@ def create_job(client, template=None, parameters=None, json_file=None, id=None,
|
|||
job_manager_task_command_line=None, job_manager_task_environment_settings=None,
|
||||
job_manager_task_id=None, job_manager_task_resource_files=None):
|
||||
# pylint: disable=too-many-branches, too-many-statements
|
||||
from azure.batch_extensions.errors import MissingParameterValue
|
||||
from azure.batch_extensions.models import JobManagerTask, JobAddOptions, PoolInformation
|
||||
from azext.batch.errors import MissingParameterValue
|
||||
from azext.batch.models import JobManagerTask, JobAddOptions, PoolInformation
|
||||
if template or json_file:
|
||||
if template:
|
||||
logger.warning('You are using an experimental feature {Job Template}.')
|
||||
json_obj = None
|
||||
parameters = get_file_json(parameters) if parameters else {}
|
||||
template_obj = get_file_json(template)
|
||||
|
|
@ -144,15 +139,6 @@ def create_job(client, template=None, parameters=None, json_file=None, id=None,
|
|||
job = client.job.jobparameter_from_json(json_obj)
|
||||
if job is None:
|
||||
raise ValueError("JSON job parameter is not in correct format.")
|
||||
|
||||
if hasattr(job, 'application_template_info') and job.application_template_info:
|
||||
logger.warning('You are using an experimental feature {Application Templates}.')
|
||||
if hasattr(job, 'task_factory') and job.task_factory:
|
||||
logger.warning('You are using an experimental feature {Task Factory}.')
|
||||
if job.pool_info.auto_pool_specification \
|
||||
and job.pool_info.auto_pool_specification.pool \
|
||||
and job.pool_info.auto_pool_specification.pool.package_references:
|
||||
logger.warning('You are using an experimental feature {Package Management}.')
|
||||
else:
|
||||
if not id:
|
||||
raise ValueError('Please supply template, json_file, or id')
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@
|
|||
# Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
# --------------------------------------------------------------------------------------------
|
||||
|
||||
VERSION = "2.2.2"
|
||||
VERSION = "2.3.0"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,9 @@ CLASSIFIERS = [
|
|||
'License :: OSI Approved :: MIT License',
|
||||
]
|
||||
|
||||
DEPENDENCIES = []
|
||||
DEPENDENCIES = [
|
||||
'azure-batch-extensions>=2.0.0,<2.1'
|
||||
]
|
||||
|
||||
# Version extraction inspired from 'requests'
|
||||
with open(os.path.join('azext_batch', 'version.py'), 'r') as fd:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# New Features for Azure Batch
|
||||
|
||||
These experimental features provide new ways to work with Azure Batch without needing to write your own applications. See the [included samples](../samples) for some ideas on use.
|
||||
These features provide new ways to work with Azure Batch without needing to write your own applications. See the [included samples](../samples) for some ideas on use.
|
||||
|
||||
* [Input data upload to Batch linked storage accounts](inputFiles.md#input-file-upload)
|
||||
* [Input data references using linked storage accounts](inputFiles.md#referencing-input-data)
|
||||
|
|
|
|||
|
|
@ -17,5 +17,5 @@ setuptools==30.4.0
|
|||
six==1.10.0
|
||||
tabulate==0.7.5
|
||||
vcrpy==1.10.3
|
||||
azure-cli==2.0.32
|
||||
azure-cli==2.0.33
|
||||
azure-storage-blob==1.1.0
|
||||
|
|
@ -71,6 +71,6 @@ You can also use the [Azure portal](https://portal.azure.com) or [Batch Explorer
|
|||
| File | Content |
|
||||
| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
|
||||
| `render-job.json` | Specifies the job to run, including the pool to use and any runtime constraints. <br/> Does not contain any of the job logic - instead it has an `applicationTemplateInfo` element that specifies the template to use (see `filePath`) and any parameters required by the template (see `parameters`). |
|
||||
| `render-template.json` | Template file describing the required processing, making use of the experimental **taskFactory** feature. |
|
||||
| `render-template.json` | Template file describing the required processing, making use of the **taskFactory** feature. |
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ You can also use the [Azure portal](https://portal.azure.com) or [Batch Explorer
|
|||
| `job.json` | A template for a new job. |
|
||||
| `job.parameters.json` | Provides values for the parameters defined in `job.json`. <br/> You will need to provide actual values for these parameters before job creation will succeed. |
|
||||
|
||||
Note that the **taskFactory** feature used in `job.json` is an experimental feature currently only available through the Azure CLI.
|
||||
Note that the **taskFactory** feature used in `job.json` is a feature currently only available through the Azure CLI.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
|
|
|
|||
|
|
@ -57,4 +57,4 @@ For more information on the properties available when creating a new pool, see [
|
|||
|
||||
For more information on the properties available when creating jobs and tasks see [*Add a job*](https://docs.microsoft.com/rest/api/batchservice/job) and [*Add a task*](https://docs.microsoft.com/rest/api/batchservice/task).
|
||||
|
||||
Note that the **taskFactory** feature used in `job.json` is not documented as a part of the REST API as it is currently an experimental feature only available through the Azure CLI.
|
||||
Note that the **taskFactory** feature used in `job.json` is not documented as a part of the REST API as it is currently a feature only available through the Azure CLI batch extension.
|
||||
|
|
@ -7,8 +7,8 @@ import os
|
|||
import time
|
||||
|
||||
from azure.common.credentials import ServicePrincipalCredentials
|
||||
import azure.batch_extensions as batch
|
||||
from azure.batch_extensions import models
|
||||
import azext.batch as batch
|
||||
from azext.batch import models
|
||||
|
||||
|
||||
BATCH_ENDPOINT = ""
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ import os
|
|||
import json
|
||||
import time
|
||||
|
||||
import azure.batch_extensions as batch
|
||||
from azure.batch_extensions import models
|
||||
import azext.batch as batch
|
||||
from azext.batch import models
|
||||
from azure.common.credentials import ServicePrincipalCredentials
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ import sys
|
|||
import datetime
|
||||
|
||||
from azure.common.credentials import ServicePrincipalCredentials
|
||||
import azure.batch_extensions as batch
|
||||
from azure.batch_extensions import models
|
||||
import azext.batch as batch
|
||||
from azext.batch import models
|
||||
|
||||
OUTPUT_CONTAINER_SAS = ""
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import automation.utilities.path as automation_path
|
|||
def run_pylint():
|
||||
print('\n\nRun pylint')
|
||||
|
||||
modules = [os.path.join(automation_path.get_repo_root(), 'azure')]
|
||||
modules = [os.path.join(automation_path.get_repo_root(), 'azext')]
|
||||
modules.append(os.path.join(automation_path.get_repo_root(), 'batch-cli-extensions', 'azext_batch'))
|
||||
modules_list = ' '.join(modules)
|
||||
print(modules_list)
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ def verify_packages():
|
|||
# STEP 3:: Install Batch Extensions and validate
|
||||
install_package(all_modules[0][1], all_modules[0][0], built_packages_dir)
|
||||
try:
|
||||
importlib.import_module('azure.batch_extensions')
|
||||
importlib.import_module('azext.batch')
|
||||
except ImportError as err:
|
||||
print("Unable to import {}".format(name))
|
||||
print(err)
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ exec_command('pip install -e ./scripts')
|
|||
|
||||
# install reference to extension module package
|
||||
exec_command('pip install -e {}'.format(root_dir))
|
||||
exec_command('pip install --upgrade --target ./.azure/devcliextensions/azure-batch-cli-extensions {0}/batch-cli-extensions'.format(root_dir))
|
||||
exec_command('pip install --upgrade --target ./.azure/devcliextensions/azure-batch-cli-extensions {0}'.format(root_dir))
|
||||
exec_command('pip install --no-deps --upgrade --target ./.azure/devcliextensions/azure-batch-cli-extensions {0}/batch-cli-extensions'.format(root_dir))
|
||||
|
||||
print('Finished dev setup.')
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ PY_LICENSE_HEADER = \
|
|||
|
||||
env_folders = [
|
||||
os.path.join(ROOT_DIR, 'env'),
|
||||
os.path.join(ROOT_DIR, 'package-verify-env')
|
||||
os.path.join(ROOT_DIR, 'package-verify-env'),
|
||||
os.path.join(ROOT_DIR, '.azure')
|
||||
]
|
||||
|
||||
def contains_header(text):
|
||||
|
|
|
|||
10
setup.py
10
setup.py
|
|
@ -38,7 +38,7 @@ DEPENDENCIES_27 = {
|
|||
}
|
||||
|
||||
# Version extraction inspired from 'requests'
|
||||
with open(os.path.join('azure/batch_extensions', 'version.py'), 'r') as fd:
|
||||
with open(os.path.join('azext/batch', 'version.py'), 'r') as fd:
|
||||
version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
|
||||
fd.read(), re.MULTILINE).group(1)
|
||||
|
||||
|
|
@ -61,12 +61,12 @@ setup(
|
|||
url='https://github.com/Azure/azure-batch-cli-extensions',
|
||||
classifiers=CLASSIFIERS,
|
||||
namespace_packages=[
|
||||
'azure'
|
||||
'azext'
|
||||
],
|
||||
packages=[
|
||||
'azure.batch_extensions',
|
||||
'azure.batch_extensions.operations',
|
||||
'azure.batch_extensions.models'
|
||||
'azext.batch',
|
||||
'azext.batch.operations',
|
||||
'azext.batch.models'
|
||||
],
|
||||
install_requires=DEPENDENCIES,
|
||||
extras_require=DEPENDENCIES_27,
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ from azure.storage.blob.blockblobservice import BlockBlobService
|
|||
from azure.batch.batch_auth import SharedKeyCredentials
|
||||
from azure.batch.models import BatchErrorException, BatchError
|
||||
|
||||
import azure.batch_extensions as batch
|
||||
from azure.batch_extensions import models
|
||||
from azure.batch_extensions import operations
|
||||
from azure.batch_extensions import _template_utils as utils
|
||||
from azure.batch_extensions import _pool_utils as pool_utils
|
||||
from azure.batch_extensions import _file_utils as file_utils
|
||||
import azext.batch as batch
|
||||
from azext.batch import models
|
||||
from azext.batch import operations
|
||||
from azext.batch import _template_utils as utils
|
||||
from azext.batch import _pool_utils as pool_utils
|
||||
from azext.batch import _file_utils as file_utils
|
||||
|
||||
|
||||
|
||||
|
|
@ -1557,7 +1557,7 @@ class TestBatchExtensions(unittest.TestCase):
|
|||
submitted_tasks.extendleft(values)
|
||||
assert(len(values) == task_ops.MAX_TASKS_PER_REQUEST)
|
||||
|
||||
with patch('azure.batch_extensions.operations.ExtendedTaskOperations._TaskWorkflowManager._bulk_add_tasks',
|
||||
with patch('azext.batch.operations.ExtendedTaskOperations._TaskWorkflowManager._bulk_add_tasks',
|
||||
Mock(side_effect=bulk_tasks)):
|
||||
task_ops = operations.ExtendedTaskOperations(None, None, None, self._serialize, self._deserialize, None)
|
||||
task_collection = []
|
||||
|
|
@ -1569,7 +1569,7 @@ class TestBatchExtensions(unittest.TestCase):
|
|||
assert set(task.id for task in task_collection) == set(task.id for task in submitted_tasks)
|
||||
|
||||
submitted_tasks = collections.deque()
|
||||
with patch('azure.batch_extensions.operations.ExtendedTaskOperations._TaskWorkflowManager._bulk_add_tasks',
|
||||
with patch('azext.batch.operations.ExtendedTaskOperations._TaskWorkflowManager._bulk_add_tasks',
|
||||
Mock(side_effect=bulk_tasks)):
|
||||
task_ops = operations.ExtendedTaskOperations(None, None, None, self._serialize, self._deserialize, None)
|
||||
task_collection = []
|
||||
|
|
@ -1590,7 +1590,7 @@ class TestBatchExtensions(unittest.TestCase):
|
|||
|
||||
num_calls = 7
|
||||
|
||||
with patch('azure.batch_extensions.operations.ExtendedTaskOperations._TaskWorkflowManager._bulk_add_tasks',
|
||||
with patch('azext.batch.operations.ExtendedTaskOperations._TaskWorkflowManager._bulk_add_tasks',
|
||||
Mock(side_effect=bulk_tasks)):
|
||||
task_ops = operations.ExtendedTaskOperations(None, None, None, self._serialize, self._deserialize, None)
|
||||
task_collection = []
|
||||
|
|
@ -1602,7 +1602,7 @@ class TestBatchExtensions(unittest.TestCase):
|
|||
assert set(task.id for task in task_collection) == set(task.id for task in submitted_tasks)
|
||||
|
||||
submitted_tasks = collections.deque()
|
||||
with patch('azure.batch_extensions.operations.ExtendedTaskOperations._TaskWorkflowManager._bulk_add_tasks',
|
||||
with patch('azext.batch.operations.ExtendedTaskOperations._TaskWorkflowManager._bulk_add_tasks',
|
||||
Mock(side_effect=bulk_tasks)):
|
||||
task_ops = operations.ExtendedTaskOperations(None, None, None, self._serialize, self._deserialize, None)
|
||||
task_collection = []
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ import tempfile
|
|||
import json
|
||||
import datetime
|
||||
|
||||
from azure.batch_extensions.models import BatchErrorException, AllocationState, ComputeNodeState, TaskState
|
||||
from azext.batch.models import BatchErrorException, AllocationState, ComputeNodeState, TaskState
|
||||
import azure.batch.batch_auth as batchauth
|
||||
import azure.batch_extensions as batch
|
||||
import azext.batch as batch
|
||||
from tests.vcr_test_base import VCRTestBase
|
||||
from azure.storage.common import CloudStorageAccount
|
||||
from azure.storage.blob import BlobPermissions
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче