vagrant-kvm 0.1.7 → 0.1.8

data/lib/vagrant-kvm/errors.rb

@@ -19,10 +19,6 @@ module VagrantPlugins
         error_key(:kvm_no_qemu_binary)
       end
 
-      class KvmFailImageConversion < VagrantKVMError
-        error_key(:kvm_fail_image_conversion)
-      end
-
       class KvmBadBoxFormat < VagrantKVMError
         error_key(:kvm_bad_box_format)
       end
@@ -30,6 +26,10 @@ module VagrantPlugins
       class KvmFailedCommand < VagrantKVMError
         error_key(:kvm_failed_command)
       end
+
+      class KvmFailStoragePool < VagrantKVMError
+        error_key(:kvm_fail_storagepool)
+      end
     end
   end
 end

data/lib/vagrant-kvm/plugin.rb

@@ -6,8 +6,8 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < "1.1.0"
-  raise "The Vagrant KVM plugin is only compatible with Vagrant 1.1+"
+if Vagrant::VERSION < "1.4.0"
+  raise "The Vagrant KVM plugin is only compatible with Vagrant 1.4+"
 end
 
 module VagrantPlugins
@@ -34,6 +34,16 @@ module VagrantPlugins
         Provider
       end
 
+      guest_capability("linux", "mount_p9_shared_folder") do
+        require_relative "cap/mount_p9"
+        Cap::MountP9
+      end
+
+      synced_folder("p9", 20) do
+        require_relative "synced_folder"
+        SyncedFolder
+      end
+
       # This initializes the internationalization strings.
       def self.setup_i18n
         I18n.load_path << File.expand_path("locales/en.yml", ProviderKvm.source_root)

data/lib/vagrant-kvm/provider.rb

@@ -47,30 +47,13 @@ module VagrantPlugins
         # we return nil.
         return nil if state == :not_created
 
-        #ip_addr = @driver.read_ip(@machine.config.vm.base_mac)
+        ip_addr = @driver.read_machine_ip
         return {
-          :host => read_machine_ip,
+          :host => ip_addr,
           :port => "22" # XXX should be somewhere in default config
         }
       end
 
-      # XXX duplicated from prepare_nfs_settings
-      # Returns the IP address of the guest by looking at the first
-      # enabled host only network.
-      #
-      # @return [String]
-      def read_machine_ip
-        @machine.config.vm.networks.each do |type, options|
-          if type == :private_network && options[:ip].is_a?(String)
-            return options[:ip]
-          end
-        end
-
-        # XXX duplicated with network.rb default
-        # If no private network configuration, return default ip
-        "192.168.123.10"
-      end
-
       # Return the state of the VM
       #
       # @return [Symbol]

data/lib/vagrant-kvm/synced_folder.rb

@@ -0,0 +1,57 @@
+require 'digest/md5'
+
+module VagrantPlugins
+  module ProviderKvm
+    class SyncedFolder < Vagrant.plugin("2", :synced_folder)
+      def usable?(machine)
+        # These synced folders only work if the provider if KVM
+        machine.provider_name == :kvm
+      end
+
+      def prepare(machine, folders, _opts)
+        defs = []
+        folders.each do |id, data|
+          # access_mode can be squash, mapped, or passthrough
+          accessmode = data.has_key?(:access_mode)? data[:access_mode] : 'squash'
+          accessmode = 'squash' unless accessmode == 'mapped' || accessmode == 'passthrough'
+          # tag maximum len is 31
+          tag = Digest::MD5.new.update(id).to_s[0,31]
+          defs << {
+            :mount_tag => tag,
+            :hostpath => data[:hostpath].to_s,
+            :accessmode => accessmode
+          }
+        end
+
+        driver(machine).share_folders(defs)
+      end
+
+      def enable(machine, folders, _opts)
+        # Go through each folder and mount
+        machine.ui.info("mounting p9 share in guest")
+        # Only mount folders that have a guest path specified.
+        mount_folders = {}
+        folders.each do |id, opts|
+          mount_folders[id] = opts.dup if opts[:guestpath]
+        end
+        common_opts = {
+          :version => '9p2000.L',
+        }
+        # Mount the actual folder
+        machine.guest.capability(
+            :mount_p9_shared_folder, mount_folders, common_opts)
+      end
+
+      def cleanup(machine, opts)
+        driver(machine).clear_shared_folders if machine.id && machine.id != ""
+      end
+
+      protected
+
+      # This is here so that we can stub it for tests
+      def driver(machine)
+        machine.provider.driver
+      end
+    end
+  end
+end

data/lib/vagrant-kvm/util/network_definition.rb

@@ -13,11 +13,11 @@ module VagrantPlugins
           self.attributes = {
             :forward => "nat",
             :domain_name => "vagrant.local",
-            :base_ip => "192.168.192.1",
+            :base_ip => "192.168.123.1",
             :netmask => "255.255.255.0",
             :range => {
-              :start => "192.168.192.100",
-              :end => "192.168.192.200",
+              :start => "192.168.123.100",
+              :end => "192.168.123.200",
             },
             :hosts => [],
             name: name,
@@ -60,6 +60,33 @@ module VagrantPlugins
         def as_xml
           KvmTemplateRenderer.render("libvirt_network", attributes.dup)
         end
+
+        # Provide host xml block to update definiton through libvirt(>= 0.5.0)
+        def as_host_xml
+          xml = ""
+          hosts.each do |host|
+            xml = xml + "<host mac='#{host[:mac]}' name='#{host[:name]}' ip='#{host[:ip]}' />"
+          end
+          xml
+        end
+
+        def hosts
+          get(:hosts)
+        end
+
+        def already_exist_host?(config)
+          hosts.each do |host|
+            return true if host[:mac]==config[:mac]
+          end
+          false
+        end
+
+        def already_exist_ip?(config)
+          hosts.each do |host|
+            return true if host[:ip]==config[:ip]
+          end
+          false
+        end
       end
     end
   end

data/lib/vagrant-kvm/util/vm_definition.rb

@@ -33,11 +33,16 @@ module VagrantPlugins
             :gui          => nil,
             :vnc_autoport => false,
             :vnc_password => nil,
-            :network      => 'default',
+            :network      => 'vagrant',
             :network_model => 'virtio',
-            :video_model  => 'cirrus'
+            :video_model  => 'cirrus',
+            :secmodel     => nil,
+            :sound        => nil,
+            :nics         => [],
           }
           doc = REXML::Document.new definition
+
+          # Basic devices
           memory_unit = doc.elements["/domain/memory"].attributes["unit"]
           update({
             :name        => doc.elements["/domain/name"].text,
@@ -48,23 +53,41 @@ module VagrantPlugins
             :machine_type => doc.elements["/domain/os/type"].attributes["machine"],
             :disk        => doc.elements["//devices/disk/source"].attributes["file"],
             :network     => doc.elements["//devices/interface/source"].attributes["network"],
-            :network_model => :default,
-            :mac         => format_mac(doc.elements["//devices/interface/mac"].attributes["address"]),
+            :mac         => doc.elements["//devices/interface/mac"].attributes["address"],
             :image_type  => doc.elements["//devices/disk/driver"].attributes["type"],
             :qemu_bin    => doc.elements["/domain/devices/emulator"].text,
             :video_model => doc.elements["/domain/devices/video/model"].attributes["type"],
             :disk_bus    => doc.elements["//devices/disk/target"].attributes["bus"]
           })
-          model_node = doc.elements["//devices/interface/model"]
-          if model_node
-            update({
-              :model_node  => model_node,
-              :network_model => model_node.attributes["type"]
-            })
+          # Security Model
+          doc.elements.each("/domain/seclabel") do |seclabel|
+            update({:secmodel => seclabel.attributes["model"]})
+          end
+          # NETWORK Interfaces
+          nics = []
+          doc.elements.each("//devices/interface") do |intf|
+            network     = intf.elements["source"].attributes["network"]
+            mac         = intf.elements["mac"].attributes["address"]
+            type        = intf.attributes["type"]
+            model       = intf.elements["model"].attributes["type"]
+            if network == 'vagrant' then
+              update({:network_model => model})
+            else
+              nics <<  {
+                :network => network,
+                :mac     => format_mac(mac),
+                :type    => type,
+                :model   => model,
+                # XXX: fixme for supprting bridge
+              }
+            end
           end
+          update({ :nics => nics })
+          # UUID
           if doc.elements["/domain/uuid"]
             update({:uuid => doc.elements["/domain/uuid"].text})
           end
+          # VNC
           if doc.elements["//devices/graphics"]
             attrs = doc.elements["//devices/graphics"].attributes
             update({
@@ -74,6 +97,12 @@ module VagrantPlugins
               :vnc_password => attrs['passwd']
             })
           end
+          # SOUND
+          if doc.elements["//devices/sound"]
+            update({
+              :sound => true
+            })
+          end
         end
 
         def as_xml
@@ -99,7 +128,77 @@ module VagrantPlugins
                 attributes.merge!(:memory_size => get_memory("KiB"),
                                   :memory_unit => "KiB")
                 )
-          xml
+          # not inject nics to definition when called for export
+          # FIXME: bad design
+          #   export call here with (uuid = nil)
+          if get(:uuid)
+            inject_nics(xml)
+          else
+            xml
+          end
+        end
+
+        # inject nics into XML
+        #
+        # primary NIC is 0000:00:03.0
+        # and injected to 0000:01:01.0 ~ 0000:00:1f.0
+        #
+        def inject_nics(xml)
+          nics=get(:nics)
+          doc = REXML::Document.new xml
+          primary_nic = doc.elements["//interface"]
+          devid = 1
+          nics.each do |nic|
+            next if nic[:mac] == get(:mac)
+            #XXX: support maximum 31 additional NICs
+            #     because of a PCI standard limitation.
+            break if devid > 31
+
+            nic[:type] = 'network' unless nic[:type]
+            nic[:model] = 'virtio' unless nic[:model]
+
+            e = REXML::Element.new('interface')
+            e.add_attributes({'type' => nic[:type]})
+            e.add_element('mac', {'address' => nic[:mac]})
+            e.add_element('source', {'network' => nic[:network]})
+            e.add_element('model', {'type' => nic[:model]})
+            e.add_element('address',{'type' => 'pci','domain' => '0x0000',
+             'bus' => '0x01', # bus 0x01 is for NICs, 0x02 is for plan9fs
+             'slot' => '0x%02x'% devid, 'function' => "0"})
+            primary_nic.next_sibling = e
+            devid = devid + 1
+          end
+          doc.to_s
+        end
+
+        # add_nic
+        #
+        # nic
+        #  mac:     mac address
+        #  network: network name(vagrant-*, bridged)
+        #  type:    network/bridge
+        #  model:   virtio/ne2k_pci
+        #
+        def add_nic(new_nic)
+          mac = format_mac(new_nic[:mac])
+          nics = get(:nics)
+          unless nics == []
+            # if nic has already exist, update it
+            nics.each_with_index do |nic,i|
+              if nic[:mac] == mac
+                nics[i] = new_nic
+                return set(:nics, nics)
+              end
+            end
+          end
+          # add nic to nics
+          nics << {
+                :mac     => mac,
+                :network => new_nic[:network],
+                :type    => new_nic[:type],
+                :model   => new_nic[:model]
+                }
+          set(:nics, nics)
         end
 
         def get_memory(unit="bytes")

data/lib/vagrant-kvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderKvm
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/locales/en.yml

@@ -4,19 +4,21 @@ en:
       This is a test message.
     repair_permission: |-
       Change directory %{directory} permission from %{old_mode} to %{new_mode}.
+    kvm_spool_problem_inform: |-
+      Your vagrant-kvm environment should be fixed. see README.
     errors:
       kvm_no_connection: |-
         Cannot connect to KVM through Libvirt. Please check kernel module
         'kvm' and 'kvm-intel' or 'kvm-amd' are installed and your id is in 
-        group libvirt(in debian/ubuntu).
+        group libvirtd(in debian/ubuntu).
       kvm_invalid_version: |-
         Invalid Kvm version detected: %{actual}, but a version %{required} is
         required.
       kvm_no_qemu_binary: |-
         Executable binary of qemu could not be found. Please re-examine %{cause}.
-      kvm_fail_image_conversion: |-
-        Failed to convert image to specified format.
       kvm_failed_command: |-
         System command %{cmd} returned with error code %{res}.
       kvm_bad_box_format: |-
         Unsupported box format.
+      kvm_fail_storagepool: |-
+        Failed to activate storage pool.

data/locales/ja.yml

@@ -2,13 +2,20 @@ en:
   vagrant_kvm:
     test_message: |-
       これはテストメッセージです。
+    kvm_spool_problem_inform: |-
+      このVagrant-kvm環境は修正の必要があります。READMEを確認してください。
     errors:
       kvm_no_connection: |-
         KVMにLibvirt経由で接続できません。カーネルモジュールの
-	 'kvm' 及び、'kvm-intel'か'kvm-amd'が正しくインストールされ、(debian/ubuntuの場合)あなたのユーザIDが
-	 libvirtグループに属しているか、確認してください。 
+         'kvm' 及び、'kvm-intel'か'kvm-amd'が正しくインストールされ、
+         (debian/ubuntuの場合)あなたのユーザIDがlibvirtdグループに属しているか、
+         確認してください。
       kvm_invalid_version: |-
-        不適切なKVMのバージョンが検出されました：バージョン %{actual} が検出されましたが、%{required} 
-        が必要です。
+        不適切なKVMのバージョンが検出されました：バージョン %{actual} が
+        検出されましたが、%{required} が必要です。
       kvm_no_qemu_binary: |-
         Qemuの実行バイナリが見つかりません。%{cause}を確認してください。
+      kvm_failed_command: |-
+        システムコマンドの %{cmd} が、エラーコード %{res} を返しました。
+      kvm_bad_box_format: |-
+        サポートされないBOX形式です。

data/spec/vagrant-kvm/config_spec.rb

@@ -71,6 +71,12 @@ describe  VagrantPlugins::ProviderKvm::Config do
     end
   end
 
+  describe "#disk_bus" do
+    it "defaults to nil" do
+      should_default(:disk_bus, nil)
+    end
+  end
+
   private
   def should_default(field, default_value)
     instance = described_class.new

data/spec/vagrant-kvm/driver/driver_spec.rb

@@ -10,6 +10,7 @@ module VagrantPlugins
         let(:box_path) { test_file "box-disk1.img" }
         let(:box_pool) { test_file "" }
         let(:capacity) { {:size=>256, :unit=>'KB'} }
+        let(:pool_path) { '/tmp/pool-storage' }
         let(:image_path) { '/tmp/pool-storage/box-disk1.img' }
         let(:image_type) { 'qcow2' }
         let(:uid) { 1000 }
@@ -21,7 +22,6 @@ module VagrantPlugins
         end
 
         describe "#import" do
-
           subject do
             described_class.new(nil)
           end
@@ -34,13 +34,14 @@ module VagrantPlugins
 
           it "does not raise execption" do
             expect do
-              subject.init_storage("/tmp", uid, gid)
+              subject.init_storage_pool("vagrant", pool_path)
             end.to_not raise_exception
           end
 
           it "does not raise exception" do
             expect do
-              subject.init_storage("/tmp", uid, gid)
+              subject.init_storage_pool("vagrant", pool_path)
+              subject.activate_storage_pool("vagrant")
               subject.create_volume(
                   :disk_name  => disk_name,
                   :capacity   => capacity,