Skip to content
Merged
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
3 changes: 2 additions & 1 deletion src/spring-cloud/azext_spring_cloud/_enterprise.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def spring_cloud_create(cmd, client, resource_group, name, location=None,
service_runtime_network_resource_group=None, app_network_resource_group=None,
app_insights_key=None, app_insights=None, sampling_rate=None,
disable_app_insights=None, enable_java_agent=None,
sku=None, tags=None, no_wait=False):
sku=None, tags=None, zone_redundant=False, no_wait=False):
"""
This method creates Azure Spring Cloud enterprise tier instance, it also creates sub-component under the instance if
user enable these component.
Expand All @@ -29,6 +29,7 @@ def spring_cloud_create(cmd, client, resource_group, name, location=None,
reserved_cidr_range=reserved_cidr_range,
service_runtime_network_resource_group=service_runtime_network_resource_group,
app_network_resource_group=app_network_resource_group,
zone_redundant=zone_redundant,
sku=sku,
tags=tags)
return poller
5 changes: 5 additions & 0 deletions src/spring-cloud/azext_spring_cloud/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ def load_arguments(self, _):
"--app-insights-key or --app-insights, "
"will create a new Application Insights instance in the same resource group.",
validator=validate_tracing_parameters_asc_create)
c.argument('zone_redundant',
arg_type=get_three_state_flag(),
help="Create your Azure Spring Cloud service in an Azure availability zone or not, "
"this could only be supported in several regions at the moment ",
default=False, is_preview=True)

with self.argument_context('spring-cloud update') as c:
c.argument('sku', arg_type=sku_type)
Expand Down
15 changes: 9 additions & 6 deletions src/spring-cloud/azext_spring_cloud/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def spring_cloud_create(cmd, client, resource_group, name, location=None,
service_runtime_network_resource_group=None, app_network_resource_group=None,
app_insights_key=None, app_insights=None, sampling_rate=None,
disable_app_insights=None, enable_java_agent=None,
sku=None, tags=None, no_wait=False):
sku=None, tags=None, zone_redundant=False, no_wait=False):
"""
Note: This is the command for create Spring-Cloud Standard and Basic tier. Refer tier_routing_spring_cloud.py for
the command definition. And _enteprise.py for Spring-Cloud Enterprise tier creation.
Expand All @@ -85,6 +85,7 @@ def spring_cloud_create(cmd, client, resource_group, name, location=None,
reserved_cidr_range=reserved_cidr_range,
service_runtime_network_resource_group=service_runtime_network_resource_group,
app_network_resource_group=app_network_resource_group,
zone_redundant=zone_redundant,
sku=sku,
tags=tags)
_update_application_insights_asc_create(cmd, resource_group, name, location,
Expand All @@ -96,21 +97,23 @@ def spring_cloud_create(cmd, client, resource_group, name, location=None,
def _create_service(cmd, client, resource_group, name, location=None,
service_runtime_subnet=None, app_subnet=None, reserved_cidr_range=None,
service_runtime_network_resource_group=None, app_network_resource_group=None,
zone_redundant=False,
sku=None, tags=None):
if location is None:
location = _get_rg_location(cmd.cli_ctx, resource_group)
properties = models.ClusterResourceProperties()
properties = models_20220101preview.ClusterResourceProperties()

if service_runtime_subnet or app_subnet or reserved_cidr_range:
properties.network_profile = models.NetworkProfile(
properties.network_profile = models_20220101preview.NetworkProfile(
service_runtime_subnet_id=service_runtime_subnet,
app_subnet_id=app_subnet,
service_cidr=reserved_cidr_range,
app_network_resource_group=app_network_resource_group,
service_runtime_network_resource_group=service_runtime_network_resource_group
)

resource = models.ServiceResource(location=location, sku=sku, properties=properties, tags=tags)
properties.zone_redundant = zone_redundant
resource = models_20220101preview.ServiceResource(location=location, sku=sku, properties=properties, tags=tags)

poller = client.services.begin_create_or_update(
resource_group, name, resource)
Expand Down Expand Up @@ -148,7 +151,7 @@ def spring_cloud_update(cmd, client, resource_group, name, app_insights_key=None
Will be decommissioned in future releases.
:param app_insights_key: Connection string or Instrumentation key
"""
updated_resource = models.ServiceResource()
updated_resource = models_20220101preview.ServiceResource()
update_service_tags = False
update_service_sku = False

Expand All @@ -159,7 +162,7 @@ def spring_cloud_update(cmd, client, resource_group, name, app_insights_key=None

resource = client.services.get(resource_group, name)
location = resource.location
updated_resource_properties = models.ClusterResourceProperties()
updated_resource_properties = models_20220101preview.ClusterResourceProperties()

_update_application_insights_asc_update(cmd, resource_group, name, location,
app_insights_key, app_insights, disable_app_insights, no_wait)
Expand Down
Loading