CloudyScripts 2.14.60 → 2.14.62

data/lib/scripts/ec2/copy_mswindows_snapshot.rb

@@ -45,24 +45,33 @@ class CopyMsWindowsSnapshot < Ec2Script
     if @input_params[:snapshot_id] == nil && !(@input_params[:snapshot_id] =~ /^snap-.*$/)
       raise Exception.new("Invalid Snapshot ID specified: #{@input_params[:snapshot_id]}")
     end
+    # AWS Linux AMI, source and target region
     if @input_params[:source_ami_id] == nil && !(@input_params[:source_ami_id] =~ /^ami-.*$/)
       raise Exception.new("Invalid source AMI ID specified: #{@input_params[:source_ami_id]}")
     end
     if @input_params[:target_ami_id] == nil && !(@input_params[:target_ami_id] =~ /^ami-.*$/)
       raise Exception.new("Invalid target AMI ID specified: #{@input_params[:target_ami_id]}")
     end
-    if @input_params[:source_security_groups] == nil
-      @input_params[:source_security_groups] = "default"
+    # AWS SecurityGroup, source and target regions
+    if @input_params[:source_security_group] == nil
+      @input_params[:source_security_group] = "default"
     end
-    if !@local_ec2_helper.check_open_port(@input_params[:source_security_groups], 22)
-      raise Exception.new("Port 22 must be opened for security group '#{@input_params[:source_security_groups]}' to connect via SSH in source-region")
+    if !@local_ec2_helper.check_open_port(@input_params[:source_security_group], 22)
+      post_message("'#{@input_params[:source_security_group]}' Security Group not opened port 22 for connect via SSH in source region")
+      @input_params[:source_security_group] = nil
+    else
+      post_message("'#{@input_params[:source_security_group]}' Security Group opened port 22 for connect via SSH in source region")
     end
-    if @input_params[:target_security_groups] == nil
-      @input_params[:target_security_groups] = "default"
+    if @input_params[:target_security_group] == nil
+      @input_params[:target_security_group] = "default"
     end
-    if !@remote_ec2_helper.check_open_port(@input_params[:target_security_groups], 22)
-      raise Exception.new("Port 22 must be opened for security group '#{@input_params[:target_security_groups]}' to connect via SSH in target-region")
+    if !@remote_ec2_helper.check_open_port(@input_params[:target_security_group], 22)
+      post_message("'#{@input_params[:target_security_group]}' Security Group not opened port 22 for connect via SSH in target region")
+      @input_params[:target_security_group] = nil
+    else
+      post_message("'#{@input_params[:target_security_group]}' Security Group opened port 22 for connect via SSH in target region")
     end
+    # Device to use for volume
     if @input_params[:root_device_name] == nil
       @input_params[:root_device_name] = "/dev/sda1"
     end
@@ -75,6 +84,7 @@ class CopyMsWindowsSnapshot < Ec2Script
     if @input_params[:temp_device_name] == @input_params[:device_name]
       raise Exception.new("Device name '#{@input_params[:device_name]}' and temporary device name '#{@input_params[:temp_device_name]}' must be different")
     end
+    # SSH Parameters, source and target region
     if @input_params[:source_ssh_username] == nil
       @input_params[:source_ssh_username] = "root"
     end
@@ -84,9 +94,12 @@ class CopyMsWindowsSnapshot < Ec2Script
     if @input_params[:fs_type] == nil
       @input_params[:fs_type] = "ext3"
     end
-    if @input_params[:description] == nil || !check_string_alnum(@input_params[:description])
+    if @input_params[:description] == nil || !check_aws_desc(@input_params[:description])
       @input_params[:description] = "Created by CloudyScripts - #{self.class.name}"
     end
+    if @input_params[:name] == nil || !check_aws_name(@input_params[:name])
+      @input_params[:name] = "Created_by_CloudyScripts/#{self.class.name}_from_#{@input_params[:snapshot_id]}"
+    end
     if @input_params[:compression] != nil && (@input_params[:compression] =~ /^on$/i)
       @input_params[:compression] = true
     else
@@ -140,8 +153,16 @@ class CopyMsWindowsSnapshot < Ec2Script
   class InitialStateDone < CopyMsWindowsSnapshotState 
     def enter()
       local_region()
-      post_message("Lunching an Helper instance in source Region...")
-      result = launch_instance(@context[:source_ami_id], @context[:source_key_name], @context[:source_security_groups], 
+      post_message("Launching an Helper instance in source Region...")
+      #XXX: create a CloudyScripts Security Group with TCP port 22 publicly opened
+      if @context[:source_security_group] == nil
+        @context[:source_security_group] = Ec2Script::CS_SEC_GRP_NAME
+        create_security_group_with_rules(@context[:source_security_group], Ec2Script::CS_SEC_GRP_DESC,
+          [{:ip_protocol => "tcp", :from_port => 22, :to_port => 22, :cidr_ip => "0.0.0.0/0"}])
+        post_message("'#{@context[:source_security_group]}' Security Group created with TCP port 22 publicly opened.")
+      end
+
+      result = launch_instance(@context[:source_ami_id], @context[:source_key_name], @context[:source_security_group], 
                                nil, @context[:instance_type])
       @context[:source_instance_id] = result.first
       @context[:source_dns_name] = result[1]
@@ -236,7 +257,15 @@ class CopyMsWindowsSnapshot < Ec2Script
   class BackupedDataState < CopyMsWindowsSnapshotState 
     def enter()
       remote_region()
-      result = launch_instance(@context[:target_ami_id], @context[:target_key_name], @context[:target_security_groups], 
+      #XXX: create a CloudyScripts Security Group with TCP port 22 publicly opened
+      if @context[:target_security_group] == nil
+        @context[:target_security_group] = Ec2Script::CS_SEC_GRP_NAME
+        create_security_group_with_rules(@context[:target_security_group], Ec2Script::CS_SEC_GRP_DESC,
+          [{:ip_protocol => "tcp", :from_port => 22, :to_port => 22, :cidr_ip => "0.0.0.0/0"}])
+        post_message("'#{@context[:target_security_group]}' Security Group created with TCP port 22 publicly opened.")
+      end
+
+      result = launch_instance(@context[:target_ami_id], @context[:target_key_name], @context[:target_security_group], 
                                nil, @context[:instance_type])
       @context[:target_instance_id] = result.first
       @context[:target_dns_name] = result[1]
@@ -386,7 +415,7 @@ class CopyMsWindowsSnapshot < Ec2Script
 
   # AMI is registered. Now only cleanup is missing, i.e. shut down instances and
   # remote the volumes that were created. Start with cleaning the ressources
-  # in the local region.
+  # in the both regions.
   # Steps:
   #   - cleanup source region
   #     - unmount temp volume
@@ -400,26 +429,92 @@ class CopyMsWindowsSnapshot < Ec2Script
   #     - delete source and temp volume
   class TargetSnapshotCreatedState < CopyMsWindowsSnapshotState
     def enter()
+      error = []
       local_region()
       connect(@context[:source_dns_name], @context[:source_ssh_username], nil, @context[:source_ssh_keydata])
       mount_point = "/mnt/tmp_#{@context[:source_temp_volume_id]}"
       unmount_fs(mount_point)
       disconnect()
-      detach_volume(@context[:source_temp_volume_id], @context[:source_instance_id])
-      detach_volume(@context[:source_volume_id], @context[:source_instance_id])
-      shut_down_instance(@context[:source_instance_id])
-      delete_volume(@context[:source_temp_volume_id])
-      delete_volume(@context[:source_volume_id])
+      begin
+        detach_volume(@context[:source_temp_volume_id], @context[:source_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to detach volume '#{@context[:source_temp_volume_id]}' in source region: #{e.to_s}")
+      end
+      begin
+        detach_volume(@context[:source_volume_id], @context[:source_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to detach volume '#{@context[:source_volume_id]}' in source region: #{e.to_s}")
+      end
+      begin
+        shut_down_instance(@context[:source_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to shutdown instance '#{@context[:source_instance_id]}' in source region: #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:source_temp_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:source_temp_volume_id]}' in source region: #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:source_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:source_volume_id]}' in source region: #{e.to_s}")
+      end
+      if @context[:source_security_group].eql?(Ec2Script::CS_SEC_GRP_NAME)
+        begin
+          delete_security_group(@context[:source_security_group])
+        rescue Exception => e
+          error << e
+          post_message("Unable to delete Security Group '#{@context[:source_security_group]}' in source region: #{e.to_s}")
+        end
+      end
       #
       remote_region()
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
       mount_point = "/mnt/tmp_#{@context[:target_temp_volume_id]}"
       unmount_fs(mount_point)
       disconnect()
-      detach_volume(@context[:target_temp_volume_id], @context[:target_instance_id])
-      shut_down_instance(@context[:target_instance_id])
-      delete_volume(@context[:target_temp_volume_id])
-      delete_volume(@context[:target_volume_id])
+      begin
+        detach_volume(@context[:target_temp_volume_id], @context[:target_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to detach volume '#{@context[:target_temp_volume_id]}' in target region: #{e.to_s}")
+      end
+      begin
+        shut_down_instance(@context[:target_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to shutdown instance '#{@context[:target_instance_id]}' in target region: #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:target_temp_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:target_temp_volume_id]}' in target region: #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:target_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:target_volume_id]}' in target region: #{e.to_s}")
+      end
+      if @context[:target_security_group].eql?(Ec2Script::CS_SEC_GRP_NAME)
+        begin
+          delete_security_group(@context[:target_security_group])
+        rescue Exception => e
+          error << e
+          post_message("Unable to delete Security Group '#{@context[:target_security_group]}' in target region: #{e.to_s}")
+        end
+      end
+
+      if error.size() > 0
+        raise Exception.new("Cleanup error(s)")
+      end
  
       Done.new(@context)
     end

data/lib/scripts/ec2/copy_snapshot.rb

@@ -38,12 +38,24 @@ class CopySnapshot< Ec2Script
 
   def check_input_parameters()
     local_ec2_helper = Ec2Helper.new(@input_params[:ec2_api_handler])
-    if !local_ec2_helper.check_open_port('default', 22)
-      raise Exception.new("Port 22 must be opened for security group 'default' to connect via SSH in source-region")
+    if @input_params[:source_security_group] == nil
+      @input_params[:source_security_group] = "default"
+    end
+    if !local_ec2_helper.check_open_port(@input_params[:source_security_group], 22)
+      post_message("'#{@input_params[:source_security_group]}' Security Group not opened port 22 for connect via SSH in source region")
+      @input_params[:source_security_group] = nil
+    else
+      post_message("'#{@input_params[:source_security_group]}' Security Group opened port 22 for connect via SSH in source region")
     end
     remote_ec2_helper = Ec2Helper.new(@input_params[:target_ec2_handler])
-    if !remote_ec2_helper.check_open_port('default', 22)
-      raise Exception.new("Port 22 must be opened for security group 'default' to connect via SSH in target-region")
+    if @input_params[:target_security_group] == nil
+      @input_params[:target_security_group] = "default"
+    end
+    if !remote_ec2_helper.check_open_port(@input_params[:target_security_group], 22)
+      post_message("'#{@input_params[:target_security_group]}' Security Group not opened port 22 for connect via SSH in target region")
+      @input_params[:target_security_group] = nil
+    else
+      post_message("'#{@input_params[:target_security_group]}' Security Group opened port 22 for connect via SSH in target region")
     end
     if @input_params[:source_ssh_username] == nil
       @input_params[:source_ssh_username] = "root"
@@ -51,9 +63,12 @@ class CopySnapshot< Ec2Script
     if @input_params[:target_ssh_username] == nil
       @input_params[:target_ssh_username] = "root"
     end
-    if @input_params[:description] == nil || !check_string_alnum(@input_params[:description])
+    if @input_params[:description] == nil || !check_aws_desc(@input_params[:description])
       @input_params[:description] = "Created by CloudyScripts - #{self.class.name}" 
     end
+    if @input_params[:name] == nil || !check_aws_name(@input_params[:name])
+      @input_params[:name] = "Created_by_CloudyScripts/#{self.class.name}_from_#{@input_params[:snapshot_id]}"
+    end
   end
 
   # Load the initial state for the script.
@@ -83,10 +98,20 @@ class CopySnapshot< Ec2Script
   # Initial state: start up AMI in source region
   class InitialState < CopySnapshotState
     def enter()
-      result = launch_instance(@context[:source_ami_id], @context[:source_key_name], "default")
+      local_region()
+      #XXX: create a CloudyScripts Security Group with TCP port 22 publicly opened
+      if @context[:source_security_group] == nil
+        @context[:source_security_group] = Ec2Script::CS_SEC_GRP_NAME
+        create_security_group_with_rules(@context[:source_security_group], Ec2Script::CS_SEC_GRP_DESC,
+          [{:ip_protocol => "tcp", :from_port => 22, :to_port => 22, :cidr_ip => "0.0.0.0/0"}])
+        post_message("'#{@context[:source_security_group]}' Security Group created with TCP port 22 publicly opened.")
+      end
+
+      result = launch_instance(@context[:source_ami_id], @context[:source_key_name], @context[:source_security_group])
       @context[:source_instance_id] = result.first
       @context[:source_dns_name] = result[1]
       @context[:source_availability_zone] = result[2]
+
       SourceInstanceLaunchedState.new(@context)
     end
   end
@@ -106,6 +131,7 @@ class CopySnapshot< Ec2Script
       #@context[:fs_type] = get_partition_fs_type(mount_point)
       @context[:fs_type], @context[:label] = get_partition_fs_type_and_label(mount_point)
       disconnect()
+
       SourceVolumeReadyState.new(@context)
     end
   end
@@ -114,11 +140,19 @@ class CopySnapshot< Ec2Script
   class SourceVolumeReadyState < CopySnapshotState
     def enter()
       remote_region()
-      result = launch_instance(@context[:target_ami_id], @context[:target_key_name], 
-        "default")
+      #XXX: create a CloudyScripts Security Group with TCP port 22 publicly opened
+      if @context[:target_security_group] == nil
+        @context[:target_security_group] = Ec2Script::CS_SEC_GRP_NAME
+        create_security_group_with_rules(@context[:target_security_group], Ec2Script::CS_SEC_GRP_DESC,
+          [{:ip_protocol => "tcp", :from_port => 22, :to_port => 22, :cidr_ip => "0.0.0.0/0"}])
+        post_message("'#{@context[:target_security_group]}' Security Group created with TCP port 22 publicly opened.")
+      end
+
+      result = launch_instance(@context[:target_ami_id], @context[:target_key_name], @context[:target_security_group]) 
       @context[:target_instance_id] = result.first
       @context[:target_dns_name] = result[1]
       @context[:target_availability_zone] = result[2]
+
       TargetInstanceLaunchedState.new(@context)
     end
   end
@@ -139,6 +173,7 @@ class CopySnapshot< Ec2Script
       create_labeled_fs(@context[:target_dns_name], device, @context[:fs_type], @context[:label])
       mount_fs(mount_point, device)
       disconnect()
+
       TargetVolumeReadyState.new(@context)
     end
   end
@@ -159,8 +194,8 @@ class CopySnapshot< Ec2Script
       #  @context[:target_ssh_keyfile], "#{key_path}#{@context[:target_key_name]}.pem")
       upload_file(@context[:source_dns_name], @context[:source_ssh_username], @context[:source_ssh_keydata],
         @context[:target_ssh_keyfile], "#{key_path}#{@context[:target_key_name].gsub(/\s+/, '_')}.pem")
-
       post_message("credentials are in place to connect source and target.")
+
       KeyInPlaceState.new(@context)
     end
   end
@@ -187,6 +222,7 @@ class CopySnapshot< Ec2Script
       enable_ssh_tty(@context[:target_dns_name])
       unmount_fs(dest_dir)
       disconnect()
+
       DataCopiedState.new(@context)
     end
   end
@@ -198,28 +234,57 @@ class CopySnapshot< Ec2Script
       remote_region()
       @context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], @context[:description]) 
       @context[:result][:snapshot_id] = @context[:new_snapshot_id]
+
       SnapshotCreatedState.new(@context)
     end
   end
 
   # Operation done. Now only cleanup is missing, i.e. shut down instances and
   # remote the volumes that were created. Start with cleaning the ressources
-  # in the local region.
+  # in both regions.
   class SnapshotCreatedState < CopySnapshotState
     def enter()
+      error = []
       local_region()
-      shut_down_instance(@context[:source_instance_id])
-      delete_volume(@context[:source_volume_id])
-      SourceCleanedUpState.new(@context)
-    end
-  end
-
-  # Cleanup the resources in the target region.
-  class SourceCleanedUpState < CopySnapshotState
-    def enter()
+      begin
+        shut_down_instance(@context[:source_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to shutdown instance '#{@context[:source_instance_id]}' in source region: #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:source_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:source_volume_id]}' in source region: #{e.to_s}")
+      end
+      #XXX: delete Security Group according to its name
+      if @context[:source_security_group].eql?(Ec2Script::CS_SEC_GRP_NAME)
+        delete_security_group(@context[:source_security_group])
+      end
+      #
       remote_region()
-      shut_down_instance(@context[:target_instance_id])
-      delete_volume(@context[:target_volume_id])
+      begin
+        shut_down_instance(@context[:target_instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to shutdown instance '#{@context[:target_instance_id]}' in target region: #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:target_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:target_volume_id]}' in target region: #{e.to_s}")
+      end
+      #XXX: delete Security Group according to its name
+      if @context[:target_security_group].eql?(Ec2Script::CS_SEC_GRP_NAME)
+        delete_security_group(@context[:target_security_group])
+      end
+
+      if error.size() > 0
+        raise Exception.new("Cleanup error(s)")
+      end
+
       Done.new(@context)
     end
   end

data/lib/scripts/ec2/download_snapshot.rb

@@ -38,17 +38,24 @@ class DownloadSnapshot < Ec2Script
       @input_params[:security_group_name] = "default"
     end
     ec2_helper = Ec2Helper.new(@input_params[:ec2_api_handler])
+    if @input_params[:security_group_name] == nil
+      @input_params[:security_group_name] = "default"
+    end
     if !ec2_helper.check_open_port(@input_params[:security_group_name], 22)
-      raise Exception.new("Port 22 must be opened for security group #{@input_params[:security_group_name]} to connect via SSH")
+      #raise Exception.new("Port 22 must be opened for security group #{@input_params[:security_group_name]} to connect via SSH")
+      post_message("'#{@input_params[:security_group_name]}' Security Group not opened port 22 for connect via SSH")
+      @input_params[:security_group_name] = nil
     end
     if !ec2_helper.check_open_port(@input_params[:security_group_name], 80)
-      raise Exception.new("Port 80 must be opened for security group #{@input_params[:security_group_name]} to make the download link work")
+      #raise Exception.new("Port 80 must be opened for security group #{@input_params[:security_group_name]} to make the download link work")
+      post_message("'#{@input_params[:security_group_name]}' Security Group not opened port 80 for download via HTTP")
+      @input_params[:security_group_name] = nil
     end
     if @input_params[:source_device] == nil
-      @input_params[:source_device] = "/dev/sdj1"
+      @input_params[:source_device] = "/dev/sdj"
     end
     if @input_params[:dest_device] == nil
-      @input_params[:dest_device] = "/dev/sdj2"
+      @input_params[:dest_device] = "/dev/sdk"
     end
     if @input_params[:zip_file_dest] == nil
       @input_params[:zip_file_dest] = "/var/www/html"
@@ -83,10 +90,20 @@ class DownloadSnapshot < Ec2Script
   # Start state. First thing to do is to launch the instance.
   class InitialState < DownloadSnapshotState
     def enter
+      #XXX: create a CloudyScripts Security Group with TCP port 22 publicly opened
+      if @context[:security_group_name] == nil
+        @context[:security_group_name] = Ec2Script::CS_SEC_GRP_NAME
+        create_security_group_with_rules(@context[:security_group_name], Ec2Script::CS_SEC_GRP_DESC,
+          [{:ip_protocol => "tcp", :from_port => 22, :to_port => 22, :cidr_ip => "0.0.0.0/0"},
+          {:ip_protocol => "tcp", :from_port => 80, :to_port => 80, :cidr_ip => "0.0.0.0/0"}])
+        post_message("'#{@context[:security_group_name]}' Security Group created with TCP port 22 and 80 publicly opened.")
+      end
+
       result = launch_instance(@context[:ami_id], @context[:key_name], @context[:security_group_name])
       @context[:instance_id] = result.first
       @context[:dns_name] = result[1]
       @context[:availability_zone] = result[2]
+
       InstanceLaunchedState.new(context)
     end
   end
@@ -99,6 +116,7 @@ class DownloadSnapshot < Ec2Script
       size = ec2_helper.volume_prop(@context[:source_volume_id], :size).to_i
       puts "retrieved volume size of #{size}"
       @context[:dest_volume_id] = create_volume(@context[:availability_zone], size)
+
       VolumesCreated.new(@context)
     end
 
@@ -110,6 +128,7 @@ class DownloadSnapshot < Ec2Script
       @context[:script].post_message("Going to create two volumes. One with the snapshot data, one to store the zipped data for download.")
       attach_volume(@context[:source_volume_id], @context[:instance_id], @context[:source_device])
       attach_volume(@context[:dest_volume_id], @context[:instance_id], @context[:dest_device])
+
       VolumesAttached.new(@context)
     end
   end
@@ -122,6 +141,13 @@ class DownloadSnapshot < Ec2Script
         connect(@context[:dns_name], @context[:ssh_username], @context[:ssh_keyfile], @context[:ssh_keydata])
       # source
       source_dir = "/mnt/tmp_#{@context[:source_volume_id]}"
+      # detect partition vs volume: simply check if we have several /dev/sdx* entries
+      parts_count = get_partition_count(@context[:source_device])
+      if parts_count >= 2
+        @context[:script].post_message("Detected specific volume with a valid partition table on device '#{@context[:source_device]}'...")
+        @context[:source_device] = @context[:source_device] + '1'
+        @context[:script].post_message("Using '#{@context[:source_device]}' as source filesystem")
+      end
       mount_fs(source_dir, @context[:source_device])
       @context[:fs_type], @context[:label] = get_partition_fs_type_and_label(source_dir)
       # target
@@ -129,6 +155,7 @@ class DownloadSnapshot < Ec2Script
       #create_fs(@context[:dns_name], @context[:dest_device])
       create_labeled_fs(@context[:dns_name], @context[:dest_device], @context[:fs_type], @context[:label])
       mount_fs(dest_dir, @context[:dest_device])
+
       FileSystemsReady.new(@context)
     end
   end
@@ -138,9 +165,9 @@ class DownloadSnapshot < Ec2Script
     def enter
       mount_point = "/mnt/tmp_#{@context[:source_volume_id]}"
       zip_volume(mount_point, @context[:zip_file_dest], @context[:zip_file_name])
+
       VolumeZippedAndDownloadableState.new(@context)
     end
-
   end
 
   # Volume is zipped and downloadable. Wait 5 minutes.
@@ -158,6 +185,7 @@ class DownloadSnapshot < Ec2Script
     def wait_some_time
       @context[:script].post_message("The snapshot can be downloaded during #{@context[:wait_time]} seconds from link: #{get_link()}")
       sleep(@context[:wait_time])
+
       DownloadStoppedState.new(@context)
     end
   end
@@ -165,17 +193,39 @@ class DownloadSnapshot < Ec2Script
   # Snapshot can no longer be downloaded. Shut down the instance.
   class DownloadStoppedState < DownloadSnapshotState
     def enter
-      shut_down_instance(@context[:instance_id])
-      InstanceShutDown.new(@context)
-    end
-    
-  end
+      error = []
+      begin
+        shut_down_instance(@context[:instance_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to shutdown instance '#{@context[:instance_id]}': #{e.to_s}")
+      end
+      #XXX: delete Security Group according to its name
+      if @context[:security_group_name].eql?(Ec2Script::CS_SEC_GRP_NAME)
+        begin
+          delete_security_group(@context[:security_group_name])
+        rescue Exception => e
+          error << e
+          post_message("Unable to delete Security Group '#{@context[:security_group_name]}': #{e.to_s}")
+        end
+      end
+      begin
+        delete_volume(@context[:source_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:source_volume_id]}': #{e.to_s}")
+      end
+      begin
+        delete_volume(@context[:dest_volume_id])
+      rescue Exception => e
+        error << e
+        post_message("Unable to delete volume '#{@context[:dest_volume_id]}': #{e.to_s}")
+      end
+
+      if error.size() > 0
+        raise Exception.new("Cleanup error(s)")
+      end
 
-  # Instance is shut down. Delete the volume created.
-  class InstanceShutDown < DownloadSnapshotState
-    def enter
-      delete_volume(@context[:source_volume_id])
-      delete_volume(@context[:dest_volume_id])
       Done.new(@context)
     end
   end