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.

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

[NetAppFiles] az netappfiles volume replication: Modified volume create to allow data protection volumes and added replication operations, approve, pause, resume and remove. #1

Closed
wants to merge 9 commits into from
2 changes: 1 addition & 1 deletion scripts/curl_install_pypi/install
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Bash script to install the Azure CLI
#
INSTALL_SCRIPT_URL="https://azurecliprod.blob.core.windows.net/install.py"
INSTALL_SCRIPT_SHA256=4f074786d7a5eb3552d4982349b740fcd882cf99d674576f807189354979c7ee
INSTALL_SCRIPT_SHA256=8835ac5023e292b9c3afa44f7e9a2c0058c56789114891fb921ee85fbc9c2002
_TTY=/dev/tty

install_script=$(mktemp -t azure_cli_install_tmp_XXXXXX) || exit
Expand Down
5 changes: 3 additions & 2 deletions src/azure-cli-core/azure/cli/core/profiles/_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def default_api_version(self):
AZURE_API_PROFILES = {
'latest': {
ResourceType.MGMT_STORAGE: '2019-06-01',
ResourceType.MGMT_NETWORK: '2019-09-01',
ResourceType.MGMT_NETWORK: '2019-11-01',
ResourceType.MGMT_COMPUTE: SDKProfile('2019-07-01', {
'resource_skus': '2019-04-01',
'disks': '2019-07-01',
Expand Down Expand Up @@ -203,7 +203,8 @@ def default_api_version(self):
# Full MultiAPI support is not done in AppService, the line below is merely
# to have commands show up in the hybrid profile which happens to have the latest
# API versions
ResourceType.MGMT_APPSERVICE: '2018-02-01'
ResourceType.MGMT_APPSERVICE: '2018-02-01',
ResourceType.MGMT_EVENTHUB: '2017-04-01'
},
'2018-03-01-hybrid': {
ResourceType.MGMT_STORAGE: '2016-01-01',
Expand Down
4 changes: 4 additions & 0 deletions src/azure-cli/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ Release History

* Fix #6371: Support filename and environment variable completion in Bash

**NetAppFiles**

* Modified volume create to allow data protection volumes and added cmdlets for replication operations, approve, pause, resume and remove.

**Network**

* Fix #2092: az network dns record-set add/remove: add warning when record-set is not found. In the future, an extra argument will be supported to confirm this auto creation.
Expand Down
16 changes: 16 additions & 0 deletions src/azure-cli/azure/cli/command_modules/acr/_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ def task_output_format(result):
return _output_format(result, _task_format_group)


def task_identity_format(result):
return _output_format(result, _task_identity_format_group)


def taskrun_output_format(result):
return _output_format(result, _taskrun_format_group)

Expand Down Expand Up @@ -188,6 +192,18 @@ def _task_format_group(item):
])


def _task_identity_format_group(item):
identities = _get_array_value(item, 'userAssignedIdentities')
identities_by_line = str('\n'.join(identities)) if identities else ' '

return OrderedDict([
('PRINCIPAL ID', _get_value(item, 'principalId')),
('TENANT ID', _get_value(item, 'tenantId')),
('TYPE', _get_value(item, 'type')),
('USER ASSIGNED IDENTITIES', identities_by_line)
])


def _taskrun_format_group(item):
return OrderedDict([
('NAME', _get_value(item, 'name')),
Expand Down
3 changes: 2 additions & 1 deletion src/azure-cli/azure/cli/command_modules/acr/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
replication_output_format,
build_output_format,
task_output_format,
task_identity_format,
taskrun_output_format,
run_output_format,
helm_list_output_format,
Expand Down Expand Up @@ -223,7 +224,7 @@ def load_command_table(self, _): # pylint: disable=too-many-statements
g.command('update', 'acr_task_update')
g.command('identity assign', 'acr_task_identity_assign')
g.command('identity remove', 'acr_task_identity_remove')
g.command('identity show', 'acr_task_identity_show')
g.command('identity show', 'acr_task_identity_show', table_transformer=task_identity_format)
g.command('credential add', 'acr_task_credential_add')
g.command('credential update', 'acr_task_credential_update')
g.command('credential remove', 'acr_task_credential_remove')
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ interactions:
- -g -n --location --length
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
accept-language:
- en-US
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPPrefixes/cliaksslbipp1000002?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPPrefixes/cliaksslbipp1000002?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"name\": \"cliaksslbipp1000002\",\r\n \"\
Expand All @@ -37,7 +37,7 @@ interactions:
,\r\n \"tier\": \"Regional\"\r\n }\r\n}"
headers:
azure-asyncoperation:
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/bf5ceaed-3f0f-440b-9d30-bc2267cdea76?api-version=2019-09-01
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/bf5ceaed-3f0f-440b-9d30-bc2267cdea76?api-version=2019-11-01
cache-control:
- no-cache
content-length:
Expand Down Expand Up @@ -79,9 +79,9 @@ interactions:
- -g -n --location --length
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/bf5ceaed-3f0f-440b-9d30-bc2267cdea76?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/bf5ceaed-3f0f-440b-9d30-bc2267cdea76?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"status\": \"Succeeded\"\r\n}"
Expand Down Expand Up @@ -129,9 +129,9 @@ interactions:
- -g -n --location --length
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPPrefixes/cliaksslbipp1000002?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPPrefixes/cliaksslbipp1000002?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"name\": \"cliaksslbipp1000002\",\r\n \"\
Expand Down Expand Up @@ -195,11 +195,11 @@ interactions:
- -g -n --location --length
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
accept-language:
- en-US
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPPrefixes/cliaksslbipp2000003?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPPrefixes/cliaksslbipp2000003?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"name\": \"cliaksslbipp2000003\",\r\n \"\
Expand All @@ -213,7 +213,7 @@ interactions:
,\r\n \"tier\": \"Regional\"\r\n }\r\n}"
headers:
azure-asyncoperation:
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/86fa45e6-5830-4e03-804e-7d5a2b923c06?api-version=2019-09-01
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/86fa45e6-5830-4e03-804e-7d5a2b923c06?api-version=2019-11-01
cache-control:
- no-cache
content-length:
Expand Down Expand Up @@ -255,9 +255,9 @@ interactions:
- -g -n --location --length
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/86fa45e6-5830-4e03-804e-7d5a2b923c06?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/86fa45e6-5830-4e03-804e-7d5a2b923c06?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"status\": \"Succeeded\"\r\n}"
Expand Down Expand Up @@ -305,9 +305,9 @@ interactions:
- -g -n --location --length
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPPrefixes/cliaksslbipp2000003?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPPrefixes/cliaksslbipp2000003?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"name\": \"cliaksslbipp2000003\",\r\n \"\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ interactions:
- -g -n --location --sku
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
accept-language:
- en-US
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPAddresses/cliaksslbip1000002?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPAddresses/cliaksslbip1000002?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"name\": \"cliaksslbip1000002\",\r\n \"id\"\
Expand All @@ -39,7 +39,7 @@ interactions:
}"
headers:
azure-asyncoperation:
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/d534a649-f5c3-4bc6-a333-b5b609576e90?api-version=2019-09-01
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/d534a649-f5c3-4bc6-a333-b5b609576e90?api-version=2019-11-01
cache-control:
- no-cache
content-length:
Expand Down Expand Up @@ -81,9 +81,9 @@ interactions:
- -g -n --location --sku
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/d534a649-f5c3-4bc6-a333-b5b609576e90?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/d534a649-f5c3-4bc6-a333-b5b609576e90?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"status\": \"Succeeded\"\r\n}"
Expand Down Expand Up @@ -127,9 +127,9 @@ interactions:
- -g -n --location --sku
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPAddresses/cliaksslbip1000002?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPAddresses/cliaksslbip1000002?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"name\": \"cliaksslbip1000002\",\r\n \"id\"\
Expand Down Expand Up @@ -190,11 +190,11 @@ interactions:
- -g -n --location --sku
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
accept-language:
- en-US
method: PUT
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPAddresses/cliaksslbip2000003?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPAddresses/cliaksslbip2000003?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"name\": \"cliaksslbip2000003\",\r\n \"id\"\
Expand All @@ -209,7 +209,7 @@ interactions:
}"
headers:
azure-asyncoperation:
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/005a9f8e-8c7e-4d75-a9c0-d13b6a8f1cd5?api-version=2019-09-01
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/005a9f8e-8c7e-4d75-a9c0-d13b6a8f1cd5?api-version=2019-11-01
cache-control:
- no-cache
content-length:
Expand Down Expand Up @@ -251,9 +251,9 @@ interactions:
- -g -n --location --sku
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/005a9f8e-8c7e-4d75-a9c0-d13b6a8f1cd5?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/005a9f8e-8c7e-4d75-a9c0-d13b6a8f1cd5?api-version=2019-11-01
response:
body:
string: !!python/unicode '{"error":{"code":"ServerTimeout","message":"The request
Expand Down Expand Up @@ -299,9 +299,9 @@ interactions:
- -g -n --location --sku
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/005a9f8e-8c7e-4d75-a9c0-d13b6a8f1cd5?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/005a9f8e-8c7e-4d75-a9c0-d13b6a8f1cd5?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"status\": \"Succeeded\"\r\n}"
Expand Down Expand Up @@ -349,9 +349,9 @@ interactions:
- -g -n --location --sku
User-Agent:
- python/2.7.15+ (Linux-4.18.0-25-generic-x86_64-with-Ubuntu-18.04-bionic) msrest/0.6.9
msrest_azure/0.6.1 azure-mgmt-network/4.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
msrest_azure/0.6.1 azure-mgmt-network/9.0.0 Azure-SDK-For-Python AZURECLI/2.0.73
method: GET
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPAddresses/cliaksslbip2000003?api-version=2019-09-01
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/publicIPAddresses/cliaksslbip2000003?api-version=2019-11-01
response:
body:
string: !!python/unicode "{\r\n \"name\": \"cliaksslbip2000003\",\r\n \"id\"\
Expand Down
Loading