Merge pull request #389 from mattkirby/fix_purge

Fix vmpooler folder purging

lib/vmpooler/pool_manager.rb

@@ -539,15 +539,14 @@ module Vmpooler
     def purge_unused_vms_and_folders
       global_purge = $config[:config]['purge_unconfigured_folders']
       providers = $config[:providers].keys
-      providers.each do |provider|
+      providers.each do |provider_key|
-        provider_purge = $config[:providers][provider]['purge_unconfigured_folders']
+        provider_purge = $config[:providers][provider_key]['purge_unconfigured_folders'] || global_purge
-        provider_purge = global_purge if provider_purge.nil?
         if provider_purge
           Thread.new do
             begin
-              purge_vms_and_folders($providers[provider.to_s])
+              purge_vms_and_folders(provider_key)
             rescue StandardError => e
-              $logger.log('s', "[!] failed while purging provider #{provider} VMs and folders with an error: #{e}")
+              $logger.log('s', "[!] failed while purging provider #{provider_key} VMs and folders with an error: #{e}")
             end
           end
         end
@@ -556,14 +555,13 @@ module Vmpooler
     end
 
     # Return a list of pool folders
-    def pool_folders(provider)
+    def pool_folders(provider_name)
-      provider_name = provider.name
       folders = {}
       $config[:pools].each do |pool|
-        next unless pool['provider'] == provider_name
+        next unless pool['provider'] == provider_name.to_s
 
         folder_parts = pool['folder'].split('/')
-        datacenter = provider.get_target_datacenter_from_config(pool['name'])
+        datacenter = $providers[provider_name.to_s].get_target_datacenter_from_config(pool['name'])
         folders[folder_parts.pop] = "#{datacenter}/vm/#{folder_parts.join('/')}"
       end
       folders
@@ -577,8 +575,9 @@ module Vmpooler
       base.uniq
     end
 
-    def purge_vms_and_folders(provider)
+    def purge_vms_and_folders(provider_name)
-      configured_folders = pool_folders(provider)
+      provider = $providers[provider_name.to_s]
+      configured_folders = pool_folders(provider_name)
       base_folders = get_base_folders(configured_folders)
       whitelist = provider.provider_config['folder_whitelist']
       provider.purge_unconfigured_folders(base_folders, configured_folders, whitelist)

spec/unit/pool_manager_spec.rb

@@ -1418,16 +1418,24 @@ EOT
       )
     }
 
+    context 'when evaluating pool folders' do
+      before do
+        expect(subject).not_to be_nil
+        # Inject mock provider into global variable - Note this is a code smell
+        $providers = { provider_name => provider }
+      end
+
       it 'should return a list of pool folders' do
         expect(provider).to receive(:get_target_datacenter_from_config).with(pool).and_return(datacenter)
 
-      expect(subject.pool_folders(provider)).to eq(expected_response)
+        expect(subject.pool_folders(provider_name)).to eq(expected_response)
       end
 
       it 'should raise an error when the provider fails to get the datacenter' do
         expect(provider).to receive(:get_target_datacenter_from_config).with(pool).and_raise('mockerror')
 
-      expect{ subject.pool_folders(provider) }.to raise_error(RuntimeError, 'mockerror')
+        expect{ subject.pool_folders(provider_name) }.to raise_error(RuntimeError, 'mockerror')
+      end
     end
   end
 
@@ -1456,12 +1464,19 @@ EOT
       )
     }
 
+    context 'when purging folders' do
+      before do
+        expect(subject).not_to be_nil
+        # Inject mock provider into global variable - Note this is a code smell
+        $providers = { provider_name => provider }
+      end
+
       it 'should run purge_unconfigured_folders' do
         expect(subject).to receive(:pool_folders).and_return(configured_folders)
         expect(provider).to receive(:purge_unconfigured_folders).with(base_folders, configured_folders, whitelist)
         expect(provider).to receive(:provider_config).and_return({})
 
-      subject.purge_vms_and_folders(provider)
+        subject.purge_vms_and_folders(provider_name)
       end
 
       it 'should raise any errors' do
@@ -1469,7 +1484,8 @@ EOT
         expect(provider).to receive(:purge_unconfigured_folders).with(base_folders, configured_folders, whitelist).and_raise('mockerror')
         expect(provider).to receive(:provider_config).and_return({})
 
-      expect{ subject.purge_vms_and_folders(provider) }.to raise_error(RuntimeError, 'mockerror')
+        expect{ subject.purge_vms_and_folders(provider_name) }.to raise_error(RuntimeError, 'mockerror')
+      end
     end
   end