From 16e45a1f3a7ff8ca8b329e6b3a2bf0e61e5dc602 Mon Sep 17 00:00:00 2001 From: Yugang Wang Date: Sat, 9 Mar 2019 21:47:21 -0800 Subject: [PATCH 1/4] packaging: fix depdencyies on old msrestazure(#6973) --- src/command_modules/azure-cli-backup/setup.py | 4 ++-- src/command_modules/azure-cli-dla/setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/command_modules/azure-cli-backup/setup.py b/src/command_modules/azure-cli-backup/setup.py index 35335fad6c3..45597ab9e4e 100644 --- a/src/command_modules/azure-cli-backup/setup.py +++ b/src/command_modules/azure-cli-backup/setup.py @@ -31,8 +31,8 @@ ] DEPENDENCIES = [ - 'azure-mgmt-recoveryservices==0.1.0', - 'azure-mgmt-recoveryservicesbackup==0.1.1', + 'azure-mgmt-recoveryservices==0.3.0', + 'azure-mgmt-recoveryservicesbackup==0.3.0', 'azure-cli-core' ] diff --git a/src/command_modules/azure-cli-dla/setup.py b/src/command_modules/azure-cli-dla/setup.py index 75e6c1a694e..b1bdb99e57f 100644 --- a/src/command_modules/azure-cli-dla/setup.py +++ b/src/command_modules/azure-cli-dla/setup.py @@ -35,7 +35,7 @@ DEPENDENCIES = [ 'azure-mgmt-datalake-store==0.5.0', - 'azure-mgmt-datalake-analytics==0.2.0', + 'azure-mgmt-datalake-analytics==0.6.0', 'azure-cli-core', ] From a767ea9f0eeaab38cf745f1bfd324fa2b5ce7680 Mon Sep 17 00:00:00 2001 From: Yugang Wang Date: Sun, 10 Mar 2019 18:01:23 -0700 Subject: [PATCH 2/4] mitigate --- .../azure/cli/command_modules/backup/custom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/command_modules/azure-cli-backup/azure/cli/command_modules/backup/custom.py b/src/command_modules/azure-cli-backup/azure/cli/command_modules/backup/custom.py index 5695d0dee3d..ef12f39ed69 100644 --- a/src/command_modules/azure-cli-backup/azure/cli/command_modules/backup/custom.py +++ b/src/command_modules/azure-cli-backup/azure/cli/command_modules/backup/custom.py @@ -15,7 +15,7 @@ from msrest.paging import Paged from msrestazure.tools import parse_resource_id, is_valid_resource_id -from azure.mgmt.recoveryservices.models import Vault, VaultProperties, Sku, SkuName, BackupStorageConfig +from azure.mgmt.recoveryservices.models import Vault, VaultProperties, Sku, SkuName from azure.mgmt.recoveryservicesbackup.models import ProtectedItemResource, AzureIaaSComputeVMProtectedItem, \ AzureIaaSClassicComputeVMProtectedItem, ProtectionState, IaasVMBackupRequest, BackupRequestResource, \ IaasVMRestoreRequest, RestoreRequestResource, BackupManagementType, WorkloadType, OperationStatusValues, \ @@ -86,6 +86,7 @@ def list_vaults(client, resource_group_name=None): def set_backup_properties(client, vault_name, resource_group_name, backup_storage_redundancy): + from azure.mgmt.recoveryservices.models import BackupStorageConfig backup_storage_config = BackupStorageConfig(storage_model_type=backup_storage_redundancy) client.update(resource_group_name, vault_name, backup_storage_config) From a6fc6eef009b3cf6f49def51c7268fd16cfd798c Mon Sep 17 00:00:00 2001 From: yugangw-msft Date: Sun, 10 Mar 2019 21:51:51 -0700 Subject: [PATCH 3/4] fix more --- .../azure/cli/command_modules/backup/commands.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/command_modules/azure-cli-backup/azure/cli/command_modules/backup/commands.py b/src/command_modules/azure-cli-backup/azure/cli/command_modules/backup/commands.py index cd4d35cd71c..cf115f8a31b 100644 --- a/src/command_modules/azure-cli-backup/azure/cli/command_modules/backup/commands.py +++ b/src/command_modules/azure-cli-backup/azure/cli/command_modules/backup/commands.py @@ -22,15 +22,15 @@ def load_command_table(self, _): operations_tmpl='azure.mgmt.recoveryservices.operations#VaultsOperations.{}', client_factory=vaults_cf) - backup_storage_config_sdk = CliCommandType( - operations_tmpl='azure.mgmt.recoveryservices.operations#BackupStorageConfigsOperations.{}', - client_factory=vaults_cf) + # backup_storage_config_sdk = CliCommandType( + # operations_tmpl='azure.mgmt.recoveryservices.operations#BackupStorageConfigsOperations.{}', + # client_factory=vaults_cf) with self.command_group('backup vault', backup_vaults_sdk, client_factory=vaults_cf) as g: g.custom_command('create', 'create_vault') g.show_command('show', 'get') g.custom_command('list', 'list_vaults') - g.show_command('backup-properties show', 'get', command_type=backup_storage_config_sdk) + # g.show_command('backup-properties show', 'get', command_type=backup_storage_config_sdk) g.custom_command('backup-properties set', 'set_backup_properties', client_factory=backup_storage_configs_cf) g.custom_command('delete', 'delete_vault', confirmation=True) From 65a2a0174aa11a716f6592ba3da6b10577a262f8 Mon Sep 17 00:00:00 2001 From: yugangw-msft Date: Sun, 10 Mar 2019 22:32:44 -0700 Subject: [PATCH 4/4] continue --- .../azure/cli/command_modules/dla/commands.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/command_modules/azure-cli-dla/azure/cli/command_modules/dla/commands.py b/src/command_modules/azure-cli-dla/azure/cli/command_modules/dla/commands.py index 30caef3efb5..5c6d4d756f1 100644 --- a/src/command_modules/azure-cli-dla/azure/cli/command_modules/dla/commands.py +++ b/src/command_modules/azure-cli-dla/azure/cli/command_modules/dla/commands.py @@ -23,9 +23,9 @@ def load_command_table(self, _): adla_format_path = 'azure.mgmt.datalake.analytics.{}.operations.{}#{}.{{}}' - dla_account_sdk = CliCommandType( - operations_tmpl=adla_format_path.format('account', 'account_operations', 'AccountOperations'), - client_factory=cf_dla_account) + # dla_account_sdk = CliCommandType( + # operations_tmpl=adla_format_path.format('account', 'account_operations', 'AccountOperations'), + # client_factory=cf_dla_account) dla_firewall_sdk = CliCommandType( operations_tmpl=adla_format_path.format('account', 'firewall_rules_operations', 'FirewallRulesOperations'), @@ -63,12 +63,12 @@ def load_command_table(self, _): ) # account operations - with self.command_group('dla account', dla_account_sdk, client_factory=cf_dla_account) as g: - g.custom_command('create', 'create_adla_account') - g.custom_command('update', 'update_adla_account') - g.custom_command('list', 'list_adla_account') - g.show_command('show', 'get') - g.command('delete', 'delete') + # with self.command_group('dla account', dla_account_sdk, client_factory=cf_dla_account) as g: + # g.custom_command('create', 'create_adla_account') + # g.custom_command('update', 'update_adla_account') + # g.custom_command('list', 'list_adla_account') + # g.show_command('show', 'get') + # g.command('delete', 'delete') # account fire wall operations with self.command_group('dla account firewall', dla_firewall_sdk, client_factory=cf_dla_account_firewall) as g: