lib/vagrant-libvirt/action/destroy_networks.rb in vagrant-libvirt-0.0.10 vs lib/vagrant-libvirt/action/destroy_networks.rb in vagrant-libvirt-0.0.11

@@ -7,58 +7,64 @@
       # Destroy all networks created for this specific domain. Skip
       # removing if network has still active connections.
       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
 
         def call(env)
           # If there were some networks created for this machine, in machines
           # 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
 
           # Update status of created networks after removing some/all of them.
@@ -70,9 +76,10 @@
             end
           else
             File.delete(created_networks_file)
           end
 
+          env[:machine].id = nil
           @app.call(env)
         end
       end
     end
   end