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.

Sign up for GitHub

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

Jump to bottom

Smart state Snapshot Managed Disk Name 80 Char Limit #157

Merged
merged 1 commit into from
Nov 3, 2017
Merged

Smart state Snapshot Managed Disk Name 80 Char Limit #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions app/models/manageiq/providers/azure/cloud_manager/vm_or_template_shared.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module ManageIQ::Providers::Azure::CloudManager::VmOrTemplateShared
extend ActiveSupport::Concern
include_concern 'Scanning'
SSA_SNAPSHOT_SUFFIX = "__EVM__SSA__SNAPSHOT".freeze
SSA_SNAPSHOT_SUFFIX = "_SSA_SNAPSHOT".freeze
SSA_NAME_MAX = 80

def provider_service(connection = nil)
@connection ||= connection || ext_management_system.connect
Expand Down Expand Up @@ -76,7 +77,12 @@ def managed_image_disk_name
end

def ssa_snap_name
@ssa_snap_name ||= "#{os_disk.name}#{SSA_SNAPSHOT_SUFFIX}"
@ssa_snap_name ||= if "#{name}#{SSA_SNAPSHOT_SUFFIX}".size > SSA_NAME_MAX
name_end = SSA_NAME_MAX - SSA_SNAPSHOT_SUFFIX.size - 1
"#{name[0..name_end]}#{SSA_SNAPSHOT_SUFFIX}"
else
"#{name}#{SSA_SNAPSHOT_SUFFIX}"
end
end

def blob_uri
Expand Down
2 changes: 1 addition & 1 deletion app/models/manageiq/providers/azure/cloud_manager/vm_or_template_shared/scanning.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def perform_metadata_scan(ost)
end
else
vm_args[:resource_group] = resource_group
vm_args[:snapshot] = ost.scanData["snapshot"]["name"] unless managed_disk?
vm_args[:snapshot] = ost.scanData["snapshot"]["name"]
end

ost.scanTime = Time.now.utc unless ost.scanTime
Expand Down