Skip to content

Commit 09ee741

Browse files
committed
Update test to check outboundVnetRouting.applicationTraffic instead of vnetRouteAllEnabled
1 parent 3b1371a commit 09ee741

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/azure-cli/azure/cli/command_modules/appservice/custom.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3199,16 +3199,20 @@ def update_site_configs(cmd, resource_group_name, name, slot=None, number_of_wor
31993199
setattr(configs, 'function_app_scale_limit', max_replicas)
32003200
return update_configuration_polling(cmd, resource_group_name, name, slot, configs)
32013201

3202+
# Update SiteConfig first
3203+
result = _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'update_configuration', slot, configs)
3204+
32023205
# Handle vnet_route_all_enabled separately using Site-level outbound_vnet_routing property
3206+
# This is done after SiteConfig update to ensure the Site-level property is not overwritten
32033207
if vnet_route_all_enabled is not None:
32043208
from azure.mgmt.web.models import OutboundVnetRouting
32053209
client = web_client_factory(cmd.cli_ctx)
32063210
app = _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'get', slot, client=client)
3207-
app.outbound_vnet_routing = OutboundVnetRouting(application_traffic=(vnet_route_all_enabled == 'true'))
3211+
app.outbound_vnet_routing = OutboundVnetRouting(application_traffic=vnet_route_all_enabled == 'true')
32083212
_generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'begin_create_or_update', slot,
32093213
client=client, extra_parameter=app)
32103214

3211-
return _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'update_configuration', slot, configs)
3215+
return result
32123216

32133217

32143218
def update_configuration_polling(cmd, resource_group_name, name, slot, configs):

src/azure-cli/azure/cli/command_modules/appservice/tests/latest/test_functionapp_commands.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3444,7 +3444,7 @@ def test_functionapp_elastic_premium_restricted_public_network_access_storage_vn
34443444

34453445
self.cmd('functionapp create -g {} -n {} -s {} -p {} --functions-version 4 --vnet {} --subnet {}'.format(resource_group, functionapp_name, storage_account, ep_plan_name, vnet_name, subnet_name)).assert_with_checks([
34463446
JMESPathCheck('vnetContentShareEnabled', True),
3447-
JMESPathCheck('vnetRouteAllEnabled', True),
3447+
JMESPathCheck('outboundVnetRouting.applicationTraffic', True),
34483448
JMESPathCheck('virtualNetworkSubnetId', subnet_id)
34493449
])
34503450

0 commit comments

Comments
 (0)