beaker-vagrant 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f1e22708ae31e2018dee7e71a8573facc743cd5
-  data.tar.gz: 475016e76a1aa61c1097f5f9e5de05c122f81fcf
+  metadata.gz: 442e5662e70ec7b271fe5bc069c9b21f302db394
+  data.tar.gz: 4ea668eb97e1fb2cea88cff369b01cff7b490973
 SHA512:
-  metadata.gz: 33b6773262aa3804cdc8702626ee82f697149b4cbd17831bde771d32a47f008db4e8aba8bbde126d429ccf3dd798212d02b84fca686655fecd22378ff93e74c7
-  data.tar.gz: f19f9d8d62904115723704c993539252d1203eaed36010f2351d15d39a9572dc3bf40a1e9ca9aeee6d6500510906a0217c1ad443cd21e2219d5ba63abe18eb0a
+  metadata.gz: 0d213b0730388cadf6e92389468f3b5613aa7562b4a484865339f410e695b7085852c2640858667954ba40cb781407c6d28606131eff2b6dbd55c160e9e2aa97
+  data.tar.gz: 8d98786ed2aae6b82002567fab605e1ceb9ad28cff7dcbde1b9c0c59c6b1a95b67f30c5ff5e6669115218b6b4e0cc425e759708af98c21366bcbb56889ae5a9b

data/docs/vagrant.md

@@ -160,7 +160,7 @@ In the above, beaker will forward port 10080 and 8080 on the Host to port 80 and
 
 ### Volumes Support
 
-When using the Vagrant Hypervisor, beaker can create attached volumes which appear as extra disks on the guest. The size of the volume should be specified in megabytes.
+When using the Vagrant Hypervisor, beaker can create attached volumes which appear as extra disks on the guest. The size of the volume should be specified in megabytes. You can override the type of storage controller used to attach the disk by specifying `volume_storage_controller` with values of `AHCI`, `LSILogic`, `USB`, or `PIIX4`.
 
 **Example hosts file**
 
@@ -178,6 +178,7 @@ When using the Vagrant Hypervisor, beaker can create attached volumes which appe
         volumes:
           second_disk:
             size: 5120
+        volume_storage_controller: USB
 
 # vagrant plugins #
 

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -1,6 +1,14 @@
 require 'beaker/hypervisor/vagrant'
 
 class Beaker::VagrantVirtualbox < Beaker::Vagrant
+
+  CONTROLLER_OPTIONS = {
+    LSILogic: [ '--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off' ],
+    IntelAHCI: [ '--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off' ],
+    PIIX4: [ '--add', 'ide', '--portcount', '2', '--controller', 'PIIX4', '--bootable', 'off' ],
+    USB: [ '--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off' ]
+  }.freeze
+
   def provision(provider = 'virtualbox')
     super
   end
@@ -23,20 +31,21 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
     provider_section << "      vb.vbguest.auto_update = false" if options[:vbguest_plugin] == 'disable'
 
     # Guest volume support
-    # - Creates a new AHCI controller with the requisite number of ports,
-    #   the default controller is limited in its number of supported ports (2).
-    #   The AHCI emulation is generic enough for acceptance testing, and
-    #   presents the devices as SCSI devices in /sys/class/scsi_disk.
+    # - Creates a new controller (AHCI by default)
     # - Creates the defined volumes in beaker's temporary folder and attaches
     #   them to the controller in order starting at port 0.  This presents disks
     #   as 2:0:0:0, 3:0:0:0 ... much like you'd see on commercial storage boxes
     if host['volumes']
+      controller = host['volume_storage_controller'].nil? ? 'IntelAHCI' : host['volume_storage_controller']
+      unless CONTROLLER_OPTIONS.keys.include? controller.to_sym
+        raise "Unknown controller type #{controller}"
+      end
+      if controller == 'USB'
+        provider_section << self.vb_customize_vm('modifyvm', [ '--usb', 'on' ])
+      end
       provider_section << self.vb_customize_vm('storagectl', [
-        '--name', 'SATA Controller',
-        '--add', 'sata',
-        '--controller', 'IntelAHCI',
-        '--portcount', host['volumes'].length
-      ])
+        '--name', "Beaker #{controller} Controller" ] + CONTROLLER_OPTIONS[controller.to_sym]
+      )
       host['volumes'].keys.each_with_index do |volume, index|
         volume_path = "#{host.name}-#{volume}.vdi"
         provider_section << self.vb_customize('createhd', [
@@ -44,7 +53,7 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
           '--size', host['volumes'][volume]['size'],
         ])
         provider_section << self.vb_customize_vm('storageattach', [
-          '--storagectl', 'SATA Controller',
+          '--storagectl', "Beaker #{controller} Controller",
           '--port', index,
           '--device', 0,
           '--type', 'hdd',

data/spec/beaker/hypervisor/vagrant_virtualbox_spec.rb

@@ -51,4 +51,37 @@ describe Beaker::VagrantVirtualbox do
     expect( vagrantfile ).to include( %Q{ vb.customize ["modifyvm", :id, "--ioapic", "on"]})
   end
 
+  it "correctly provisions storage with the USB controller" do
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    hosts = make_hosts({:volumes => { 'test_disk' => { size: '5120' }}, :volume_storage_controller => 'USB' })
+
+    vagrant.make_vfile( hosts )
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include(%Q{ vb.customize ['modifyvm', :id, '--usb', 'on']})
+    expect( vagrantfile ).to include(%Q{ vb.customize ['storagectl', :id, '--name', 'Beaker USB Controller', '--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off']})
+    expect( vagrantfile ).to include(%Q{ vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']})
+    expect( vagrantfile ).to include(%Q{ vb.customize ['storageattach', :id, '--storagectl', 'Beaker USB Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']})
+  end
+
+  it "correctly provisions storage with the LSILogic controller" do
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    hosts = make_hosts({:volumes => { 'test_disk' => { size: '5120' }}, :volume_storage_controller => 'LSILogic' })
+
+    vagrant.make_vfile( hosts )
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include(%Q{ vb.customize ['storagectl', :id, '--name', 'Beaker LSILogic Controller', '--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off']})
+    expect( vagrantfile ).to include(%Q{ vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']})
+    expect( vagrantfile ).to include(%Q{ vb.customize ['storageattach', :id, '--storagectl', 'Beaker LSILogic Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']})
+  end
+
+  it "correctly provisions storage with the default controller" do
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    hosts = make_hosts({:volumes => { 'test_disk' => { size: '5120' }}})
+
+    vagrant.make_vfile( hosts )
+    vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
+    expect( vagrantfile ).to include(%Q{ vb.customize ['storagectl', :id, '--name', 'Beaker IntelAHCI Controller', '--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off']})
+    expect( vagrantfile ).to include(%Q{ vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']})
+    expect( vagrantfile ).to include(%Q{ vb.customize ['storageattach', :id, '--storagectl', 'Beaker IntelAHCI Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec