Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{batchai} Refine test with storage account APIs #17799

Merged
merged 3 commits into from
Apr 22, 2021
Merged

{batchai} Refine test with storage account APIs #17799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bceba4
fix test
Juliehzl Apr 21, 2021
10d11c0
refine client
Juliehzl Apr 21, 2021
8d320ae
fix style
Juliehzl Apr 21, 2021
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
3 changes: 1 addition & 2 deletions src/azure-cli/azure/cli/command_modules/batchai/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ def _ensure_subnet_is_valid(client, subnet, nfs_resource_group, nfs_workspace, n


def _get_storage_management_client(cli_ctx):
from azure.mgmt.storage import StorageManagementClient
return get_mgmt_service_client(cli_ctx, StorageManagementClient)
return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_STORAGE)


def _get_storage_account_key(cli_ctx, account_name, account_key):
Expand Down
30 changes: 17 additions & 13 deletions src/azure-cli/azure/cli/command_modules/batchai/tests/latest/test_batchai_scenario.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def _data_file(filename):
class BatchAIEndToEndScenariosTest(ScenarioTest):
@ResourceGroupPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
@StorageAccountPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
def test_batchai_manual_scale_scenario(self, resource_group, storage_account):
def test_batchai_manual_scale_scenario(self, resource_group, storage_account_info):
# Typical usage scenario for regular (not auto scale) cluster.
# 1. Create a compute cluster
# 2. Execute some jobs on the cluster
Expand All @@ -40,7 +40,8 @@ def test_batchai_manual_scale_scenario(self, resource_group, storage_account):
# 5. Execute more jobs and examine execution results
# 6. Delete the cluster
# 7. Delete the jobs
with self._given_configured_environment(resource_group, storage_account):
with self._given_configured_environment(resource_group, storage_account_info):
storage_account, account_key = storage_account_info
# Create a file share 'share' to be mounted on the cluster
self.cmd('az storage share create -n share')
# Create a workspace
Expand Down Expand Up @@ -151,14 +152,15 @@ def test_batchai_manual_scale_scenario(self, resource_group, storage_account):

@ResourceGroupPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
@StorageAccountPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
def test_batchai_auto_scale_scenario(self, resource_group, storage_account):
def test_batchai_auto_scale_scenario(self, resource_group, storage_account_info):
# Typical usage scenario for auto scale cluster.
# 1. Create a compute cluster
# 2. Submit a job
# 3. The cluster will auto scale to execute the job
# 4. Examine the job execution results
# 5. The cluster will down scale
with self._given_configured_environment(resource_group, storage_account):
with self._given_configured_environment(resource_group, storage_account_info):
storage_account, account_key = storage_account_info
# Create a file share 'share' to be mounted on the cluster
self.cmd('az storage share create -n share')
# Create a workspace
Expand Down Expand Up @@ -212,12 +214,13 @@ def test_batchai_auto_scale_scenario(self, resource_group, storage_account):

@ResourceGroupPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
@StorageAccountPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
def test_batchai_cluster_with_file_systems(self, resource_group, storage_account):
def test_batchai_cluster_with_file_systems(self, resource_group, storage_account_info):
# Tests creation of a cluster with mounted file systems defined in config.
# 1. Create an Azure File Share and Azure Blob Container to mount on the cluster.
# 2. Create a cluster and verify parameters.
# 3. Verify that cluster was able to start nodes.
with self._given_configured_environment(resource_group, storage_account):
with self._given_configured_environment(resource_group, storage_account_info):
storage_account, account_key = storage_account_info
# Create a file share 'share' and blob container 'container' to be mounted on cluster nodes.
self.cmd('az storage share create -n share')
self.cmd('az storage container create -n container')
Expand Down Expand Up @@ -249,9 +252,10 @@ def test_batchai_cluster_with_file_systems(self, resource_group, storage_account

@ResourceGroupPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
@StorageAccountPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
def test_batchai_config_less_cluster_with_file_systems(self, resource_group, storage_account):
def test_batchai_config_less_cluster_with_file_systems(self, resource_group, storage_account_info):
# Test creation of a cluster with mount file systems defined via command line.
with self._given_configured_environment(resource_group, storage_account):
with self._given_configured_environment(resource_group, storage_account_info):
storage_account, account_key = storage_account_info
self.cmd('az storage share create -n share')
self.cmd('az storage container create -n container')
self.cmd('az batchai workspace create -g {0} -n workspace'.format(resource_group))
Expand Down Expand Up @@ -327,14 +331,15 @@ def test_batchai_cluster_with_setup_command(self, resource_group, storage_accoun

@ResourceGroupPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
@StorageAccountPreparer(location=LOCATION_FOR_SCENARIO_TESTS)
def test_batchai_job_level_mounting_scenario(self, resource_group, storage_account):
def test_batchai_job_level_mounting_scenario(self, resource_group, storage_account_info):
# Typical usage scenario for regular (not auto scale) cluster.
# 1. Create a compute cluster.
# 2. Execute a job with job level filesystems when file systems specified in config file.
# 3. Check the job succeeded and files are generated.
# 4. Execute a job with job level filesystems when file systems specified via command line.
# 5. Check the job succeeded and files are generated.
with self._given_configured_environment(resource_group, storage_account):
with self._given_configured_environment(resource_group, storage_account_info):
storage_account, account_key = storage_account_info
# Create a file share 'share' to be mounted on the cluster
self.cmd('az storage share create -n share')
self.cmd('az storage container create -n container')
Expand Down Expand Up @@ -417,11 +422,10 @@ def test_batchai_usages(self):
StringContainCheck("Cluster")])

@contextmanager
def _given_configured_environment(self, resource_group, storage_account):
def _given_configured_environment(self, resource_group, storage_account_info):

# Configure storage account related environment variables.
account_key = self.cmd('storage account keys list -n {} -g {} --query "[0].value" -otsv'.format(
storage_account, resource_group)).output[:-1]
storage_account, account_key = storage_account_info
self.set_env('AZURE_STORAGE_ACCOUNT', storage_account)
self.set_env('AZURE_STORAGE_KEY', account_key)
self.set_env('AZURE_BATCHAI_STORAGE_ACCOUNT', storage_account)
Expand Down