@@ -303,7 +303,8 @@ def add_app_cert(cmd,
303303 return client .get (resource_group_name , cluster_name )
304304
305305
306- def add_client_cert (client ,
306+ def add_client_cert (cmd ,
307+ client ,
307308 resource_group_name ,
308309 cluster_name ,
309310 is_admin = False ,
@@ -313,6 +314,7 @@ def add_client_cert(client,
313314 admin_client_thumbprints = None ,
314315 readonly_client_thumbprints = None ,
315316 client_certificate_common_names = None ):
317+ cli_ctx = cmd .cli_ctx
316318 if thumbprint :
317319 if certificate_common_name or certificate_issuer_thumbprint or admin_client_thumbprints or readonly_client_thumbprints or client_certificate_common_names :
318320 raise CLIError (
@@ -377,16 +379,19 @@ def _add_common_name(cluster, is_admin, certificate_common_name, certificate_iss
377379
378380 patch_request = ClusterUpdateParameters (client_certificate_thumbprints = cluster .client_certificate_thumbprints ,
379381 client_certificate_common_names = cluster .client_certificate_common_names )
380- return client .update (resource_group_name , cluster_name , patch_request )
382+ update_cluster_poll = client .begin_update (resource_group_name , cluster_name , patch_request )
383+ return LongRunningOperation (cli_ctx )(update_cluster_poll )
381384
382385
383- def remove_client_cert (client ,
386+ def remove_client_cert (cmd ,
387+ client ,
384388 resource_group_name ,
385389 cluster_name ,
386390 thumbprints = None ,
387391 certificate_common_name = None ,
388392 certificate_issuer_thumbprint = None ,
389393 client_certificate_common_names = None ):
394+ cli_ctx = cmd .cli_ctx
390395 if thumbprints :
391396 if certificate_common_name or certificate_issuer_thumbprint or client_certificate_common_names :
392397 raise CLIError ("--thumbprint can only specified alone" )
@@ -442,7 +447,8 @@ def _remove_common_name(cluster, certificate_common_name, certificate_issuer_thu
442447 patch_request = ClusterUpdateParameters (client_certificate_thumbprints = cluster .client_certificate_thumbprints ,
443448 client_certificate_common_names = cluster .client_certificate_common_names )
444449
445- return client .update (resource_group_name , cluster_name , patch_request )
450+ update_cluster_poll = client .begin_update (resource_group_name , cluster_name , patch_request )
451+ return LongRunningOperation (cli_ctx )(update_cluster_poll )
446452
447453
448454def add_cluster_node (cmd , client , resource_group_name , cluster_name , node_type , number_of_nodes_to_add ):
@@ -469,7 +475,8 @@ def add_cluster_node(cmd, client, resource_group_name, cluster_name, node_type,
469475 node_type .vm_instance_count = vmss .sku .capacity
470476 patch_request = ClusterUpdateParameters (node_types = cluster .node_types )
471477
472- return client .update (resource_group_name , cluster_name , patch_request )
478+ update_cluster_poll = client .begin_update (resource_group_name , cluster_name , patch_request )
479+ return LongRunningOperation (cli_ctx )(update_cluster_poll )
473480
474481
475482def remove_cluster_node (cmd , client , resource_group_name , cluster_name , node_type , number_of_nodes_to_remove ):
@@ -501,13 +508,14 @@ def remove_cluster_node(cmd, client, resource_group_name, cluster_name, node_typ
501508 node_type .vm_instance_count = vmss .sku .capacity
502509 patch_request = ClusterUpdateParameters (node_types = cluster .node_types )
503510
504- return client .update (resource_group_name , cluster_name , patch_request )
511+ sfrp_poll = client .begin_update (resource_group_name , cluster_name , patch_request )
512+ return LongRunningOperation (cli_ctx )(sfrp_poll )
505513
506514
507515def update_cluster_durability (cmd , client , resource_group_name , cluster_name , node_type , durability_level ):
508516 cli_ctx = cmd .cli_ctx
509517
510- # get cluster node type durablity
518+ # get cluster node type durability
511519 cluster = client .get (resource_group_name , cluster_name )
512520 node_type_refs = [n for n in cluster .node_types if n .name .lower () == node_type .lower ()]
513521 if not node_type_refs :
@@ -536,7 +544,7 @@ def update_cluster_durability(cmd, client, resource_group_name, cluster_name, no
536544 if curr_node_type_durability .lower () != durability_level .lower ():
537545 node_type_ref .durability_level = durability_level
538546 patch_request = ClusterUpdateParameters (node_types = cluster .node_types )
539- update_cluster_poll = client .update (resource_group_name , cluster_name , patch_request )
547+ update_cluster_poll = client .begin_update (resource_group_name , cluster_name , patch_request )
540548 LongRunningOperation (cli_ctx )(update_cluster_poll )
541549
542550 # update vmss sf extension durability
@@ -549,7 +557,8 @@ def update_cluster_durability(cmd, client, resource_group_name, cluster_name, no
549557 return client .get (resource_group_name , cluster_name )
550558
551559
552- def update_cluster_upgrade_type (client ,
560+ def update_cluster_upgrade_type (cmd ,
561+ client ,
553562 resource_group_name ,
554563 cluster_name ,
555564 upgrade_mode ,
@@ -558,6 +567,7 @@ def update_cluster_upgrade_type(client,
558567 raise CLIError (
559568 '--upgrade-mode can either be \' manual\' or \' automatic\' ' )
560569
570+ cli_ctx = cmd .cli_ctx
561571 cluster = client .get (resource_group_name , cluster_name )
562572 patch_request = ClusterUpdateParameters (node_types = cluster .node_types )
563573 if upgrade_mode .lower () == 'manual' :
@@ -567,16 +577,20 @@ def update_cluster_upgrade_type(client,
567577 patch_request .cluster_code_version = version
568578
569579 patch_request .upgrade_mode = upgrade_mode
570- return client .update (resource_group_name , cluster_name , patch_request )
580+ update_cluster_poll = client .begin_update (resource_group_name , cluster_name , patch_request )
581+ return LongRunningOperation (cli_ctx )(update_cluster_poll )
571582
572583
573- def set_cluster_setting (client ,
584+ def set_cluster_setting (cmd ,
585+ client ,
574586 resource_group_name ,
575587 cluster_name ,
576588 section = None ,
577589 parameter = None ,
578590 value = None ,
579591 settings_section_description = None ):
592+ cli_ctx = cmd .cli_ctx
593+
580594 def _set (setting_dict , section , parameter , value ):
581595 if section not in setting_dict :
582596 setting_dict [section ] = {}
@@ -602,15 +616,19 @@ def _set(setting_dict, section, parameter, value):
602616 setting_dict = _set (setting_dict , section , parameter , value )
603617 settings = _dict_to_fabric_settings (setting_dict )
604618 patch_request = ClusterUpdateParameters (fabric_settings = settings )
605- return client .update (resource_group_name , cluster_name , patch_request )
619+ update_cluster_poll = client .begin_update (resource_group_name , cluster_name , patch_request )
620+ return LongRunningOperation (cli_ctx )(update_cluster_poll )
606621
607622
608- def remove_cluster_setting (client ,
623+ def remove_cluster_setting (cmd ,
624+ client ,
609625 resource_group_name ,
610626 cluster_name ,
611627 section = None ,
612628 parameter = None ,
613629 settings_section_description = None ):
630+ cli_ctx = cmd .cli_ctx
631+
614632 def _remove (setting_dict , section , parameter ):
615633 if section not in setting_dict :
616634 raise CLIError (
@@ -637,7 +655,8 @@ def _remove(setting_dict, section, parameter):
637655
638656 settings = _dict_to_fabric_settings (setting_dict )
639657 patch_request = ClusterUpdateParameters (fabric_settings = settings )
640- return client .update (resource_group_name , cluster_name , patch_request )
658+ update_cluster_poll = client .begin_update (resource_group_name , cluster_name , patch_request )
659+ return LongRunningOperation (cli_ctx )(update_cluster_poll )
641660
642661
643662def update_cluster_reliability_level (cmd ,
@@ -671,7 +690,8 @@ def update_cluster_reliability_level(cmd,
671690 node_type .vm_instance_count = vmss .sku .capacity
672691 patch_request = ClusterUpdateParameters (
673692 node_types = cluster .node_types , reliability_level = reliability_level )
674- return client .update (resource_group_name , cluster_name , patch_request )
693+ update_cluster_poll = client .begin_update (resource_group_name , cluster_name , patch_request )
694+ return LongRunningOperation (cli_ctx )(update_cluster_poll )
675695
676696
677697def add_cluster_node_type (cmd ,
0 commit comments