Attachment 1484096 Details for Bug 1551014 – vmware-patch

[patch] vmware-patch

5577.patch (text/plain), 2.12 KB, created by Chris Roberts on 2018-09-17 16:01:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Roberts

Created: 2018-09-17 16:01:51 UTC

Size: 2.12 KB

patch

obsolete

>From 0998d28fb86e010f312003c8a32c0359bee43f4c Mon Sep 17 00:00:00 2001
>From: Steve Miller <steven.miller@bluemedora.com>
>Date: Thu, 17 May 2018 08:45:38 -0400
>Subject: [PATCH 1/2] Fixes #19990 - Skip assignment if size_gb not passed
>
>---
> app/models/compute_resources/foreman/model/vmware.rb | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/app/models/compute_resources/foreman/model/vmware.rb b/app/models/compute_resources/foreman/model/vmware.rb
>index 007cd44086..ce68ea3b56 100644
>--- a/app/models/compute_resources/foreman/model/vmware.rb
>+++ b/app/models/compute_resources/foreman/model/vmware.rb
>@@ -461,7 +461,9 @@ def save_vm(uuid, attr)
>       if attr.has_key?(:volumes_attributes)
>         vm.volumes.each do |vm_volume|
>           volume_attrs = attr[:volumes_attributes].values.detect {|vol| vol[:id] == vm_volume.id}
>-          vm_volume.size_gb = volume_attrs[:size_gb]
>+          if @volume_attrs.class == Hash && volume_attrs.key?(:size_gb)
>+            vm_volume.size_gb = volume_attrs[:size_gb]
>+          end
>         end
>       end
>       vm.save
>
>From b95bd8807dd300d4ef4c27206392a985e8c2498f Mon Sep 17 00:00:00 2001
>From: Steve Miller <steven.miller@bluemedora.com>
>Date: Wed, 30 May 2018 13:26:15 -0400
>Subject: [PATCH 2/2] Fixes #19990 - Bug fix on size_gb key test statement
>
>---
> app/models/compute_resources/foreman/model/vmware.rb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/app/models/compute_resources/foreman/model/vmware.rb b/app/models/compute_resources/foreman/model/vmware.rb
>index ce68ea3b56..3826abecad 100644
>--- a/app/models/compute_resources/foreman/model/vmware.rb
>+++ b/app/models/compute_resources/foreman/model/vmware.rb
>@@ -461,7 +461,7 @@ def save_vm(uuid, attr)
>       if attr.has_key?(:volumes_attributes)
>         vm.volumes.each do |vm_volume|
>           volume_attrs = attr[:volumes_attributes].values.detect {|vol| vol[:id] == vm_volume.id}
>-          if @volume_attrs.class == Hash && volume_attrs.key?(:size_gb)
>+          if volume_attrs.class == Hash && volume_attrs.key?(:size_gb)
>             vm_volume.size_gb = volume_attrs[:size_gb]
>           end
>         end

Actions: View | Diff

Attachments on bug 1551014: 1473706 | 1484096