vagrant-kvm 0.1.4 → 0.1.5

data/spec/vagrant-kvm/util/vm_definition_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe VagrantPlugins::ProviderKvm::Util::VmDefinition do
+  let(:definition) { described_class.new(File.read(path)) }
+  subject { definition }
+
+  context "with an simple definition" do
+    let(:path) { test_file("box.xml") }
+
+    describe "#as_xml" do
+      subject { definition.as_xml }
+
+      it "sets the CPU count properly" do
+        subject.should include("<vcpu placement='static'>1</vcpu>")
+      end
+
+      it "sets the VNC port and autoport" do
+        definition.update gui: true,
+          vnc_port: 1234,
+          vnc_autoport: false,
+          vnc_password: 'abc123'
+
+        subject.should include("<graphics type='vnc' port='1234' autoport='false'")
+
+        new_definition = VagrantPlugins::ProviderKvm::Util::VmDefinition.new(subject)
+        new_definition.get(:gui).should be_true
+        new_definition.get(:vnc_port).should == 1234
+        new_definition.get(:vnc_autoport).should be_false
+        new_definition.get(:vnc_password).should == 'abc123'
+      end
+
+      it "should set and load the GUI settings" do
+        should_set(:gui, true) do |xml|
+          xml.should include("<graphics type='vnc'")
+        end
+      end
+
+      it "sets machine type" do
+        should_default(:machine_type, "pc-1.2")
+        should_set(:machine_type, "pc-i440fx-1.4")
+      end
+
+      it "sets the network driver type" do
+        should_default(:network_model, "virtio")
+        should_set(:network_model, "ne2k_pci")
+      end
+
+      it "doesn't set the network driver if network_mode=:default" do
+        should_set(:network_model, :default) do |xml|
+          doc = REXML::Document.new(xml)
+          doc.elements["//devices/interface/model"].should be_nil
+        end
+      end
+
+      it "sets the video type" do
+        should_default(:video_model, "cirrus")
+        should_set(:video_model, "vga")
+      end
+    end
+  end
+
+  private
+  def should_set(key, value)
+    definition.update(key => value)
+    definition.get(key).should == value
+    yield subject if block_given?
+
+    # Validates that it's symetrical
+    new_definition = described_class.new(subject)
+    new_definition.get(key).should == value
+  end
+
+  def should_default(key, value)
+    definition.get(key).should == value
+  end
+end

data/templates/libvirt_domain.erb

@@ -1,13 +1,13 @@
 <domain type='kvm'>
-<name><%= name %></name>
-<% if uuid %>
-<uuid><%= uuid %></uuid>
-<% end %>
-<memory unit='KiB'><%= memory %></memory>
-<currentMemory unit='KiB'><%= memory%></currentMemory>
-<vcpu placement='static'><%= cpus %></vcpu>
+  <name><%= name %></name>
+  <% if uuid %>
+  <uuid><%= uuid %></uuid>
+  <% end %>
+  <memory unit='<%= memory_unit %>'><%= memory_size %></memory>
+  <currentMemory unit='<%= memory_unit %>'><%= memory_size %></currentMemory>
+  <vcpu placement='static'><%= cpus %></vcpu>
   <os>
-  <type arch='<%= arch %>' machine='pc-1.2'>hvm</type>
+    <type arch='<%= arch %>' machine='<%= machine_type %>'>hvm</type>
     <boot dev='hd'/>
   </os>
   <features>
@@ -24,19 +24,38 @@
     <disk type='file' device='disk'>
       <driver name='qemu' type='<%= image_type %>'/>
       <source file='<%= disk %>'/>
-      <target dev='vda' bus='virtio'/>
+      <target dev='vda' bus='<%= disk_bus %>'/>
+  <% if disk_bus == 'virtio' %>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
+  <% else %>
+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+  <% end %>
     </disk>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
     <controller type='usb' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
+  <% if disk_bus == 'sata' %>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
+    </controller>
+  <% end %>
+  <% if disk_bus == 'scsi' %>
+    <controller type='scsi' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
+    </controller>
+  <% end %>
     <controller type='virtio-serial' index='0'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </controller>
     <interface type='network'>
       <mac address='<%= mac %>'/>
       <source network='vagrant'/>
-      <model type='virtio'/>
+      <% unless network_model == :default %>
+      <model type='<%= network_model %>'/>
+      <% end %>
     </interface>
     <serial type='pty'>
       <target port='0'/>
@@ -45,14 +64,17 @@
       <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
+    <input type='tablet' bus='usb'/>
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
     <% if gui %>
-    <%= "<graphics type='vnc' port='-1' autoport='yes'/>" %>
+    <graphics type='vnc' port='<%= vnc_port || -1 %>' autoport='<%= vnc_autoport %>' listen='0.0.0.0' passwd='<%= vnc_password %>'>
+      <listen type='address' address='0.0.0.0'/>
+    </graphics>
     <% end %>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='<%= video_model %>' vram='9216' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

data/templates/libvirt_network.erb

@@ -0,0 +1,13 @@
+<network>
+  <name><%= name %></name>
+  <forward mode='<%= forward %>'/>
+  <domain name='<%= domain_name %>'/>
+  <ip address='<%= base_ip %>' netmask='<%= netmask %>'>
+    <dhcp>
+    <range start='<%= range[:start] %>' end='<%= range[:end] %>' />
+    <% for host in hosts %>
+      <host mac='<%= host[:mac] %>' name='<%= host[:name] %>' ip='<%= host[:ip] %>' />
+    <% end %>
+    </dhcp>
+  </ip>
+</network>

data/templates/package_Vagrantfile.erb

@@ -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 = "<%= base_mac %>"
+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/vagrant-kvm.gemspec

@@ -13,9 +13,8 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
 
   s.required_rubygems_version = ">= 1.3.6"
-  s.requirements << 'KVM/QEMU, v1.2.0 or greater'
+  s.requirements << 'KVM/QEMU, v1.1.0 or greater'
 
-  s.add_runtime_dependency "nokogiri", "~> 1.5.6"
   s.add_runtime_dependency "ruby-libvirt", "~> 0.4.0"
 
   s.add_development_dependency "pry"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-kvm
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - Alex Drahon
@@ -10,28 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: ruby-libvirt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,39 +28,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -95,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -103,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -119,7 +91,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -130,21 +101,44 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- INSTALL.md
 - vagrant-kvm.gemspec
+- spec/acceptance/vagrant-kvm_spec.rb
+- spec/test_files/box.xml
+- spec/fedora/50-vagrant-libvirt-access.pkla
+- spec/fedora/10.virt.rules
+- spec/vagrant-kvm/errors_spec.rb
+- spec/vagrant-kvm/util/vm_definition_spec.rb
+- spec/vagrant-kvm/util/network_definition_spec.rb
+- spec/vagrant-kvm/config_spec.rb
+- spec/vagrant-kvm/driver/driver_spec.rb
+- spec/spec_helper.rb
+- spec/support/libvirt_helper.rb
+- spec/support/vagrant_kvm_helper.rb
+- DEVELOPMENT.md
 - Gemfile
+- templates/libvirt_network.erb
+- templates/package_Vagrantfile.erb
 - templates/libvirt_domain.erb
 - example_box/metadata.json
 - example_box/box.xml
 - example_box/README.md
 - CHANGELOG.md
 - locales/en.yml
+- locales/ja.yml
 - lib/vagrant-kvm/version.rb
+- lib/vagrant-kvm/util/disk_info.rb
+- lib/vagrant-kvm/util/commands.rb
+- lib/vagrant-kvm/util/definition_attributes.rb
 - lib/vagrant-kvm/util/kvm_template_renderer.rb
 - lib/vagrant-kvm/util/vm_definition.rb
 - lib/vagrant-kvm/util/network_definition.rb
 - lib/vagrant-kvm/plugin.rb
 - lib/vagrant-kvm/action.rb
+- lib/vagrant-kvm/action/resume_network.rb
+- lib/vagrant-kvm/action/prepare_gui.rb
 - lib/vagrant-kvm/action/package.rb
+- lib/vagrant-kvm/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-kvm/action/match_mac_address.rb
 - lib/vagrant-kvm/action/check_box.rb
 - lib/vagrant-kvm/action/prepare_nfs_settings.rb
@@ -152,9 +146,11 @@ files:
 - lib/vagrant-kvm/action/resume.rb
 - lib/vagrant-kvm/action/forced_halt.rb
 - lib/vagrant-kvm/action/suspend.rb
+- lib/vagrant-kvm/action/clear_forwarded_ports.rb
 - lib/vagrant-kvm/action/check_created.rb
 - lib/vagrant-kvm/action/share_folders.rb
 - lib/vagrant-kvm/action/init_storage_pool.rb
+- lib/vagrant-kvm/action/message_not_running.rb
 - lib/vagrant-kvm/action/is_paused.rb
 - lib/vagrant-kvm/action/prune_nfs_exports.rb
 - lib/vagrant-kvm/action/created.rb
@@ -164,8 +160,10 @@ files:
 - lib/vagrant-kvm/action/destroy.rb
 - lib/vagrant-kvm/action/import.rb
 - lib/vagrant-kvm/action/set_name.rb
+- lib/vagrant-kvm/action/reset_image_permission.rb
 - lib/vagrant-kvm/action/export.rb
 - lib/vagrant-kvm/action/destroy_confirm.rb
+- lib/vagrant-kvm/action/forward_ports.rb
 - lib/vagrant-kvm/action/check_running.rb
 - lib/vagrant-kvm/action/check_kvm.rb
 - lib/vagrant-kvm/action/is_saved.rb
@@ -181,31 +179,32 @@ files:
 - LICENSE
 - Rakefile
 - README.md
+- .travis.yml
+- .rspec
 - .gitignore
 homepage: http://www.vagrantup.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements:
-- KVM/QEMU, v1.2.0 or greater
+- KVM/QEMU, v1.1.0 or greater
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Enables Vagrant to use KVM instead of VirtualBox.
 test_files: []