зеркало из https://github.com/microsoft/azure-cli.git
BatchAI. Storage account key and name options (#4841)
* BatchAI. Storage account key and name options Make --storage-account-name and --storage-account-key work for Azure File share and Azure Storage container specified on command line. * BatchAI. Fix Uts
This commit is contained in:
AlexanderYukhanov
Troy Dai
Родитель
4776a6f27e
Коммит
bc4e53c710
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
from __future__ import print_function
|
||||
|
||||
import copy
|
||||
import json
|
||||
import os
|
||||
import signal
|
||||
|
|
@ -80,9 +81,8 @@ def get_effective_storage_account_name_and_key(account_name, account_key):
|
|||
:param str or None account_key: storage account key provided as command line argument.
|
||||
"""
|
||||
if account_name:
|
||||
return account_name, get_storage_account_key(account_name, account_key)
|
||||
return (az_config.get('batchai', 'storage_account', fallback=AZURE_BATCHAI_STORAGE_ACCOUNT_PLACEHOLDER),
|
||||
az_config.get('batchai', 'storage_key', fallback=AZURE_BATCHAI_STORAGE_KEY_PLACEHOLDER))
|
||||
return account_name, get_storage_account_key(account_name, account_key) or ''
|
||||
return az_config.get('batchai', 'storage_account', ''), az_config.get('batchai', 'storage_key', '')
|
||||
|
||||
|
||||
def update_cluster_create_parameters_with_env_variables(params, account_name=None, account_key=None):
|
||||
|
|
@ -93,46 +93,53 @@ def update_cluster_create_parameters_with_env_variables(params, account_name=Non
|
|||
:param models.ClusterCreateParameters params: cluster creation parameters to patch.
|
||||
:param str or None account_name: name of the storage account provided as command line argument.
|
||||
:param str or None account_key: storage account key provided as command line argument.
|
||||
:return models.ClusterCreateParameters: updated parameters.
|
||||
"""
|
||||
result = copy.deepcopy(params)
|
||||
storage_account_name, storage_account_key = get_effective_storage_account_name_and_key(account_name, account_key)
|
||||
require_storage_account = False
|
||||
require_storage_account_key = False
|
||||
|
||||
# Patch parameters of azure file share.
|
||||
if params.node_setup and \
|
||||
params.node_setup.mount_volumes and \
|
||||
params.node_setup.mount_volumes.azure_file_shares:
|
||||
for ref in params.node_setup.mount_volumes.azure_file_shares:
|
||||
if result.node_setup and \
|
||||
result.node_setup.mount_volumes and \
|
||||
result.node_setup.mount_volumes.azure_file_shares:
|
||||
for ref in result.node_setup.mount_volumes.azure_file_shares:
|
||||
if ref.account_name == AZURE_BATCHAI_STORAGE_ACCOUNT_PLACEHOLDER:
|
||||
require_storage_account = True
|
||||
ref.account_name = storage_account_name
|
||||
if ref.azure_file_url and AZURE_BATCHAI_STORAGE_ACCOUNT_PLACEHOLDER in ref.azure_file_url:
|
||||
require_storage_account = True
|
||||
ref.azure_file_url = ref.azure_file_url.replace(
|
||||
AZURE_BATCHAI_STORAGE_ACCOUNT_PLACEHOLDER, storage_account_name)
|
||||
if ref.credentials and ref.credentials.account_key == AZURE_BATCHAI_STORAGE_KEY_PLACEHOLDER:
|
||||
require_storage_account_key = True
|
||||
ref.credentials.account_key = storage_account_key
|
||||
if not ref.credentials:
|
||||
require_storage_account_key = True
|
||||
ref.credentials = models.AzureStorageCredentialsInfo(account_key=storage_account_key)
|
||||
|
||||
# Verify that all placeholders are replaced with real values.
|
||||
if (ref.account_name == AZURE_BATCHAI_STORAGE_ACCOUNT_PLACEHOLDER or
|
||||
AZURE_BATCHAI_STORAGE_ACCOUNT_PLACEHOLDER in ref.azure_file_url):
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_ACCOUNT)
|
||||
if ref.credentials.account_key == AZURE_BATCHAI_STORAGE_KEY_PLACEHOLDER:
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_KEY)
|
||||
|
||||
# Patch parameters of blob file system.
|
||||
if params.node_setup and \
|
||||
params.node_setup.mount_volumes and \
|
||||
params.node_setup.mount_volumes.azure_blob_file_systems:
|
||||
for ref in params.node_setup.mount_volumes.azure_blob_file_systems:
|
||||
if result.node_setup and \
|
||||
result.node_setup.mount_volumes and \
|
||||
result.node_setup.mount_volumes.azure_blob_file_systems:
|
||||
for ref in result.node_setup.mount_volumes.azure_blob_file_systems:
|
||||
if ref.account_name == AZURE_BATCHAI_STORAGE_ACCOUNT_PLACEHOLDER:
|
||||
require_storage_account = True
|
||||
ref.account_name = storage_account_name
|
||||
if ref.credentials and ref.credentials.account_key == AZURE_BATCHAI_STORAGE_KEY_PLACEHOLDER:
|
||||
require_storage_account_key = True
|
||||
ref.credentials.account_key = storage_account_key
|
||||
if not ref.credentials:
|
||||
require_storage_account_key = True
|
||||
ref.credentials = models.AzureStorageCredentialsInfo(account_key=storage_account_key)
|
||||
# Verify that all placeholders are replaced with real values.
|
||||
if ref.account_name == AZURE_BATCHAI_STORAGE_ACCOUNT_PLACEHOLDER:
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_ACCOUNT)
|
||||
if ref.credentials.account_key == AZURE_BATCHAI_STORAGE_KEY_PLACEHOLDER:
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_KEY)
|
||||
|
||||
if require_storage_account and not storage_account_name:
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_ACCOUNT)
|
||||
if require_storage_account_key and not storage_account_key:
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_KEY)
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def update_user_account_settings(params, admin_user_name, ssh_key, password):
|
||||
|
|
@ -142,7 +149,9 @@ def update_user_account_settings(params, admin_user_name, ssh_key, password):
|
|||
:param str or None admin_user_name: name of admin user to create.
|
||||
:param str or None ssh_key: ssh public key value or path to the file containing the key.
|
||||
:param str or None password: password.
|
||||
:return models.ClusterCreateParameters: updated parameters.
|
||||
"""
|
||||
result = copy.deepcopy(params)
|
||||
key = ssh_key
|
||||
if ssh_key:
|
||||
if os.path.exists(os.path.expanduser(ssh_key)):
|
||||
|
|
@ -152,13 +161,12 @@ def update_user_account_settings(params, admin_user_name, ssh_key, password):
|
|||
if not is_valid_ssh_rsa_public_key(key):
|
||||
raise CLIError('Incorrect ssh public key value.')
|
||||
|
||||
if hasattr(params, 'user_account_settings'):
|
||||
parent = params
|
||||
if hasattr(result, 'user_account_settings'):
|
||||
parent = result
|
||||
else:
|
||||
if params.ssh_configuration is None:
|
||||
params.ssh_configuration = models.SshConfiguration(None)
|
||||
parent = params.ssh_configuration
|
||||
|
||||
if result.ssh_configuration is None:
|
||||
result.ssh_configuration = models.SshConfiguration(None)
|
||||
parent = result.ssh_configuration
|
||||
if parent.user_account_settings is None:
|
||||
parent.user_account_settings = models.UserAccountSettings(
|
||||
admin_user_name=admin_user_name, admin_user_ssh_public_key=key)
|
||||
|
|
@ -176,6 +184,8 @@ def update_user_account_settings(params, admin_user_name, ssh_key, password):
|
|||
not parent.user_account_settings.admin_user_password):
|
||||
raise CLIError('Please provide admin user password or ssh key.')
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def add_nfs_to_cluster_create_parameters(params, file_server_id, mount_path):
|
||||
"""Adds NFS to the cluster create parameters.
|
||||
|
|
@ -183,75 +193,88 @@ def add_nfs_to_cluster_create_parameters(params, file_server_id, mount_path):
|
|||
:param model.ClusterCreateParameters params: cluster create parameters.
|
||||
:param str file_server_id: resource id of the file server.
|
||||
:param str mount_path: relative mount path for the file server.
|
||||
:return models.ClusterCreateParameters: updated parameters.
|
||||
"""
|
||||
result = copy.deepcopy(params)
|
||||
if not mount_path:
|
||||
raise CLIError('File server relative mount path cannot be empty.')
|
||||
if params.node_setup is None:
|
||||
params.node_setup = models.NodeSetup()
|
||||
if params.node_setup.mount_volumes is None:
|
||||
params.node_setup.mount_volumes = models.MountVolumes()
|
||||
if params.node_setup.mount_volumes.file_servers is None:
|
||||
params.node_setup.mount_volumes.file_servers = []
|
||||
params.node_setup.mount_volumes.file_servers.append(models.FileServerReference(
|
||||
if result.node_setup is None:
|
||||
result.node_setup = models.NodeSetup()
|
||||
if result.node_setup.mount_volumes is None:
|
||||
result.node_setup.mount_volumes = models.MountVolumes()
|
||||
if result.node_setup.mount_volumes.file_servers is None:
|
||||
result.node_setup.mount_volumes.file_servers = []
|
||||
result.node_setup.mount_volumes.file_servers.append(models.FileServerReference(
|
||||
relative_mount_path=mount_path,
|
||||
file_server=models.ResourceId(file_server_id),
|
||||
mount_options="rw"))
|
||||
return result
|
||||
|
||||
|
||||
def add_azure_file_share_to_cluster_create_parameters(params, azure_file_share, mount_path):
|
||||
def add_azure_file_share_to_cluster_create_parameters(params, azure_file_share, mount_path, account_name=None,
|
||||
account_key=None):
|
||||
"""Add Azure File share to the cluster create parameters.
|
||||
|
||||
:param model.ClusterCreateParameters params: cluster create parameters.
|
||||
:param str azure_file_share: name of the azure file share.
|
||||
:param str mount_path: relative mount path for Azure File share.
|
||||
:param str or None account_name: storage account name provided as command line argument.
|
||||
:param str or None account_key: storage account key provided as command line argument.
|
||||
:return models.ClusterCreateParameters: updated parameters.
|
||||
"""
|
||||
result = copy.deepcopy(params)
|
||||
if not mount_path:
|
||||
raise CLIError('Azure File share relative mount path cannot be empty.')
|
||||
if params.node_setup is None:
|
||||
params.node_setup = models.NodeSetup()
|
||||
if params.node_setup.mount_volumes is None:
|
||||
params.node_setup.mount_volumes = models.MountVolumes()
|
||||
if params.node_setup.mount_volumes.azure_file_shares is None:
|
||||
params.node_setup.mount_volumes.azure_file_shares = []
|
||||
storage_account_name = az_config.get('batchai', 'storage_account', fallback=None)
|
||||
if result.node_setup is None:
|
||||
result.node_setup = models.NodeSetup()
|
||||
if result.node_setup.mount_volumes is None:
|
||||
result.node_setup.mount_volumes = models.MountVolumes()
|
||||
if result.node_setup.mount_volumes.azure_file_shares is None:
|
||||
result.node_setup.mount_volumes.azure_file_shares = []
|
||||
storage_account_name, storage_account_key = get_effective_storage_account_name_and_key(account_name, account_key)
|
||||
if not storage_account_name:
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_ACCOUNT)
|
||||
storage_account_key = az_config.get('batchai', 'storage_key', fallback=None)
|
||||
if not storage_account_key:
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_KEY)
|
||||
params.node_setup.mount_volumes.azure_file_shares.append(models.AzureFileShareReference(
|
||||
result.node_setup.mount_volumes.azure_file_shares.append(models.AzureFileShareReference(
|
||||
relative_mount_path=mount_path,
|
||||
account_name=storage_account_name,
|
||||
azure_file_url='https://{0}.file.core.windows.net/{1}'.format(storage_account_name, azure_file_share),
|
||||
credentials=models.AzureStorageCredentialsInfo(storage_account_key)))
|
||||
return result
|
||||
|
||||
|
||||
def add_azure_container_to_cluster_create_parameters(params, container_name, mount_path):
|
||||
def add_azure_container_to_cluster_create_parameters(params, container_name, mount_path, account_name=None,
|
||||
account_key=None):
|
||||
"""Add Azure Storage container to the cluster create parameters.
|
||||
|
||||
:param model.ClusterCreateParameters params: cluster create parameters.
|
||||
:param str container_name: container name.
|
||||
:param str mount_path: relative mount path for the container.
|
||||
:param str or None account_name: storage account name provided as command line argument.
|
||||
:param str or None account_key: storage account key provided as command line argument.
|
||||
:return models.ClusterCreateParameters: updated parameters.
|
||||
"""
|
||||
result = copy.deepcopy(params)
|
||||
if not mount_path:
|
||||
raise CLIError('Azure Storage container relative mount path cannot be empty.')
|
||||
if params.node_setup is None:
|
||||
params.node_setup = models.NodeSetup()
|
||||
if params.node_setup.mount_volumes is None:
|
||||
params.node_setup.mount_volumes = models.MountVolumes()
|
||||
if params.node_setup.mount_volumes.azure_blob_file_systems is None:
|
||||
params.node_setup.mount_volumes.azure_blob_file_systems = []
|
||||
storage_account_name = az_config.get('batchai', 'storage_account', fallback=None)
|
||||
if result.node_setup is None:
|
||||
result.node_setup = models.NodeSetup()
|
||||
if result.node_setup.mount_volumes is None:
|
||||
result.node_setup.mount_volumes = models.MountVolumes()
|
||||
if result.node_setup.mount_volumes.azure_blob_file_systems is None:
|
||||
result.node_setup.mount_volumes.azure_blob_file_systems = []
|
||||
storage_account_name, storage_account_key = get_effective_storage_account_name_and_key(account_name, account_key)
|
||||
if not storage_account_name:
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_ACCOUNT)
|
||||
storage_account_key = az_config.get('batchai', 'storage_key', fallback=None)
|
||||
if not storage_account_key:
|
||||
raise CLIError(MSG_CONFIGURE_STORAGE_KEY)
|
||||
params.node_setup.mount_volumes.azure_blob_file_systems.append(models.AzureBlobFileSystemReference(
|
||||
result.node_setup.mount_volumes.azure_blob_file_systems.append(models.AzureBlobFileSystemReference(
|
||||
relative_mount_path=mount_path,
|
||||
account_name=storage_account_name,
|
||||
container_name=container_name,
|
||||
credentials=models.AzureStorageCredentialsInfo(account_key=storage_account_key)))
|
||||
return result
|
||||
|
||||
|
||||
def get_image_reference_or_die(image):
|
||||
|
|
@ -275,20 +298,23 @@ def update_nodes_information(params, image, vm_size, min_nodes, max_nodes):
|
|||
:param str or None vm_size: VM size.
|
||||
:param int min_nodes: min number of nodes.
|
||||
:param int or None max_nodes: max number of nodes.
|
||||
:return models.ClusterCreateParameters: updated parameters.
|
||||
"""
|
||||
result = copy.deepcopy(params)
|
||||
if vm_size:
|
||||
params.vm_size = vm_size
|
||||
if not params.vm_size:
|
||||
result.vm_size = vm_size
|
||||
if not result.vm_size:
|
||||
raise CLIError('Please provide VM size')
|
||||
if image:
|
||||
params.virtual_machine_configuration = models.VirtualMachineConfiguration(get_image_reference_or_die(image))
|
||||
result.virtual_machine_configuration = models.VirtualMachineConfiguration(get_image_reference_or_die(image))
|
||||
if min_nodes == max_nodes:
|
||||
params.scale_settings = models.ScaleSettings(manual=models.ManualScaleSettings(min_nodes))
|
||||
result.scale_settings = models.ScaleSettings(manual=models.ManualScaleSettings(min_nodes))
|
||||
elif max_nodes is not None:
|
||||
params.scale_settings = models.ScaleSettings(auto_scale=models.AutoScaleSettings(min_nodes, max_nodes))
|
||||
if not params.scale_settings or (not params.scale_settings.manual and not params.scale_settings.auto_scale):
|
||||
result.scale_settings = models.ScaleSettings(auto_scale=models.AutoScaleSettings(min_nodes, max_nodes))
|
||||
if not result.scale_settings or (not result.scale_settings.manual and not result.scale_settings.auto_scale):
|
||||
raise CLIError('Please provide scale setting for the cluster via configuration file or via --min and --max '
|
||||
'parameters.')
|
||||
return result
|
||||
|
||||
|
||||
def create_cluster(client, # pylint: disable=too-many-locals
|
||||
|
|
@ -303,20 +329,22 @@ def create_cluster(client, # pylint: disable=too-many-locals
|
|||
params = _get_deserializer()('ClusterCreateParameters', json_obj)
|
||||
else:
|
||||
params = models.ClusterCreateParameters(None, None, None)
|
||||
update_cluster_create_parameters_with_env_variables(params, account_name, account_key)
|
||||
update_user_account_settings(params, user_name, ssh_key, password)
|
||||
params = update_cluster_create_parameters_with_env_variables(params, account_name, account_key)
|
||||
params = update_user_account_settings(params, user_name, ssh_key, password)
|
||||
if location:
|
||||
params.location = location
|
||||
if not params.location:
|
||||
raise CLIError('Please provide location for cluster creation.')
|
||||
update_nodes_information(params, image, vm_size, min_nodes, max_nodes)
|
||||
params = update_nodes_information(params, image, vm_size, min_nodes, max_nodes)
|
||||
if nfs_name:
|
||||
file_server = client.file_servers.get(nfs_resource_group if nfs_resource_group else resource_group, nfs_name)
|
||||
add_nfs_to_cluster_create_parameters(params, file_server.id, nfs_mount_path)
|
||||
params = add_nfs_to_cluster_create_parameters(params, file_server.id, nfs_mount_path)
|
||||
if azure_file_share:
|
||||
add_azure_file_share_to_cluster_create_parameters(params, azure_file_share, afs_mount_path)
|
||||
params = add_azure_file_share_to_cluster_create_parameters(params, azure_file_share, afs_mount_path,
|
||||
account_name, account_key)
|
||||
if container_name:
|
||||
add_azure_container_to_cluster_create_parameters(params, container_name, container_mount_path)
|
||||
params = add_azure_container_to_cluster_create_parameters(params, container_name, container_mount_path,
|
||||
account_name, account_key)
|
||||
return client.clusters.create(resource_group, cluster_name, params, raw=raw)
|
||||
|
||||
|
||||
|
|
@ -414,7 +442,7 @@ def create_file_server(client, resource_group, file_server_name, json_file=None,
|
|||
else:
|
||||
parameters = models.FileServerCreateParameters(None, None, None, None)
|
||||
|
||||
update_user_account_settings(parameters, user_name, ssh_key, password)
|
||||
parameters = update_user_account_settings(parameters, user_name, ssh_key, password)
|
||||
if location:
|
||||
parameters.location = location
|
||||
if not parameters.location:
|
||||
|
|
|
|||
|
|
@ -45,17 +45,17 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
admin_user_password='password'))
|
||||
|
||||
# No update.
|
||||
update_user_account_settings(params, None, None, None)
|
||||
self.assertEquals(params.user_account_settings.admin_user_name, 'name')
|
||||
self.assertEquals(params.user_account_settings.admin_user_password, 'password')
|
||||
self.assertIsNone(params.user_account_settings.admin_user_ssh_public_key)
|
||||
result = update_user_account_settings(params, None, None, None)
|
||||
self.assertEquals(result.user_account_settings.admin_user_name, 'name')
|
||||
self.assertEquals(result.user_account_settings.admin_user_password, 'password')
|
||||
self.assertIsNone(result.user_account_settings.admin_user_ssh_public_key)
|
||||
|
||||
# Updating.
|
||||
params.user_account_settings = None
|
||||
update_user_account_settings(params, 'user', SSH_KEY, None)
|
||||
self.assertEquals(params.user_account_settings.admin_user_name, 'user')
|
||||
self.assertIsNone(params.user_account_settings.admin_user_password)
|
||||
self.assertEquals(params.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
result = update_user_account_settings(params, 'user', SSH_KEY, None)
|
||||
self.assertEquals(result.user_account_settings.admin_user_name, 'user')
|
||||
self.assertIsNone(result.user_account_settings.admin_user_password)
|
||||
self.assertEquals(result.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
|
||||
# Incorrect ssh public key.
|
||||
params.user_account_settings = None # user may emit user account settings in config file
|
||||
|
|
@ -73,8 +73,8 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
update_user_account_settings(params, 'user', None, None)
|
||||
|
||||
# ssh public key from a file.
|
||||
update_user_account_settings(params, 'user', _data_file('key.txt'), None)
|
||||
self.assertEquals(params.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
result = update_user_account_settings(params, 'user', _data_file('key.txt'), None)
|
||||
self.assertEquals(result.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
|
||||
def test_batchai_update_file_server_create_parameters_with_user_account_settings(self):
|
||||
"""Test updating of user account settings."""
|
||||
|
|
@ -85,27 +85,25 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
data_disks=DataDisks(10, 2, 'Standard_LRS'))
|
||||
|
||||
# No update.
|
||||
update_user_account_settings(params, None, None, None)
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_name, 'name')
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_password, 'password')
|
||||
self.assertIsNone(params.ssh_configuration.user_account_settings.admin_user_ssh_public_key)
|
||||
result = update_user_account_settings(params, None, None, None)
|
||||
self.assertEqual(params, result)
|
||||
|
||||
# Updating when user_account_setting are omitted.
|
||||
params.ssh_configuration.user_account_settings = None
|
||||
update_user_account_settings(params, 'user', SSH_KEY, None)
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_name, 'user')
|
||||
self.assertIsNone(params.ssh_configuration.user_account_settings.admin_user_password)
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
result = update_user_account_settings(params, 'user', SSH_KEY, None)
|
||||
self.assertEquals(result.ssh_configuration.user_account_settings.admin_user_name, 'user')
|
||||
self.assertIsNone(result.ssh_configuration.user_account_settings.admin_user_password)
|
||||
self.assertEquals(result.ssh_configuration.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
|
||||
# Updating when ssh_configuration is omitted.
|
||||
params.ssh_configuration = None
|
||||
update_user_account_settings(params, 'user', SSH_KEY, 'password')
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_name, 'user')
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_password, 'password')
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
result = update_user_account_settings(params, 'user', SSH_KEY, 'password')
|
||||
self.assertEquals(result.ssh_configuration.user_account_settings.admin_user_name, 'user')
|
||||
self.assertEquals(result.ssh_configuration.user_account_settings.admin_user_password, 'password')
|
||||
self.assertEquals(result.ssh_configuration.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
|
||||
# Incorrect ssh public key.
|
||||
params.ssh_configuration.user_account_settings = None # user may emit user account settings in config file
|
||||
params.ssh_configuration = SshConfiguration(None) # user may emit user account settings in config file
|
||||
with self.assertRaises(CLIError):
|
||||
update_user_account_settings(params, 'user', 'wrong' + SSH_KEY, None)
|
||||
|
||||
|
|
@ -121,13 +119,13 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
|
||||
# Only password.
|
||||
params.ssh_configuration.user_account_settings = None
|
||||
update_user_account_settings(params, 'user', None, 'password')
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_name, 'user')
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_password, 'password')
|
||||
result = update_user_account_settings(params, 'user', None, 'password')
|
||||
self.assertEquals(result.ssh_configuration.user_account_settings.admin_user_name, 'user')
|
||||
self.assertEquals(result.ssh_configuration.user_account_settings.admin_user_password, 'password')
|
||||
|
||||
# ssh public key from a file.
|
||||
update_user_account_settings(params, 'user', _data_file('key.txt'), None)
|
||||
self.assertEquals(params.ssh_configuration.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
result = update_user_account_settings(params, 'user', _data_file('key.txt'), None)
|
||||
self.assertEquals(result.ssh_configuration.user_account_settings.admin_user_ssh_public_key, SSH_KEY)
|
||||
|
||||
def test_batchai_cluster_parameter_update_with_environment_variables(self):
|
||||
"""Test patching of cluster create parameters with environment variables."""
|
||||
|
|
@ -150,7 +148,7 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
)]
|
||||
)))
|
||||
|
||||
# No environment variables provided.
|
||||
# No environment variables and no command line parameters provided.
|
||||
os.environ.pop('AZURE_BATCHAI_STORAGE_ACCOUNT', None)
|
||||
os.environ.pop('AZURE_BATCHAI_STORAGE_KEY', None)
|
||||
with self.assertRaises(CLIError):
|
||||
|
|
@ -159,29 +157,39 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
# Set environment variables and check patching results.
|
||||
os.environ['AZURE_BATCHAI_STORAGE_ACCOUNT'] = 'account'
|
||||
os.environ['AZURE_BATCHAI_STORAGE_KEY'] = 'key'
|
||||
update_cluster_create_parameters_with_env_variables(params)
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].account_name, 'account')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key, 'key')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_blob_file_systems[0].account_name, 'account')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key, 'key')
|
||||
result = update_cluster_create_parameters_with_env_variables(params)
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].account_name, 'account')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key, 'key')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].account_name, 'account')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key, 'key')
|
||||
|
||||
# Test a case when no patching required.
|
||||
os.environ['AZURE_BATCHAI_STORAGE_ACCOUNT'] = 'another_account'
|
||||
os.environ['AZURE_BATCHAI_STORAGE_KEY'] = 'another_key'
|
||||
update_cluster_create_parameters_with_env_variables(params)
|
||||
|
||||
# Check that no patching has been done.
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].account_name, 'account')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key, 'key')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_blob_file_systems[0].account_name, 'account')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key, 'key')
|
||||
params.node_setup.mount_volumes.azure_file_shares[0].account_name = 'some_account'
|
||||
params.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key = 'some_key'
|
||||
params.node_setup.mount_volumes.azure_blob_file_systems[0].account_name = 'some_other_account'
|
||||
params.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key = 'some_other_key'
|
||||
os.environ['AZURE_BATCHAI_STORAGE_ACCOUNT'] = 'account'
|
||||
os.environ['AZURE_BATCHAI_STORAGE_KEY'] = 'key'
|
||||
result = update_cluster_create_parameters_with_env_variables(params)
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].account_name, 'some_account')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key, 'some_key')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].account_name,
|
||||
'some_other_account')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key,
|
||||
'some_other_key')
|
||||
|
||||
# Storage account and key provided as command line args.
|
||||
params.node_setup.mount_volumes.azure_file_shares[0].account_name = '<AZURE_BATCHAI_STORAGE_ACCOUNT>'
|
||||
params.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key = '<AZURE_BATCHAI_STORAGE_KEY>'
|
||||
update_cluster_create_parameters_with_env_variables(params, 'account_from_cmd', 'key_from_cmd')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].account_name, 'account_from_cmd')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key, 'key_from_cmd')
|
||||
params.node_setup.mount_volumes.azure_blob_file_systems[0].account_name = '<AZURE_BATCHAI_STORAGE_ACCOUNT>'
|
||||
params.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key = \
|
||||
'<AZURE_BATCHAI_STORAGE_KEY>'
|
||||
result = update_cluster_create_parameters_with_env_variables(params, 'account_from_cmd', 'key_from_cmd')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].account_name, 'account_from_cmd')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key, 'key_from_cmd')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].account_name, 'account_from_cmd')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key,
|
||||
'key_from_cmd')
|
||||
|
||||
# Non existing storage account provided as command line arg.
|
||||
params.node_setup.mount_volumes.azure_file_shares[0].account_name = '<AZURE_BATCHAI_STORAGE_ACCOUNT>'
|
||||
|
|
@ -200,10 +208,10 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
add_nfs_to_cluster_create_parameters(params, 'id', '')
|
||||
|
||||
# Check valid update.
|
||||
add_nfs_to_cluster_create_parameters(params, 'id', 'relative_path')
|
||||
self.assertEquals(params.node_setup.mount_volumes.file_servers[0].file_server.id, 'id')
|
||||
self.assertEquals(params.node_setup.mount_volumes.file_servers[0].relative_mount_path, 'relative_path')
|
||||
self.assertEquals(params.node_setup.mount_volumes.file_servers[0].mount_options, 'rw')
|
||||
result = add_nfs_to_cluster_create_parameters(params, 'id', 'relative_path')
|
||||
self.assertEquals(result.node_setup.mount_volumes.file_servers[0].file_server.id, 'id')
|
||||
self.assertEquals(result.node_setup.mount_volumes.file_servers[0].relative_mount_path, 'relative_path')
|
||||
self.assertEquals(result.node_setup.mount_volumes.file_servers[0].mount_options, 'rw')
|
||||
|
||||
def test_batchai_add_azure_file_share_to_cluster_create_parameters(self):
|
||||
"""Test adding of azure file share into cluster create parameters."""
|
||||
|
|
@ -226,12 +234,22 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
add_azure_file_share_to_cluster_create_parameters(params, 'share', '')
|
||||
|
||||
# Check valid update.
|
||||
add_azure_file_share_to_cluster_create_parameters(params, 'share', 'relative_path')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].account_name, 'account')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].azure_file_url,
|
||||
result = add_azure_file_share_to_cluster_create_parameters(params, 'share', 'relative_path')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].account_name, 'account')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].azure_file_url,
|
||||
'https://account.file.core.windows.net/share')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].relative_mount_path, 'relative_path')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key, 'key')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].relative_mount_path, 'relative_path')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key, 'key')
|
||||
|
||||
# Account name and key provided via command line args.
|
||||
os.environ.pop('AZURE_BATCHAI_STORAGE_ACCOUNT', None)
|
||||
os.environ.pop('AZURE_BATCHAI_STORAGE_KEY', None)
|
||||
result = add_azure_file_share_to_cluster_create_parameters(params, 'share', 'relative_path', 'account', 'key')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].account_name, 'account')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].azure_file_url,
|
||||
'https://account.file.core.windows.net/share')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].relative_mount_path, 'relative_path')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_file_shares[0].credentials.account_key, 'key')
|
||||
|
||||
def test_batchai_add_azure_container_to_cluster_create_parameters(self):
|
||||
"""Test adding of azure file share into cluster create parameters."""
|
||||
|
|
@ -253,13 +271,26 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
add_azure_container_to_cluster_create_parameters(params, 'container', '')
|
||||
|
||||
# Check valid update.
|
||||
add_azure_container_to_cluster_create_parameters(params, 'container', 'relative_path')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_blob_file_systems[0].account_name, 'account')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_blob_file_systems[0].container_name,
|
||||
result = add_azure_container_to_cluster_create_parameters(params, 'container', 'relative_path')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].account_name, 'account')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].container_name,
|
||||
'container')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_blob_file_systems[0].relative_mount_path,
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].relative_mount_path,
|
||||
'relative_path')
|
||||
self.assertEquals(params.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key,
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key,
|
||||
'key')
|
||||
|
||||
# Account name and key provided via command line args.
|
||||
os.environ.pop('AZURE_BATCHAI_STORAGE_ACCOUNT', None)
|
||||
os.environ.pop('AZURE_BATCHAI_STORAGE_KEY', None)
|
||||
result = add_azure_container_to_cluster_create_parameters(params, 'container', 'relative_path',
|
||||
'account', 'key')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].account_name, 'account')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].container_name,
|
||||
'container')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].relative_mount_path,
|
||||
'relative_path')
|
||||
self.assertEquals(result.node_setup.mount_volumes.azure_blob_file_systems[0].credentials.account_key,
|
||||
'key')
|
||||
|
||||
def test_batchai_update_nodes_information(self):
|
||||
|
|
@ -268,32 +299,29 @@ class TestBatchAICustom(unittest.TestCase):
|
|||
user_account_settings=UserAccountSettings(admin_user_name='name',
|
||||
admin_user_password='password'))
|
||||
# Update to autoscale Ubuntu DSVM.
|
||||
update_nodes_information(params, 'ubuntudsvm', 'Standard_NC6', 1, 3)
|
||||
self.assertEquals(params.vm_size, 'Standard_NC6')
|
||||
self.assertEquals(params.virtual_machine_configuration.image_reference,
|
||||
result = update_nodes_information(params, 'ubuntudsvm', 'Standard_NC6', 1, 3)
|
||||
self.assertEquals(result.vm_size, 'Standard_NC6')
|
||||
self.assertEquals(result.virtual_machine_configuration.image_reference,
|
||||
ImageReference('microsoft-ads', 'linux-data-science-vm-ubuntu', 'linuxdsvmubuntu'))
|
||||
self.assertEquals(params.scale_settings, ScaleSettings(auto_scale=AutoScaleSettings(1, 3)))
|
||||
self.assertEquals(result.scale_settings, ScaleSettings(auto_scale=AutoScaleSettings(1, 3)))
|
||||
|
||||
# Update to manual scale Ubuntu LTS.
|
||||
update_nodes_information(params, 'UbuntuLTS', 'Standard_NC6', 2, 2)
|
||||
self.assertEquals(params.vm_size, 'Standard_NC6')
|
||||
self.assertEquals(params.virtual_machine_configuration.image_reference,
|
||||
result = update_nodes_information(params, 'UbuntuLTS', 'Standard_NC6', 2, 2)
|
||||
self.assertEquals(result.vm_size, 'Standard_NC6')
|
||||
self.assertEquals(result.virtual_machine_configuration.image_reference,
|
||||
ImageReference('Canonical', 'UbuntuServer', '16.04-LTS'))
|
||||
self.assertEquals(params.scale_settings, ScaleSettings(manual=ManualScaleSettings(2)))
|
||||
self.assertEquals(result.scale_settings, ScaleSettings(manual=ManualScaleSettings(2)))
|
||||
|
||||
# Update image.
|
||||
update_nodes_information(params, 'UbuntuDsvm', None, 0, None)
|
||||
self.assertEquals(params.vm_size, 'Standard_NC6')
|
||||
self.assertEquals(params.virtual_machine_configuration.image_reference,
|
||||
params.scale_settings = ScaleSettings(manual=ManualScaleSettings(2))
|
||||
result = update_nodes_information(params, 'UbuntuDsvm', None, 0, None)
|
||||
self.assertEquals(result.virtual_machine_configuration.image_reference,
|
||||
ImageReference('microsoft-ads', 'linux-data-science-vm-ubuntu', 'linuxdsvmubuntu'))
|
||||
self.assertEquals(params.scale_settings, ScaleSettings(manual=ManualScaleSettings(2)))
|
||||
self.assertEquals(result.scale_settings, ScaleSettings(manual=ManualScaleSettings(2)))
|
||||
|
||||
# Update nothing.
|
||||
update_nodes_information(params, None, None, 0, None)
|
||||
self.assertEquals(params.vm_size, 'Standard_NC6')
|
||||
self.assertEquals(params.virtual_machine_configuration.image_reference,
|
||||
ImageReference('microsoft-ads', 'linux-data-science-vm-ubuntu', 'linuxdsvmubuntu'))
|
||||
self.assertEquals(params.scale_settings, ScaleSettings(manual=ManualScaleSettings(2)))
|
||||
result = update_nodes_information(params, None, None, 0, None)
|
||||
self.assertEqual(params, result)
|
||||
|
||||
# Wrong image.
|
||||
with self.assertRaises(CLIError):
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче