vagrant-libvirt 0.0.10 → 0.0.11

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.0.11 (Oct. 20, 2013)
+
+* BUG FIX  close #70 undefine machine id should be after all operations
+* BUG FIX  close #76 correct uri for different virtualizations
+* BUG FIX  close #72 possibility to give VMs a name
+* Delete any snapshots when destroying domain (by Brian Pitts <brian@polibyte.com>)
+* Add reload command (by Brian Pitts <brian@polibyte.com>)
+* Update README (by <brett@apache.org>)
+
 # 0.0.10 (Oct. 7, 2013)
 
 * Delete files from destination to avoid confusions(by <skullzeek@gmail.com>)

data/Gemfile

@@ -4,9 +4,11 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  # We depend on Vagrant for development, but we don't add it as a
-  # gem dependency because we expect to be installed within the
-  # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git"
+  gem 'rake'
+  gem 'rspec',       '~> 2.13.0'
+  gem 'rspec-fire',  require: 'rspec/fire'
+  gem 'rspec-spies', require: false
+  gem 'coveralls',   require: false
+  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git'
 end
 

data/README.md

@@ -1,16 +1,16 @@
 # Vagrant Libvirt Provider
 
-This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds an
+This is a [Vagrant](http://www.vagrantup.com) 1.3+ plugin that adds an
 [Libvirt](http://libvirt.org) provider to Vagrant, allowing Vagrant to
 control and provision machines via Libvirt toolkit.
 
-**Note:** Actual version (0.0.6) is still a development one. Feedback is
+**Note:** Actual version (0.0.11) is still a development one. Feedback is
 welcome and can help a lot :-)
 
-## Features (Version 0.0.6)
+## Features (Version 0.0.11)
 
 * Controll local Libvirt hypervisors.
-* Vagrant `up`, `destroy`, `suspend`, `resume`, `halt`, `ssh` and `provision` commands.
+* Vagrant `up`, `destroy`, `suspend`, `resume`, `halt`, `ssh`, `reload` and `provision` commands.
 * Upload box image (qcow2 format) to Libvirt storage pool.
 * Create volume as COW diff image for domains.
 * Create private networks.
@@ -27,7 +27,7 @@ welcome and can help a lot :-)
 
 ## Installation
 
-Install using standard [Vagrant 1.1+](http://downloads.vagrantup.com) plugin installation methods. After
+Install using standard [Vagrant 1.3+](http://downloads.vagrantup.com) plugin installation methods. After
 installing, `vagrant up` and specify the `libvirt` provider. An example is shown below.
 
 ```

data/Rakefile

@@ -2,6 +2,7 @@
 
 #require 'rubygems'
 #require 'bundler/setup'
+Dir['./tasks/**/*.rake'].each { |f| load f }
 require 'bundler/gem_tasks'
 Bundler::GemHelper.install_tasks
 task default: [:deftask]

data/lib/vagrant-libvirt.rb

@@ -3,10 +3,10 @@ require 'vagrant-libvirt/plugin'
 
 module VagrantPlugins
   module ProviderLibvirt
-    lib_path = Pathname.new(File.expand_path("../vagrant-libvirt", __FILE__))
-    autoload :Action, lib_path.join("action")
-    autoload :Errors, lib_path.join("errors")
-    autoload :Util, lib_path.join("util")
+    lib_path = Pathname.new(File.expand_path('../vagrant-libvirt', __FILE__))
+    autoload :Action, lib_path.join('action')
+    autoload :Errors, lib_path.join('errors')
+    autoload :Util, lib_path.join('util')
 
     # Hold connection handler so there is no need to connect more times than
     # one. This can be annoying when there are more machines to create, or when
@@ -23,7 +23,7 @@ module VagrantPlugins
     end
 
     def self.source_root
-      @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
   end
 end

data/lib/vagrant-libvirt/action.rb

@@ -92,6 +92,23 @@ module VagrantPlugins
         end
       end
 
+      # This is the action implements the reload command
+      # It uses the halt and start actions
+      def self.action_reload
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use ConfigValidate
+            b2.use action_halt
+            b2.use action_start
+          end
+        end
+      end
+
       # This is the action that is primarily responsible for completely
       # freeing the resources of the underlying virtual machine.
       def self.action_destroy
@@ -251,6 +268,15 @@ module VagrantPlugins
 
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
       autoload :ConnectLibvirt, action_root.join('connect_libvirt')
+      autoload :CreateDomain, action_root.join('create_domain')
+      autoload :CreateDomainVolume, action_root.join('create_domain_volume')
+      autoload :CreateNetworkInterfaces, action_root.join('create_network_interfaces')
+      autoload :CreateNetworks, action_root.join('create_networks')
+      autoload :DestroyDomain, action_root.join('destroy_domain')
+      autoload :DestroyNetworks, action_root.join('destroy_networks')
+      autoload :HaltDomain, action_root.join('halt_domain')
+      autoload :HandleBoxImage, action_root.join('handle_box_image')
+      autoload :HandleStoragePool, action_root.join('handle_storage_pool')
       autoload :IsCreated, action_root.join('is_created')
       autoload :IsRunning, action_root.join('is_running')
       autoload :IsSuspended, action_root.join('is_suspended')
@@ -258,29 +284,20 @@ module VagrantPlugins
       autoload :MessageNotCreated, action_root.join('message_not_created')
       autoload :MessageNotRunning, action_root.join('message_not_running')
       autoload :MessageNotSuspended, action_root.join('message_not_suspended')
-      autoload :HandleStoragePool, action_root.join('handle_storage_pool')
-      autoload :HandleBoxUrl, 'vagrant/action/builtin/handle_box_url'
-      autoload :HandleBoxImage, action_root.join('handle_box_image')
+      autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
+      autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
+      autoload :ReadSSHInfo, action_root.join('read_ssh_info')
+      autoload :ReadState, action_root.join('read_state')
+      autoload :ResumeDomain, action_root.join('resume_domain')
       autoload :SetNameOfDomain, action_root.join('set_name_of_domain')
-      autoload :CreateDomainVolume, action_root.join('create_domain_volume')
-      autoload :CreateDomain, action_root.join('create_domain')
-      autoload :CreateNetworks, action_root.join('create_networks')
-      autoload :CreateNetworkInterfaces, action_root.join('create_network_interfaces')
-      autoload :DestroyDomain, action_root.join('destroy_domain')
-      autoload :DestroyNetworks, action_root.join('destroy_networks')
+      autoload :ShareFolders, action_root.join('share_folders')
       autoload :StartDomain, action_root.join('start_domain')
-      autoload :HaltDomain, action_root.join('halt_domain')
       autoload :SuspendDomain, action_root.join('suspend_domain')
-      autoload :ResumeDomain, action_root.join('resume_domain')
-      autoload :ReadState, action_root.join('read_state')
-      autoload :ReadSSHInfo, action_root.join('read_ssh_info')
+      autoload :SyncFolders, action_root.join('sync_folders')
       autoload :TimedProvision, action_root.join('timed_provision')
       autoload :WaitTillUp, action_root.join('wait_till_up')
-      autoload :SyncFolders, action_root.join('sync_folders')
       autoload :SSHRun,  'vagrant/action/builtin/ssh_run'
-      autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
-      autoload :PruneNFSExports, action_root.join('prune_nfs_exports')
-      autoload :ShareFolders, action_root.join('share_folders')
+      autoload :HandleBoxUrl, 'vagrant/action/builtin/handle_box_url'
     end
   end
 end

data/lib/vagrant-libvirt/action/connect_libvirt.rb

@@ -24,6 +24,17 @@ module VagrantPlugins
 
           # Setup connection uri.
           uri = config.driver
+          virt_path = case uri
+          when 'qemu', 'openvz', 'uml', 'phyp', 'parallels'
+            '/system'
+          when 'xen', 'esx'
+            '/'
+          when 'vbox', 'vmwarews', 'hyperv'
+            '/session'
+          else
+            raise "Require specify driver #{uri}"
+          end
+
           if config.connect_via_ssh
             uri << '+ssh://'
             if config.username
@@ -40,7 +51,8 @@ module VagrantPlugins
             uri << config.host if config.host
           end
 
-          uri << '/system?no_verify=1'
+          uri << virt_path
+          uri << '?no_verify=1'
           # set ssh key for access to libvirt host
           home_dir = `echo ${HOME}`.chomp
           uri << "&keyfile=#{home_dir}/.ssh/id_rsa"

data/lib/vagrant-libvirt/action/destroy_domain.rb

@@ -5,17 +5,30 @@ module VagrantPlugins
     module Action
       class DestroyDomain
         def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::destroy_domain")
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::destroy_domain')
           @app = app
         end
 
         def call(env)
           # Destroy the server, remove the tracking ID
-          env[:ui].info(I18n.t("vagrant_libvirt.destroy_domain"))
+          env[:ui].info(I18n.t('vagrant_libvirt.destroy_domain'))
+
+          # Must delete any snapshots before domain can be destroyed
+          # Fog libvirt currently doesn't support snapshots. Use
+          # ruby-libvirt client directly. Note this is racy, see
+          # http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotListNames
+          libvirt_domain = env[:libvirt_compute].client.lookup_domain_by_uuid(env[:machine].id)
+          libvirt_domain.list_snapshots.each do |name|
+            @logger.info("Deleting snapshot '#{name}'")
+            begin
+              libvirt_domain.lookup_snapshot_by_name(name).delete
+            rescue => e
+              raise Errors::DeleteSnapshotError, error_message: e.message
+            end
+          end
 
           domain = env[:libvirt_compute].servers.get(env[:machine].id.to_s)
-          domain.destroy(:destroy_volumes => true)
-          env[:machine].id = nil
+          domain.destroy(destroy_volumes: true)
 
           @app.call(env)
         end

data/lib/vagrant-libvirt/action/destroy_networks.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
       class DestroyNetworks
 
         def initialize(app, env)
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::destroy_networks")
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::destroy_networks')
           @app = app
         end
 
@@ -18,45 +18,51 @@ module VagrantPlugins
           # data directory, created_networks file holds UUIDs of each network.
           created_networks_file = env[:machine].data_dir + 'created_networks'
 
+          @logger.info 'Attepmt destroy network'
           # If created_networks file doesn't exist, there are no networks we
           # need to remove.
-          return @app.call(env) if not File.exist?(created_networks_file)
+          unless File.exist?(created_networks_file)
+            env[:machine].id = nil
+            return @app.call(env)
+          end
+
+          @logger.info 'file with network exists'
 
           # Iterate over each created network UUID and try to remove it.
           created_networks = []
           file = File.open(created_networks_file, 'r')
           file.readlines.each do |network_uuid|
+            @logger.info network_uuid
             begin
               libvirt_network = env[:libvirt_compute].client.lookup_network_by_uuid(
                 network_uuid)
             rescue
+              raise network_uuid
               next
             end
 
             # Maybe network doesn't exist anymore.
-            next if not libvirt_network
+            next unless libvirt_network
 
             # Skip removing if network has still active connections.
             xml = Nokogiri::XML(libvirt_network.xml_desc)
             connections = xml.xpath('/network/@connections').first
+            @logger.info connections
             if connections != nil
               created_networks << network_uuid
               next
             end
 
             # Shutdown network first.
-            begin
-              libvirt_network.destroy
-            rescue => e
-            end
+            libvirt_network.destroy
 
             # Undefine network.
             begin
               libvirt_network.undefine
             rescue => e
               raise Error::DestroyNetworkError,
-                :network_name  => libvirt_network.name,
-                :error_message => e.message
+                network_name: libvirt_network.name,
+                error_message: e.message
             end
           end
           file.close
@@ -72,6 +78,7 @@ module VagrantPlugins
             File.delete(created_networks_file)
           end
 
+          env[:machine].id = nil
           @app.call(env)
         end
       end

data/lib/vagrant-libvirt/action/read_state.rb

@@ -1,4 +1,4 @@
-require "log4r"
+require 'log4r'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -8,7 +8,7 @@ module VagrantPlugins
       class ReadState
         def initialize(app, env)
           @app    = app
-          @logger = Log4r::Logger.new("vagrant_libvirt::action::read_state")
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::read_state')
         end
 
         def call(env)
@@ -21,9 +21,9 @@ module VagrantPlugins
 
           # Find the machine
           server = libvirt.servers.get(machine.id)
-          if server.nil? || [:"shutting-down", :terminated].include?(server.state.to_sym)
+          if server.nil? || [:'shutting-down', :terminated].include?(server.state.to_sym)
             # The machine can't be found
-            @logger.info("Machine not found or terminated, assuming it got destroyed.")
+            @logger.info('Machine not found or terminated, assuming it got destroyed.')
             machine.id = nil
             return :not_created
           end

data/lib/vagrant-libvirt/action/set_name_of_domain.rb

@@ -11,8 +11,9 @@ module VagrantPlugins
         def call(env)
           require 'securerandom'
           env[:domain_name] = env[:root_path].basename.to_s.dup
-          env[:domain_name].gsub!(/[^-a-z0-9_]/i, "")
-          env[:domain_name] << "_#{SecureRandom.hex}"
+          env[:domain_name].gsub!(/[^-a-z0-9_]/i, '')
+          env[:domain_name] << '_'
+          env[:domain_name] << env[:machine].name.to_s
 
           # Check if the domain name is not already taken
           domain = ProviderLibvirt::Util::Collection.find_matching(

data/lib/vagrant-libvirt/errors.rb

@@ -118,6 +118,10 @@ module VagrantPlugins
         error_key(:no_ip_address_error)
       end
 
+      class DeleteSnapshotError < VagrantLibvirtError
+        error_key(:delete_snapshot_error)
+      end
+
     end
   end
 end

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.10'
+    VERSION = '0.0.11'
   end
 end

data/locales/en.yml

@@ -115,6 +115,8 @@ en:
         Error while setting up autostart on network: %{error_message}.
       destroy_network_error: |-
         Error while removing network %{network_name}. %{error_message}.
+      delete_snapshot_error: |-
+        Error while deleting snapshot: %{error_message}.
 
     states:
       short_paused: |-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog