Merge pull request #13913 from masayag/disks_should_be_added_as_activ…

…e_in_rhv Disks should be added as 'active' in RHV
ManageIQ · Feb 14, 2017 · a094a95 · a094a95
2 parents bdb2456 + 8fdeaad
commit a094a95
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/models/manageiq/providers/redhat/infra_manager/disk_attachment_builder.rb b/app/models/manageiq/providers/redhat/infra_manager/disk_attachment_builder.rb
@@ -5,7 +5,6 @@ def initialize(options = {})
     @name = options[:name]
     @thin_provisioned = BooleanParameter.new(options[:thin_provisioned])
     @bootable = BooleanParameter.new(options[:bootable])
-    @active = options[:active]
     @interface = options[:interface]
   end
 
@@ -14,7 +13,7 @@ def disk_attachment
     {
       :bootable  => @bootable.true?,
       :interface => @interface || "VIRTIO",
-      :active    => @active,
+      :active    => true,
       :disk      => {
         :name             => @name,
         :provisioned_size => @size_in_mb.to_i.megabytes,

diff --git a/spec/models/manageiq/providers/redhat/infra_manager/disk_attachment_builder_spec.rb b/spec/models/manageiq/providers/redhat/infra_manager/disk_attachment_builder_spec.rb
@@ -36,11 +36,11 @@
 
     it "creates disk attachment" do
       builder = described_class.new(:size_in_mb => 10, :storage => storage, :name => "disk-1",
-                                    :thin_provisioned => true, :bootable => true, :active => false, :interface => "IDE")
+                                    :thin_provisioned => true, :bootable => true, :interface => "IDE")
       expected_disk_attachment = {
         :bootable  => true,
         :interface => "IDE",
-        :active    => false,
+        :active    => true,
         :disk      => {
           :name             => "disk-1",
           :provisioned_size => 10 * 1024 * 1024,

diff --git a/spec/models/manageiq/providers/redhat/infra_manager/provision/disk_spec.rb b/spec/models/manageiq/providers/redhat/infra_manager/provision/disk_spec.rb
@@ -33,7 +33,7 @@
       {
         :bootable  => false,
         :interface => "VIRTIO",
-        :active    => nil,
+        :active    => true,
         :disk      => {
           :name             => nil,
           :provisioned_size => 0,