vagrant-mutate 0.1.5 → 0.2.0

data/README.md

@@ -4,8 +4,17 @@ Vagrant-mutate is a [vagrant](http://www.vagrantup.com/) plugin to convert vagra
 
 ## Supported Conversions
 
-* Virtualbox to [kvm](https://github.com/adrahon/vagrant-kvm) (tested against 0.1.4)
-* Virtualbox to [libvirt](https://github.com/pradels/vagrant-libvirt) (tested against 0.0.11)
+* Virtualbox to kvm
+* Virtualbox to libvirt
+* Libvirt to kvm
+
+## Compatibility
+
+Vagrant-mutate has been tested against the following versions. It may work with other versions too.
+
+* vagrant 1.3.5
+* [vagrant-kvm](https://github.com/adrahon/vagrant-kvm) 0.1.4
+* [vagrant-libvirt](https://github.com/pradels/vagrant-libvirt) 0.0.11
 
 ## Installation
 
@@ -51,10 +60,17 @@ Or if you had already downloaded it
 
     vagrant mutate precise32.box libvirt
 
-Or if you had already added the virtualbox version of the box to vagrant and now want to use it with libvirt
+Or if you had already added the box to vagrant and now want to use it with libvirt
 
     vagrant mutate precise32 libvirt
 
+If you have a box for multiple providers, you must specify the provider to use for input by prepending it to the name with a slash, e.g.
+
+    $ vagrant box list
+    precise32  (kvm)
+    precise32  (virtualbox)
+    $ vagrant mutate virtualbox/precise32 libvirt
+
 To export a box you created with vagrant mutate, just repackage it, e.g.
 
     vagrant box repackage precise32 libvirt

data/lib/vagrant-mutate/box/kvm.rb

@@ -7,9 +7,9 @@ module VagrantMutate
       def initialize(env, name, dir)
         super
         @provider_name    = 'kvm'
-        @supported_input  = false,
-        @supported_output = true,
-        @image_format     = 'qcow2',
+        @supported_input  = false
+        @supported_output = true
+        @image_format     = 'qcow2'
         @image_name       = 'box-disk1.img'
       end
 

data/lib/vagrant-mutate/box/libvirt.rb

@@ -7,12 +7,37 @@ module VagrantMutate
       def initialize(env, name, dir)
         super
         @provider_name    = 'libvirt'
-        @supported_input  = false,
-        @supported_output = true,
-        @image_format     = 'qcow2',
+        @supported_input  = true
+        @supported_output = true
+        @image_format     = 'qcow2'
         @image_name       = 'box.img'
       end
 
+      # since none of below can be determined from the box
+      # we just generate sane values
+
+      def architecture
+        return 'x86_64'
+      end
+
+      # kvm prefix is 52:54:00
+      def mac_address
+        octets = 3.times.map { rand(255).to_s(16) }
+        return "52:54:00:#{octets[0]}:#{octets[1]}:#{octets[2]}"
+      end
+
+      def cpus
+        return 1
+      end
+
+      def memory
+        return 536870912
+      end
+
+      def disk_interface
+        return 'virtio'
+      end
+
     end
   end
 end

data/lib/vagrant-mutate/box/virtualbox.rb

@@ -8,9 +8,9 @@ module VagrantMutate
       def initialize(env, name, dir)
         super
         @provider_name     = 'virtualbox'
-        @supported_input  = true,
-        @supported_output = false,
-        @image_format     = 'vmdk',
+        @supported_input  = true
+        @supported_output = false
+        @image_format     = 'vmdk'
         @image_name       = 'box-disk1.vmdk'
       end
 

data/lib/vagrant-mutate/box_loader.rb

@@ -48,13 +48,13 @@ module VagrantMutate
       elsif box_arg =~ /\.box$/
         box = load_from_file(box_arg)
       else
-        box = load_by_name(box_arg)
+        box = load_from_boxes_path(box_arg)
       end
 
       if box.supported_input
         return box
       else
-        raise Errors::ProviderNotSupported, :provider => provider_name, :direction => 'input'
+        raise Errors::ProviderNotSupported, :provider => box.provider_name, :direction => 'input'
       end
     end
 
@@ -105,11 +105,15 @@ module VagrantMutate
       box = create_box(provider_name, name, dir)
     end
 
-    def load_by_name(name)
-      @logger.info "Loading box from name #{name}"
-      dir = find_input_dir(name)
-      # cheat for now since only supported input is virtualbox
-      box = create_box('virtualbox', name, dir)
+    def load_from_boxes_path(identifier)
+      @logger.info "Loading box #{identifier} from vagrants box path"
+      provider_name, name = parse_identifier(identifier)
+      if provider_name
+        dir = verify_input_dir(provider_name, name)
+      else
+        provider_name, dir = find_input_dir(name)
+      end
+      box = create_box(provider_name, name, dir)
     end
 
     def cleanup
@@ -140,14 +144,46 @@ module VagrantMutate
       end
     end
 
+    def parse_identifier(identifier)
+      if identifier =~ /^([\w-]+)#{File::SEPARATOR}([\w-]+)$/
+        @logger.info "Parsed provider name as #{$1} and box name as #{$2}"
+        return $1, $2
+      else
+        @logger.info "Parsed provider name as not given and box name as #{identifier}"
+        return nil, identifier
+      end
+    end
+
     def find_input_dir(name)
-      # cheat for now since only supported input is virtualbox
-      in_dir = File.join( @env.boxes_path, name, 'virtualbox' )
-      if File.directory?(in_dir)
-        @logger.info "Found input directory #{in_dir}"
-        return in_dir
+      box_parent_dir = File.join( @env.boxes_path, name)
+
+      if Dir.exist?(box_parent_dir)
+        providers = Dir.entries(box_parent_dir).reject { |entry| entry =~ /^\./ }
+        @logger.info "Found potential providers #{providers}"
+      else
+        providers = []
+      end
+
+      case
+      when providers.length < 1
+        raise Errors::BoxNotFound, :box => name
+      when providers.length > 1
+        raise Errors::TooManyBoxesFound, :box => name
+      else
+        provider_name = providers.first
+        input_dir = File.join( box_parent_dir, provider_name)
+        @logger.info "Found source for box #{name} from provider #{provider_name} at #{input_dir}"
+        return provider_name, input_dir
+      end
+    end
+
+    def verify_input_dir(provider_name, name)
+      input_dir = File.join( @env.boxes_path, name, provider_name)
+      if File.directory?(input_dir)
+        @logger.info "Found input directory #{input_dir}"
+        return input_dir
       else
-        raise Errors::BoxNotFound, :box => in_dir
+        raise Errors::BoxNotFound, :box => input_dir
       end
     end
 

data/lib/vagrant-mutate/converter/converter.rb

@@ -27,6 +27,10 @@ module VagrantMutate
       end
 
       def convert()
+        if @input_box.provider_name == @output_box.provider_name
+          raise Errors::ProvidersMatch
+        end
+
         @env.ui.info "Converting #{@input_box.name} from #{@input_box.provider_name} "\
           "to #{@output_box.provider_name}."
 

data/lib/vagrant-mutate/errors.rb

@@ -6,6 +6,10 @@ module VagrantMutate
       error_namespace('vagrant_mutate.errors')
     end
 
+    class ProvidersMatch < VagrantMutateError
+      error_key(:providers_match)
+    end
+
     class ProviderNotSupported < VagrantMutateError
       error_key(:provider_not_supported)
     end
@@ -18,6 +22,10 @@ module VagrantMutate
       error_key(:box_not_found)
     end
 
+    class TooManyBoxesFound < VagrantMutateError
+      error_key(:too_many_boxes_found)
+    end
+
     class ExtractBoxFailed < VagrantMutateError
       error_key(:extract_box_failed)
     end

data/lib/vagrant-mutate/mutate.rb

@@ -20,7 +20,6 @@ module VagrantMutate
       box_arg = argv[0]
       output_provider_arg = argv[1]
 
-
       input_loader  = BoxLoader.new(@env)
       input_box = input_loader.load(box_arg)
 

data/lib/vagrant-mutate/version.rb

@@ -1,3 +1,3 @@
 module VagrantMutate
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

data/locales/en.yml

@@ -1,12 +1,16 @@
 en:
   vagrant_mutate:
     errors:
+      providers_match: |-
+        Input and output provider are the same. Aborting.
       provider_not_supported: |-
         Vagrant-mutate does not support %{provider} for %{direction}
       qemu_not_found: |-
         Qemu-img was not found in your path
       box_not_found: |-
-        The box at %{box} was not found
+        The box %{box} was not found
+      too_many_boxes_found: |-
+        More than one box named %{box} was found. Please specify the input provider as well.
       extract_box_failed: |-
         Extracting box failed with error:
         %{error_message}

data/test/expected_output/libvirt/kvm/Vagrantfile

@@ -0,0 +1,11 @@
+Vagrant::Config.run do |config|
+  # This Vagrantfile is auto-generated by `vagrant package` to contain
+  # the MAC address of the box. Custom configuration should be placed in
+  # the actual `Vagrantfile` in this box.
+  config.vm.base_mac = "08002755B88D"
+end
+
+# Load include vagrant file if it exists after the auto-generated
+# so it can override any of the settings
+include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
+load include_vagrantfile if File.exist?(include_vagrantfile)

data/test/expected_output/libvirt/kvm/box.xml

@@ -0,0 +1,62 @@
+<domain type='kvm'>
+<name>mutate-test</name>
+
+<memory unit='KiB'>524288</memory>
+<currentMemory unit='KiB'>524288</currentMemory>
+<vcpu placement='static'>1</vcpu>
+  <os>
+  <type arch='x86_64' machine='pc-1.2'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='qcow2'/>
+      <source file='box-disk1.img'/>
+      <target dev='vda' bus='virtio'/>
+  
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
+    </disk>
+  
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='virtio-serial' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
+    </controller>
+    <interface type='network'>
+      <mac address='52:54:00:cb:b2:80'/>
+      <source network='vagrant'/>
+      <model type='virtio'/>
+    </interface>
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <input type='mouse' bus='ps2'/>
+    <sound model='ich6'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
+    </sound>
+    
+    <graphics type='vnc' port='-1' autoport='yes'/>
+    
+    <video>
+      <model type='cirrus' vram='9216' heads='1'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </video>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
+    </memballoon>
+  </devices>
+</domain>

data/test/expected_output/libvirt/kvm/metadata.json

@@ -0,0 +1 @@
+{"provider":"kvm"}

data/test/test.rb

@@ -29,6 +29,21 @@ def install_plugin
   Dir.chdir working_dir
 end
 
+# convering libvirt to kvm has some random output which we must replace
+# with the static "random" value in the sampe output we are comapring against
+def derandomize_output(input, output_dir)
+  if input == 'libvirt'
+    if File.split(output_dir).last == 'kvm'
+      path = File.join(output_dir, 'box.xml')
+      contents = File.read(path)
+      contents.gsub!(/52:54:00:[0-9a-f:]+/, '52:54:00:cb:b2:80')
+      File.open(path, 'w') do |f|
+        f.write(contents)
+      end
+    end
+  end
+end
+
 def test(input, outputs)
   failures = []
   test_dir = File.expand_path( File.dirname(__FILE__) ) 
@@ -45,13 +60,14 @@ def test(input, outputs)
     system("vagrant mutate #{input_box} #{output}")
     output_dir = File.join(vagrant_dir, 'boxes', 'mutate-test', output)
     expected_output_dir = File.join(test_dir, 'expected_output', input, output)
+    derandomize_output(input, output_dir)
     Dir.foreach(expected_output_dir) do |f|
       next if f == '.' or f == '..'
       output = File.join(output_dir, f)
       expected_output = File.join(expected_output_dir, f)
       test_passed = FileUtils.compare_file(output, expected_output)
       unless test_passed
-        failures.push "#{output} does not match #{expected_output}"
+        failures.push "These two files do not match #{output} #{expected_output}"
       end
     end
   end
@@ -62,6 +78,7 @@ end
 cleanup
 build_plugin
 failures = test( 'virtualbox', ['kvm', 'libvirt'] )
+failures += test( 'libvirt', ['kvm'] )
 
 unless failures.empty?
   puts "\nTESTS FAILED"

data/vagrant-mutate.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "archive-tar-minitar", "~> 0.5.0"
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mutate
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: archive-tar-minitar
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +70,10 @@ files:
 - lib/vagrant-mutate/version.rb
 - locales/en.yml
 - templates/kvm/box.xml.erb
+- test/expected_output/libvirt/kvm/Vagrantfile
+- test/expected_output/libvirt/kvm/box-disk1.img
+- test/expected_output/libvirt/kvm/box.xml
+- test/expected_output/libvirt/kvm/metadata.json
 - test/expected_output/virtualbox/kvm/Vagrantfile
 - test/expected_output/virtualbox/kvm/box-disk1.img
 - test/expected_output/virtualbox/kvm/box.xml
@@ -124,6 +112,10 @@ signing_key:
 specification_version: 3
 summary: Convert vagrant boxes to work with different providers
 test_files:
+- test/expected_output/libvirt/kvm/Vagrantfile
+- test/expected_output/libvirt/kvm/box-disk1.img
+- test/expected_output/libvirt/kvm/box.xml
+- test/expected_output/libvirt/kvm/metadata.json
 - test/expected_output/virtualbox/kvm/Vagrantfile
 - test/expected_output/virtualbox/kvm/box-disk1.img
 - test/expected_output/virtualbox/kvm/box.xml