Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions scripts/ci/automation_full_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
profile = sys.argv[3]
serial_modules = sys.argv[4].split()
fix_failure_tests = sys.argv[5].lower() == 'true' if len(sys.argv) >= 6 else False
working_directory = "/home/vsts/work/1/s"
azdev_test_result_dir = "/home/vsts/.azdev/env_config/home/vsts/work/1/s/env"
working_directory = "/mnt/vss/_work/1/s"
azdev_test_result_dir = "/mnt/vss/.azdev/env_config/mnt/vss/_work/1/s/env"
jobs = {
'acr': 45,
'acs': 62,
Expand Down
7 changes: 3 additions & 4 deletions src/azure-cli-core/azure/cli/core/profiles/_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,19 +155,19 @@ def default_api_version(self):
'latest': {
ResourceType.MGMT_STORAGE: '2022-05-01',
ResourceType.MGMT_NETWORK: '2022-01-01',
ResourceType.MGMT_COMPUTE: SDKProfile('2022-03-01', {
ResourceType.MGMT_COMPUTE: SDKProfile('2022-08-01', {
'resource_skus': '2019-04-01',
'disks': '2022-03-02',
'disk_encryption_sets': '2022-03-02',
'disk_accesses': '2020-05-01',
'snapshots': '2022-03-02',
'galleries': '2021-10-01',
'gallery_images': '2021-10-01',
'gallery_image_versions': '2021-10-01',
'gallery_image_versions': '2022-01-03',
'gallery_applications': '2021-07-01',
'gallery_application_versions': '2022-01-03',
'shared_galleries': '2022-01-03',
'virtual_machine_scale_sets': '2022-03-01',
'virtual_machine_scale_sets': '2022-08-01',
}),
ResourceType.MGMT_RESOURCE_FEATURES: '2021-07-01',
ResourceType.MGMT_RESOURCE_LINKS: '2016-09-01',
Expand Down Expand Up @@ -413,7 +413,6 @@ def default_api_version(self):
# use the version in a profile as much as possible.
AD_HOC_API_VERSIONS = {
ResourceType.MGMT_NETWORK: {
'vm_default_target_network': '2018-01-01',
'container_network': '2018-08-01',
'appservice_network': '2020-04-01',
'appservice_ensure_subnet': '2019-02-01'
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
|Scenario|Result|ErrorMessage|ErrorStack|ErrorNormalized|StartDt|EndDt|
|step_accept|successed||||2022-08-31 06:40:47.964841|2022-08-31 06:40:48.006231|
|step_show|successed||||2022-08-31 06:40:48.006535|2022-08-31 06:40:48.020312|
|step_accept|successed||||2022-09-28 10:38:30.152621|2022-09-28 10:38:30.228234|
|step_show|successed||||2022-09-28 10:38:30.228413|2022-09-28 10:38:30.239115|
Coverage: 2/2

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions src/azure-cli/azure/cli/command_modules/vm/_validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
from azure.cli.core.commands.validators import (
get_default_location_from_resource_group, validate_file_or_dict, validate_parameter_set, validate_tags)
from azure.cli.core.util import (hash_string, DISALLOWED_USER_NAMES, get_default_admin_username)
from azure.cli.command_modules.vm._vm_utils import (
check_existence, get_target_network_api, get_storage_blob_uri, list_sku_info)
from azure.cli.command_modules.vm._vm_utils import (check_existence, get_storage_blob_uri, list_sku_info)
from azure.cli.command_modules.vm._template_builder import StorageProfile
from azure.cli.core import keys
from azure.core.exceptions import ResourceNotFoundError
Expand Down Expand Up @@ -1549,7 +1548,7 @@ def _validate_vmss_create_load_balancer_or_app_gateway(cmd, namespace):
def get_network_client(cli_ctx):
from azure.cli.core.profiles import ResourceType
from azure.cli.core.commands.client_factory import get_mgmt_service_client
return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_NETWORK, api_version=get_target_network_api(cli_ctx))
return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_NETWORK)


def get_network_lb(cli_ctx, resource_group_name, lb_name):
Expand Down
15 changes: 9 additions & 6 deletions src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@


def get_target_network_api(cli_ctx):
""" Since most compute calls don't need advanced network functionality, we can target a supported, but not
necessarily latest, network API version is order to avoid having to re-record every test that uses VM create
(which there are a lot) whenever NRP bumps their API version (which is often)!
"""
from azure.cli.core.profiles import get_api_version, ResourceType, AD_HOC_API_VERSIONS
version = get_api_version(cli_ctx, ResourceType.MGMT_NETWORK)
The fixed version of network used by ARM template deployment.
This is consistent with the version settings of other RP to ensure the stability of core commands "az vm create" and "az vmss create".
In addition, it can also reduce the workload of re-recording a large number of vm tests after bumping the network api-version.
Since it does not use the Python SDK, so it will not increase the dependence on the Python SDK
"""
if cli_ctx.cloud.profile == 'latest':
version = AD_HOC_API_VERSIONS[ResourceType.MGMT_NETWORK]['vm_default_target_network']
version = '2022-01-01'
else:
from azure.cli.core.profiles import get_api_version, ResourceType
version = get_api_version(cli_ctx, ResourceType.MGMT_NETWORK)
return version


Expand Down
4 changes: 1 addition & 3 deletions src/azure-cli/azure/cli/command_modules/vm/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -1231,10 +1231,8 @@ def get_vm_to_update(cmd, resource_group_name, vm_name):

def get_vm_details(cmd, resource_group_name, vm_name, include_user_data=False):
from msrestazure.tools import parse_resource_id
from azure.cli.command_modules.vm._vm_utils import get_target_network_api
result = get_instance_view(cmd, resource_group_name, vm_name, include_user_data)
network_client = get_mgmt_service_client(
cmd.cli_ctx, ResourceType.MGMT_NETWORK, api_version=get_target_network_api(cmd.cli_ctx))
network_client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_NETWORK)
public_ips = []
fqdns = []
private_ips = []
Expand Down
Loading