Merge pull request #100 from isoutham/master

Expunge destroyed server

Author: sbotman

lib/chef/knife/cs_server_delete.rb

@@ -58,7 +58,7 @@ def run
         if result
           print "#{ui.color("Waiting for deletion", :magenta)}"
           disassociate_virtual_ip_address server
-          connection.delete_server hostname
+          connection.delete_server(hostname, false)
           puts "\n"
           ui.msg("Deleted server #{hostname}")
 

lib/chef/knife/cs_server_list.rb

@@ -45,7 +45,10 @@ class CsServerList < Chef::Knife
            :short => "-a ACTION",
            :long => "--action ACTION",
            :description => "start, stop or destroy the instances in your result"
-           
+
+    option :expunge,
+           :long => "--expunge",
+           :description => "If used with --action destroy, will cause the server to be expunged"
     option :public_ip,
            :long => "--[no-]public-ip",
            :description => "Show or don't show the public IP for server in your result",
@@ -70,7 +73,9 @@ def run
       params['listall'] = locate_config_value(:listall) if locate_config_value(:listall)
       params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
       params['name']    = locate_config_value(:name)    if locate_config_value(:name)
-      
+      params['expunge'] = locate_config_value(:expunge) if locate_config_value(:expunge)
+      params['expunge'] = false if params['expunge'].nil?
+     
       ##
       # Get the public IP address if possible, except when the option --no-public-ip is given.
 
@@ -89,7 +94,7 @@ def run
       # Executing actions against the list results that are returned.
 
       if locate_config_value(:action)
-        connection_result.each do |r|
+        result.each do |r|
           hostname = r['name'] 
           case locate_config_value(:action).downcase
           when "start" then
@@ -115,7 +120,7 @@ def run
             result = confirm_action("Do you really want to destroy this server ")
             if result then
               print "#{ui.color("Waiting for demolition", :magenta)}"
-              connection.delete_server(hostname)
+              connection.delete_server(hostname, params['expunge'])
               puts "\n"
               ui.msg("Destroyed server #{hostname}")
             end

lib/chef/knife/cs_stack_delete.rb

@@ -70,6 +70,7 @@ def delete_stack(stack)
     def delete_server(server_name)
       cmd = KnifeCloudstack::CsServerDelete.new([server_name])
       cmd.config[:yes] = true
+      cmd.config[:expunge] = true
       cmd.run_with_pretty_exceptions
     end
 

lib/knife-cloudstack/connection.rb

@@ -264,7 +264,7 @@ def create_server(host_name, service_name, template_name, disk_name=nil, zone_na
     # Deletes the server with the specified name.
     #
 
-    def delete_server(name)
+    def delete_server(name, expunge)
       server = get_server(name)
       if !server || !server['id'] then
         puts "\nError: Virtual machine '#{name}' does not exist"
@@ -273,7 +273,8 @@ def delete_server(name)
 
       params = {
           'command' => 'destroyVirtualMachine',
-          'id' => server['id']
+          'id' => server['id'],
+          'expunge' => expunge
       }
 
       json = send_async_request(params)