Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Service Fabric] add sf cluster update command #4328 #29908

Open
wants to merge 23 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
add old commands back
  • Loading branch information
mwesigwaguma committed Sep 24, 2024
commit 60daf1262aa0dcd5469f0ef122d2b1b5333c501c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def load_arguments(self, _): # pylint: disable=too-many-statements
with self.argument_context('sf cluster client-certificate remove') as c:
c.argument('thumbprints', nargs='+', help='A single or Space-separated list of client certificate thumbprint(s) to be remove.')

with self.argument_context('sf cluster') as c:
with self.argument_context('sf cluster') as c:
c.argument('durability_level', arg_type=get_enum_type(['Bronze', 'Silver', 'Gold']), help='durability level.')

with self.argument_context('sf cluster setting') as c:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,14 @@ def load_command_table(self, _):
g.custom_command('client-certificate add', 'add_client_cert')
g.custom_command('client-certificate remove', 'remove_client_cert')
g.custom_command('update', 'update_cluster')
g.custom_command('setting set', 'set_cluster_setting')
g.custom_command('setting remove', 'remove_cluster_setting')
g.custom_command('reliability update', 'update_cluster_reliability_level')
g.custom_command('durability update', 'update_cluster_durability')
g.custom_command('node-type add', 'add_cluster_node_type')
g.custom_command('node add', 'add_cluster_node')
g.custom_command('node remove', 'remove_cluster_node')
g.custom_command('upgrade-type set', 'update_cluster_upgrade_type')

with self.command_group('sf application certificate') as g:
g.custom_command('add', 'add_app_cert')
Expand Down
38 changes: 34 additions & 4 deletions src/azure-cli/azure/cli/command_modules/servicefabric/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -578,14 +578,20 @@ def set_cluster_setting(cmd,
cluster_name,
section=None,
parameter=None,
value=None):
value=None,
settings_section_description=None):

cli_ctx = cmd.cli_ctx

def _set(setting_dict, section, parameter, value):
if section not in setting_dict:
setting_dict[section] = {}
setting_dict[section][parameter] = value
return setting_dict

if settings_section_description and (section or parameter or value):
raise CLIError(
'Only can use either \'--settings-section-description\' or \'--section\', \'--parameter\' and \'--value\' to set the settings')

if section or parameter or value:
if section is None or parameter is None or value is None:
Expand All @@ -594,7 +600,17 @@ def _set(setting_dict, section, parameter, value):

cluster = client.get(resource_group_name, cluster_name)
setting_dict = _fabric_settings_to_dict(cluster.fabric_settings)
setting_dict = _set(setting_dict, section, parameter, value)

if settings_section_description:
for setting in settings_section_description:
if 'section' in setting and 'parameter' in setting and 'value' in setting:
setting_dict = _set(setting_dict, setting['section'],
setting['parameter'], setting['value'])
else:
raise CLIError('settings_section_description is invalid')
else:
setting_dict = _set(setting_dict, section, parameter, value)

settings = _dict_to_fabric_settings(setting_dict)
patch_request = ClusterUpdateParameters(fabric_settings=settings)
update_cluster_poll = client.begin_update(resource_group_name, cluster_name, patch_request)
Expand All @@ -606,7 +622,8 @@ def remove_cluster_setting(cmd,
resource_group_name,
cluster_name,
section=None,
parameter=None):
parameter=None,
settings_section_description=None):
cli_ctx = cmd.cli_ctx

def _remove(setting_dict, section, parameter):
Expand All @@ -619,9 +636,22 @@ def _remove(setting_dict, section, parameter):
del setting_dict[section][parameter]
return setting_dict

if settings_section_description and (section or parameter):
raise CLIError(
'Only can use either \'--settings-section-description\' or \'--section\' and \'--parameter \' to set the settings')

cluster = client.get(resource_group_name, cluster_name)
setting_dict = _fabric_settings_to_dict(cluster.fabric_settings)
setting_dict = _remove(setting_dict, section, parameter)

if settings_section_description:
for setting in settings_section_description:
if 'section' in setting and 'parameter' in setting:
setting_dict = _remove(setting_dict, setting['section'], setting['parameter'])
else:
raise CLIError('settings_section_description is invalid')
else:
setting_dict = _remove(setting_dict, section, parameter)

settings = _dict_to_fabric_settings(setting_dict)
patch_request = ClusterUpdateParameters(fabric_settings=settings)
update_cluster_poll = client.begin_update(resource_group_name, cluster_name, patch_request)
Expand Down
Loading