Skip to content

Commit a620963

Browse files
iliu816iliu816
committed
azdev style fixes
1 parent 67da3f3 commit a620963

File tree

3 files changed

+82
-75
lines changed

3 files changed

+82
-75
lines changed

‎src/azure-cli/azure/cli/command_modules/servicefabric/operations/managed_applications.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@ def create_app(cmd,
7878
return app
7979

8080
new_app_type_version = _format_app_version(cmd.cli_ctx, resource_group_name, cluster_name, application_type_name, application_type_version)
81-
appResource = ApplicationResource(properties=ApplicationResourceProperties(
82-
version=new_app_type_version,
83-
parameters=application_parameters),
84-
location=location,
85-
tags=tags)
81+
appResource = ApplicationResource(
82+
properties=ApplicationResourceProperties(
83+
version=new_app_type_version,
84+
parameters=application_parameters),
85+
location=location,
86+
tags=tags)
8687
appResource.name = application_name
8788
poller = client.applications.begin_create_or_update(resource_group_name, cluster_name, application_name, appResource)
8889
return LongRunningOperation(cmd.cli_ctx)(poller)
@@ -130,23 +131,23 @@ def update_app(cmd,
130131
appResource.tags = tags
131132

132133
appResource.properties.upgrade_policy = _set_upgrade_policy(currentApp.upgrade_policy,
133-
force_restart,
134-
recreate_application,
135-
upgrade_replica_set_check_timeout,
136-
instance_close_delay_duration,
137-
failure_action,
138-
upgrade_mode,
139-
health_check_retry_timeout,
140-
health_check_wait_duration,
141-
health_check_stable_duration,
142-
upgrade_domain_timeout,
143-
upgrade_timeout,
144-
consider_warning_as_error,
145-
default_service_type_max_percent_unhealthy_partitions_per_service,
146-
default_service_type_max_percent_unhealthy_replicas_per_partition,
147-
default_service_type_max_percent_unhealthy_services,
148-
max_percent_unhealthy_deployed_applications,
149-
service_type_health_policy_map)
134+
force_restart,
135+
recreate_application,
136+
upgrade_replica_set_check_timeout,
137+
instance_close_delay_duration,
138+
failure_action,
139+
upgrade_mode,
140+
health_check_retry_timeout,
141+
health_check_wait_duration,
142+
health_check_stable_duration,
143+
upgrade_domain_timeout,
144+
upgrade_timeout,
145+
consider_warning_as_error,
146+
default_service_type_max_percent_unhealthy_partitions_per_service,
147+
default_service_type_max_percent_unhealthy_replicas_per_partition,
148+
default_service_type_max_percent_unhealthy_services,
149+
max_percent_unhealthy_deployed_applications,
150+
service_type_health_policy_map)
150151

151152
# TODO: change to patch once the fix is supported in the rp
152153
# client.applications.update(resource_group_name, cluster_name, application_name, appResourceUpdate)
@@ -212,11 +213,10 @@ def create_app_type_version(cmd,
212213
logger.error("Application type version '%s' already exists", version)
213214
return appTypeVersion
214215

215-
appTypeVersionResource = ApplicationTypeVersionResource(
216-
properties=ApplicationTypeVersionResourceProperties(
217-
app_package_url=package_url),
218-
location=location,
219-
tags=tags)
216+
appTypeVersionResource = ApplicationTypeVersionResource(properties=ApplicationTypeVersionResourceProperties(
217+
app_package_url=package_url),
218+
location=location,
219+
tags=tags)
220220
logger.info("Creating application type version %s:%s", application_type_name, version)
221221
poller = client.application_type_versions.begin_create_or_update(resource_group_name,
222222
cluster_name,

‎src/azure-cli/azure/cli/command_modules/servicefabric/operations/managed_clusters.py‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,20 +88,21 @@ def create_cluster(cmd,
8888
if client_cert_issuer_thumbprint is not None:
8989
client_cert_issuer_thumbprint = ','.join(client_cert_issuer_thumbprint)
9090
client_certs.append(ClientCertificate(is_admin=client_cert_is_admin, common_name=client_cert_common_name, issuer_thumbprint=client_cert_issuer_thumbprint))
91-
92-
new_cluster = ManagedCluster(location=location,
93-
sku=skuObj,
94-
tags=tags,
95-
properties=ManagedClusterProperties(
96-
dns_name=dns_name,
97-
admin_user_name=admin_user_name,
98-
admin_password=admin_password,
99-
client_connection_port=client_connection_port,
100-
http_gateway_connection_port=gateway_connection_port,
101-
clients=client_certs,
102-
cluster_upgrade_mode=upgrade_mode,
103-
cluster_upgrade_cadence=upgrade_cadence,
104-
cluster_code_version=code_version))
91+
92+
new_cluster = ManagedCluster(
93+
location=location,
94+
sku=skuObj,
95+
tags=tags,
96+
properties=ManagedClusterProperties(
97+
dns_name=dns_name,
98+
admin_user_name=admin_user_name,
99+
admin_password=admin_password,
100+
client_connection_port=client_connection_port,
101+
http_gateway_connection_port=gateway_connection_port,
102+
clients=client_certs,
103+
cluster_upgrade_mode=upgrade_mode,
104+
cluster_upgrade_cadence=upgrade_cadence,
105+
cluster_code_version=code_version))
105106

106107
logger.info("Creating managed cluster '%s'", cluster_name)
107108
poller = client.managed_clusters.begin_create_or_update(resource_group_name, cluster_name, new_cluster)

‎src/azure-cli/azure/cli/command_modules/servicefabric/operations/managed_node_types.py‎

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -69,29 +69,32 @@ def create_node_type(cmd,
6969
vm_image_version = "latest"
7070

7171
try:
72-
new_node_type = NodeType(properties=NodeTypeProperties(
73-
is_primary=primary,
74-
vm_instance_count=int(instance_count),
75-
data_disk_size_gb=disk_size,
76-
data_disk_type=disk_type,
77-
vm_size=vm_size,
78-
vm_image_publisher=vm_image_publisher,
79-
vm_image_offer=vm_image_offer,
80-
vm_image_sku=vm_image_sku,
81-
vm_image_version=vm_image_version,
82-
capacities=capacity,
83-
placement_properties=placement_property,
84-
is_stateless=is_stateless,
85-
multiple_placement_groups=multiple_placement_groups),
86-
tags=tags)
72+
new_node_type = NodeType(
73+
properties=NodeTypeProperties(
74+
is_primary=primary,
75+
vm_instance_count=int(instance_count),
76+
data_disk_size_gb=disk_size,
77+
data_disk_type=disk_type,
78+
vm_size=vm_size,
79+
vm_image_publisher=vm_image_publisher,
80+
vm_image_offer=vm_image_offer,
81+
vm_image_sku=vm_image_sku,
82+
vm_image_version=vm_image_version,
83+
capacities=capacity,
84+
placement_properties=placement_property,
85+
is_stateless=is_stateless,
86+
multiple_placement_groups=multiple_placement_groups),
87+
tags=tags)
8788

8889
if application_start_port and application_end_port:
89-
new_node_type.properties.application_ports = EndpointRangeDescription(start_port=application_start_port,
90-
end_port=application_end_port)
90+
new_node_type.properties.application_ports = EndpointRangeDescription(
91+
start_port=application_start_port,
92+
end_port=application_end_port)
9193

9294
if ephemeral_start_port and ephemeral_end_port:
93-
new_node_type.properties.ephemeral_ports = EndpointRangeDescription(start_port=ephemeral_start_port,
94-
end_port=ephemeral_end_port)
95+
new_node_type.properties.ephemeral_ports = EndpointRangeDescription(
96+
start_port=ephemeral_start_port,
97+
end_port=ephemeral_end_port)
9598

9699
logger.info("Creating node type '%s'", node_type_name)
97100
poller = client.node_types.begin_create_or_update(resource_group_name, cluster_name, node_type_name, new_node_type)
@@ -123,12 +126,14 @@ def update_node_type(cmd,
123126
node_type.properties.vm_instance_count = instance_count
124127

125128
if application_start_port and application_end_port:
126-
node_type.properties.application_ports = EndpointRangeDescription(start_port=application_start_port,
127-
end_port=application_end_port)
129+
node_type.properties.application_ports = EndpointRangeDescription(
130+
start_port=application_start_port,
131+
end_port=application_end_port)
128132

129133
if ephemeral_start_port and ephemeral_end_port:
130-
node_type.properties.ephemeral_ports = EndpointRangeDescription(start_port=ephemeral_start_port,
131-
end_port=ephemeral_end_port)
134+
node_type.properties.ephemeral_ports = EndpointRangeDescription(
135+
start_port=ephemeral_start_port,
136+
end_port=ephemeral_end_port)
132137

133138
if capacity is not None:
134139
node_type.properties.capacities = capacity
@@ -220,17 +225,18 @@ def add_vm_extension(cmd,
220225
if node_type.properties.vm_extensions is None:
221226
node_type.properties.vm_extensions = []
222227

223-
newExtension = VMSSExtension(name=extension_name,
224-
properties=VMSSExtensionProperties(
225-
publisher=publisher,
226-
type=extension_type,
227-
type_handler_version=type_handler_version,
228-
force_update_tag=force_update_tag,
229-
auto_upgrade_minor_version=auto_upgrade_minor_version,
230-
settings=setting,
231-
protected_settings=protected_setting,
232-
provision_after_extensions=provision_after_extension)
233-
)
228+
newExtension = VMSSExtension(
229+
name=extension_name,
230+
properties=VMSSExtensionProperties(
231+
publisher=publisher,
232+
type=extension_type,
233+
type_handler_version=type_handler_version,
234+
force_update_tag=force_update_tag,
235+
auto_upgrade_minor_version=auto_upgrade_minor_version,
236+
settings=setting,
237+
protected_settings=protected_setting,
238+
provision_after_extensions=provision_after_extension)
239+
)
234240

235241
node_type.properties.vm_extensions.append(newExtension)
236242

0 commit comments

Comments
 (0)