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

[Compute] az vm available-set create/update: Add support for scheduled event profile #30835

Merged
merged 3 commits into from
Feb 17, 2025
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
6 changes: 6 additions & 0 deletions src/azure-cli/azure/cli/command_modules/vm/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,12 @@ def load_arguments(self, _):
if self.supported_api_version(max_api='2016-04-30-preview', operation_group='virtual_machines'):
c.argument('name', name_arg_type, id_part='name', completer=get_resource_name_completion_list('Microsoft.Compute/availabilitySets'), help='Name of the availability set')
c.argument('availability_set_name', options_list=['--availability-set-name'])

for scope in ['vm availability-set create', 'vm availability-set update']:
with self.argument_context(scope) as c:
c.argument('additional_scheduled_events', options_list=['--additional-scheduled-events', '--additional-events'], arg_type=get_three_state_flag(), min_api='2024-07-01', help='The configuration parameter used while creating event grid and resource graph scheduled event setting.')
c.argument('enable_user_reboot_scheduled_events', options_list=['--enable-user-reboot-scheduled-events', '--enable-reboot'], arg_type=get_three_state_flag(), min_api='2024-07-01', help='The configuration parameter used while publishing scheduled events additional publishing targets.')
c.argument('enable_user_redeploy_scheduled_events', options_list=['--enable-user-redeploy-scheduled-events', '--enable-redeploy'], arg_type=get_three_state_flag(), min_api='2024-07-01', help='The configuration parameter used while creating user initiated redeploy scheduled event setting creation.')
# endregion

# region VirtualMachines
Expand Down
39 changes: 33 additions & 6 deletions src/azure-cli/azure/cli/command_modules/vm/_template_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -1614,30 +1614,57 @@ def build_vmss_resource(cmd, name, computer_name_prefix, location, tags, overpro


def build_av_set_resource(cmd, name, location, tags, platform_update_domain_count,
platform_fault_domain_count, unmanaged, proximity_placement_group=None):
platform_fault_domain_count, unmanaged, proximity_placement_group=None,
additional_scheduled_events=None,
enable_user_reboot_scheduled_events=None,
enable_user_redeploy_scheduled_events=None):
av_set = {
'type': 'Microsoft.Compute/availabilitySets',
'name': name,
'location': location,
'tags': tags,
'apiVersion': cmd.get_api_version(ResourceType.MGMT_COMPUTE, operation_group='availability_sets'),
"properties": {
'platformFaultDomainCount': platform_fault_domain_count,
}
}

if cmd.supported_api_version(min_api='2016-04-30-preview', operation_group='availability_sets'):
av_set['sku'] = {
'name': 'Classic' if unmanaged else 'Aligned'
}

properties = {"platformFaultDomainCount": platform_fault_domain_count}
scheduled_events_policy = {}
if additional_scheduled_events is not None:
scheduled_events_policy.update({
"scheduledEventsAdditionalPublishingTargets": {
"eventGridAndResourceGraph": {
"enable": additional_scheduled_events
}
}
})
if enable_user_redeploy_scheduled_events is not None:
scheduled_events_policy.update({
"userInitiatedRedeploy": {
"automaticallyApprove": enable_user_redeploy_scheduled_events
}
})
if enable_user_reboot_scheduled_events is not None:
scheduled_events_policy.update({
"userInitiatedReboot": {
"automaticallyApprove": enable_user_reboot_scheduled_events
}
})

if scheduled_events_policy:
properties['scheduledEventsPolicy'] = scheduled_events_policy

# server defaults the UD to 5 unless set otherwise
if platform_update_domain_count is not None:
av_set['properties']['platformUpdateDomainCount'] = platform_update_domain_count
properties['platformUpdateDomainCount'] = platform_update_domain_count

if proximity_placement_group:
av_set['properties']['proximityPlacementGroup'] = {'id': proximity_placement_group}
properties['proximityPlacementGroup'] = {'id': proximity_placement_group}

av_set["properties"] = properties
return av_set


Expand Down
41 changes: 37 additions & 4 deletions src/azure-cli/azure/cli/command_modules/vm/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -1809,7 +1809,8 @@ def convert_av_set_to_managed_disk(cmd, resource_group_name, availability_set_na

def create_av_set(cmd, availability_set_name, resource_group_name, platform_fault_domain_count=2,
platform_update_domain_count=None, location=None, proximity_placement_group=None, unmanaged=False,
no_wait=False, tags=None, validate=False):
no_wait=False, tags=None, validate=False, additional_scheduled_events=None,
enable_user_reboot_scheduled_events=None, enable_user_redeploy_scheduled_events=None):
from azure.cli.core.util import random_string
from azure.cli.core.commands.arm import ArmTemplateBuilder
from azure.cli.command_modules.vm._template_builder import build_av_set_resource
Expand All @@ -1822,7 +1823,10 @@ def create_av_set(cmd, availability_set_name, resource_group_name, platform_faul
av_set_resource = build_av_set_resource(cmd, availability_set_name, location, tags,
platform_update_domain_count,
platform_fault_domain_count, unmanaged,
proximity_placement_group=proximity_placement_group)
proximity_placement_group=proximity_placement_group,
additional_scheduled_events=additional_scheduled_events,
enable_user_reboot_scheduled_events=enable_user_reboot_scheduled_events,
enable_user_redeploy_scheduled_events=enable_user_redeploy_scheduled_events)
master_template.add_resource(av_set_resource)

template = master_template.build()
Expand Down Expand Up @@ -1851,9 +1855,38 @@ def create_av_set(cmd, availability_set_name, resource_group_name, platform_faul
return compute_client.availability_sets.get(resource_group_name, availability_set_name)


def update_av_set(instance, resource_group_name, proximity_placement_group=None):
def update_av_set(cmd, instance, resource_group_name, proximity_placement_group=None,
additional_scheduled_events=None, enable_user_reboot_scheduled_events=None,
enable_user_redeploy_scheduled_events=None):
if proximity_placement_group is not None:
instance.proximity_placement_group = {'id': proximity_placement_group}
instance.proximity_placement_group = cmd.get_models('SubResource')(id=proximity_placement_group)

if instance.scheduled_events_policy is None and (
additional_scheduled_events is not None or enable_user_reboot_scheduled_events is not None or
enable_user_redeploy_scheduled_events is not None):
ScheduledEventsPolicy = cmd.get_models('ScheduledEventsPolicy')
instance.scheduled_events_policy = ScheduledEventsPolicy()

if additional_scheduled_events is not None:
ScheduledEventsAdditionalPublishingTargets = cmd.get_models('ScheduledEventsAdditionalPublishingTargets')
EventGridAndResourceGraph = cmd.get_models('EventGridAndResourceGraph')
instance.scheduled_events_policy.scheduled_events_additional_publishing_targets = \
ScheduledEventsAdditionalPublishingTargets(
event_grid_and_resource_graph=EventGridAndResourceGraph(enable=additional_scheduled_events)
)

if enable_user_reboot_scheduled_events is not None:
UserInitiatedReboot = cmd.get_models('UserInitiatedReboot')
instance.scheduled_events_policy.user_initiated_reboot = UserInitiatedReboot(
automatically_approve=enable_user_reboot_scheduled_events
)

if enable_user_redeploy_scheduled_events is not None:
UserInitiatedRedeploy = cmd.get_models('UserInitiatedRedeploy')
instance.scheduled_events_policy.user_initiated_redeploy = UserInitiatedRedeploy(
automatically_approve=enable_user_redeploy_scheduled_events
)

return instance


Expand Down
Loading