lib/vagrant-vcloud/action/destroy.rb in vagrant-vcloud-0.1.2 vs lib/vagrant-vcloud/action/destroy.rb in vagrant-vcloud-0.2.0

@@ -1,61 +1,66 @@
-require "i18n"
-
 module VagrantPlugins
   module VCloud
     module Action
       class Destroy
-
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant_vcloud::action::destroy")
+          @logger = Log4r::Logger.new('vagrant_vcloud::action::destroy')
         end
 
         def call(env)
-
           cfg = env[:machine].provider_config
           cnx = cfg.vcloud_cnx.driver
-          vAppId = env[:machine].get_vapp_id
-          vmId = env[:machine].id
+          vapp_id = env[:machine].get_vapp_id
+          vm_id = env[:machine].id
 
           cfg.org = cnx.get_organization_by_name(cfg.org_name)
           cfg.vdc_id = cnx.get_vdc_id_by_name(cfg.org, cfg.vdc_name)
 
-          testvApp = cnx.get_vapp(vAppId)
+          test_vapp = cnx.get_vapp(vapp_id)
 
-          @logger.debug("Number of VMs in the vApp: #{testvApp[:vms_hash].count}")
+          @logger.debug(
+            "Number of VMs in the vApp: #{test_vapp[:vms_hash].count}"
+          )
 
-          if testvApp[:vms_hash].count == 1
-            env[:ui].info("Single VM left in the vApp, destroying the vApp...")
+          if test_vapp[:vms_hash].count == 1
+            env[:ui].info('Single VM left in the vApp, destroying the vApp...')
 
             if cfg.vdc_edge_gateway_ip && cfg.vdc_edge_gateway
-              env[:ui].info("Removing NAT rules on [#{cfg.vdc_edge_gateway}] for IP [#{cfg.vdc_edge_gateway_ip}].")
-              @logger.debug("Deleting Edge Gateway rules - vdc id: #{cfg.vdc_id}")
-              edge_remove = cnx.remove_edge_gateway_rules(cfg.vdc_edge_gateway, cfg.vdc_id, cfg.vdc_edge_gateway_ip, vAppId)
+              env[:ui].info(
+                "Removing NAT rules on [#{cfg.vdc_edge_gateway}] " +
+                "for IP [#{cfg.vdc_edge_gateway_ip}]."
+              )
+              @logger.debug(
+                "Deleting Edge Gateway rules - vdc id: #{cfg.vdc_id}"
+              )
+              edge_remove = cnx.remove_edge_gateway_rules(
+                cfg.vdc_edge_gateway,
+                cfg.vdc_id,
+                cfg.vdc_edge_gateway_ip,
+                vapp_id
+              )
               cnx.wait_task_completion(edge_remove)
             end
 
-            env[:ui].info("Destroying vApp...")
-            vAppDeleteTask = cnx.delete_vapp(vAppId)
-            @logger.debug("vApp Delete task id #{vAppDeleteTask}")
-            cnx.wait_task_completion(vAppDeleteTask)
+            env[:ui].info('Destroying vApp...')
+            vapp_delete_task = cnx.delete_vapp(vapp_id)
+            @logger.debug("vApp Delete task id #{vapp_delete_task}")
+            cnx.wait_task_completion(vapp_delete_task)
 
-
-            # FIXME: Look into this.
-            ####env[:machine].provider.driver.delete
-            env[:machine].id=nil
-            env[:machine].vappid=nil
+            env[:machine].id = nil
+            env[:machine].vappid = nil
           else
-            env[:ui].info("Destroying VM...")
-            vmDeleteTask = cnx.delete_vm(vmId)
-            @logger.debug("VM Delete task id #{vmDeleteTask}")
-            cnx.wait_task_completion(vmDeleteTask)
-            env[:machine].id=nil
+            env[:ui].info('Destroying VM...')
+            vm_delete_task = cnx.delete_vm(vm_id)
+            @logger.debug("VM Delete task id #{vm_delete_task}")
+            cnx.wait_task_completion(vm_delete_task)
+
+            env[:machine].id = nil
           end
 
           @app.call env
         end
-
       end
     end
   end
 end