CloudyScripts 2.14.58 → 2.14.60

data/Rakefile

@@ -13,7 +13,7 @@ require 'rake/testtask'
 spec = Gem::Specification.new do |s|
   s.name = 'CloudyScripts'
   #s.version = '2.14.54' #<number cloud-stacks supported>.<number cloud-scripts>.<counting releases>
-  s.version = '2.14.58' #<number cloud-stacks supported>.<number cloud-scripts>.<counting releases>
+  s.version = '2.14.60' #<number cloud-stacks supported>.<number cloud-scripts>.<counting releases>
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
   s.summary = 'Scripts to facilitate programming for infrastructure clouds.'

data/lib/help/helper.rb

@@ -0,0 +1,14 @@
+#
+# Function that can be used in the whole library
+#
+
+
+# Check if string is not more than 255 character and contains wide char
+def check_string_alnum(str)
+  if str.match(/^[0-9a-z\-\_\ ]{1,255}$/i)
+    return true
+  else
+    return false
+  end
+  return true
+end

data/lib/help/remote_command_handler.rb

@@ -69,13 +69,29 @@ class RemoteCommandHandler
     get_output("uname -r").strip
   end
 
+  # Return all the partitions of a device
+  def get_device_partition(device)
+    get_output("ls #{device}*").strip
+  end
+
+  # Get the partition table of a device
+  def get_partition_table(device)
+    get_output("sfdisk -d #{device}")
+  end
+
+  # GSet the partition table of a device
+  def set_partition_table(device, partition_table)
+    push_data = "\"" + partition_table.gsub(/\/dev\/(s|xv)d[a-z]/, "#{device}") + "\""
+    remote_execute("sfdisk -f #{device}", push_data, nil)
+  end
+
   # Get root partition label
   def get_root_device()
     #get_output("cat /etc/mtab | grep -E '[[:blank:]]+\/[[:blank:]]+' | cut -d ' ' -f 1").strip
     get_output("mount | grep -E '[[:blank:]]+\/[[:blank:]]+' | cut -d ' ' -f 1").strip
   end
 
-  # Get partition label
+  # Get the device of a specific partition
   def get_partition_device(part)
     #get_output("cat /etc/mtab | grep -E '[[:blank:]]+" + "#{part}" + "[[:blank:]]+' | cut -d ' ' -f 1").strip
     get_output("mount | grep -E '[[:blank:]]+" + "#{part}" + "[[:blank:]]+' | cut -d ' ' -f 1").strip
@@ -351,7 +367,7 @@ class RemoteCommandHandler
 
   def upload(ip, user, key_data, local_file, destination_file, timeout = 60)
     Timeout::timeout(timeout) {
-      Net::SCP.start(ip, user, {:key_data => [key_data], :timeout => timeout}) do |scp|
+      Net::SCP.start(ip, user, {:key_data => [key_data], :timeout => timeout, :paranoid => false, :verbose => :warn}) do |scp|
         scp.upload!(local_file, destination_file)
       end
     }

data/lib/help/script_execution_state.rb

@@ -74,6 +74,10 @@ class ScriptExecutionState
     s.sub(/.*\:\:/,'')
   end
 
+  def get_superclass_name
+    self.class.name.split('::').first()
+  end
+
   private
 
   # Notifies all listeners of state changes

data/lib/help/state_transition_helper.rb

@@ -535,7 +535,7 @@ module StateTransitionHelper
   # * image_id => ID of the AMI created and registered
   def register_snapshot(snapshot_id, name, root_device_name, description, kernel_id, ramdisk_id, architecture)
     post_message("going to register snapshot #{snapshot_id}...")
-    @logger.debug "register snapshot #{snapshot_id} as #{name} using AKI '#{kernel_id}' ARI '#{ramdisk_id}' and arch '#{architecture}'"
+    @logger.debug "register snapshot #{snapshot_id} as #{name} using AKI '#{kernel_id}', ARI '#{ramdisk_id}', arch '#{architecture}' and RootDevice '#{root_device_name}'"
     res = ec2_handler().register_image_updated(:snapshot_id => snapshot_id,
       :kernel_id => kernel_id, :architecture => architecture,
       :root_device_name => root_device_name,
@@ -705,6 +705,70 @@ module StateTransitionHelper
     post_message("#{msg}")
   end
 
+  # Get partition count
+  def get_partition_count(device)
+    post_message("Checking partition on device '#{device}'...")
+    #XXX: detect new kernel that have /dev/xvdX device node instead of /dev/sdX
+    if device =~ /\/dev\/sd[a-z]/
+      if !remote_handler().file_exists?(device)
+        post_message("'#{device}' device node not found, checking for new kernel support...")
+        @logger.debug "'#{device}' device node not found, checking for new kernel support" 
+        new_device = device.gsub('sd', 'xvd')
+        if remote_handler().file_exists?(new_device)
+          post_message("'#{new_device}' device node found")
+          @logger.debug "'#{new_device}' device node found"
+          device = new_device
+        end
+      end
+    end
+    parts = remote_handler().get_device_partition(device).split(/[[:space:]]+/)
+    @logger.debug "Found '#{parts}' on device '#{device}'"
+    return parts.size()
+  end
+
+  # Get partition table
+  def get_partition_table(device)
+    post_message("Retrieving the partition table of device '#{device}'...")
+    #XXX: detect new kernel that have /dev/xvdX device node instead of /dev/sdX
+    if device =~ /\/dev\/sd[a-z]/
+      if !remote_handler().file_exists?(device)
+        post_message("'#{device}' device node not found, checking for new kernel support...")
+        @logger.debug "'#{device}' device node not found, checking for new kernel support" 
+        new_device = device.gsub('sd', 'xvd')
+        if remote_handler().file_exists?(new_device)
+          post_message("'#{new_device}' device node found")
+          @logger.debug "'#{new_device}' device node found"
+          device = new_device
+        end
+      end
+    end
+    partition_table = remote_handler().get_partition_table(device)
+    # remove ^M char
+    partition_table.gsub!("\015", "")
+    @logger.debug "Found the following partition table on device '#{device}'\n#{partition_table}"
+    return partition_table
+  end
+
+  # Set partition table
+  def set_partition_table(device, partition_table)
+    post_message("Setting the partition table of device '#{device}'...")
+    #XXX: detect new kernel that have /dev/xvdX device node instead of /dev/sdX
+    if device =~ /\/dev\/sd[a-z]/
+      if !remote_handler().file_exists?(device)
+        post_message("'#{device}' device node not found, checking for new kernel support...")
+        @logger.debug "'#{device}' device node not found, checking for new kernel support" 
+        new_device = device.gsub('sd', 'xvd')
+        if remote_handler().file_exists?(new_device)
+          post_message("'#{new_device}' device node found")
+          @logger.debug "'#{new_device}' device node found"
+          device = new_device
+        end
+      end
+    end
+    remote_handler().set_partition_table(device, partition_table.gsub(/\/dev\/(s|xv)d[a-z]/, "#{device}"))
+    @logger.debug "Partition table set on device '#{device}'"
+  end
+
   # Get root partition
   def get_root_device_name()
     post_message("Retrieving '/' root device name...")
@@ -1296,18 +1360,7 @@ module StateTransitionHelper
     return region
   end
 
-  # Check if string is not more than 255 character and contains wide char
-  def check_string_alnum(str)
-    if str.match(/^[0-9a-z\-\_\ ]{1,255}$/i)
-      return 0
-    else
-      return 1
-    end
-    return 1
-  end
-
   #setting/retrieving handlers
-
   def remote_handler()
     if @remote_handler == nil
       if @context[:remote_command_handler] == nil

data/lib/scripts/ec2/copy_ami.rb

@@ -4,6 +4,8 @@ require "help/remote_command_handler"
 require "help/dm_crypt_helper"
 require "help/ec2_helper"
 require "AWS"
+require "help/helper"
+
 
 # Copy a given snapshot to another region
 # * start up instance in source-region, create a snapshot from the mounted EBS
@@ -65,8 +67,8 @@ class CopyAmi < 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])
-      @input_params[:description] = "Created by Cloudy_Scripts - copy_ami"
+    if @input_params[:description] == nil || !check_string_alnum(@input_params[:description])
+      @input_params[:description] = "Created by CloudyScripts - #{self.class.name}"
     end
   end
 
@@ -107,10 +109,11 @@ class CopyAmi < Ec2Script
     end
   end
 
- # Source is started. Create a snapshot on the volume that is linked to the instance.
+  # Source is started. Create a snapshot on the volume that is linked to the instance.
   class SourceInstanceLaunchedState < CopyAmiState
     def enter()
-      @context[:snapshot_id] = create_snapshot(@context[:ebs_volume_id], "Cloudy_Scripts Snapshot for copying AMIs")
+      @context[:snapshot_id] = create_snapshot(@context[:ebs_volume_id], 
+        "Created by CloudyScripts - #{self.get_superclass_name()} from #{@context[:ebs_volume_id]}")
       AmiSnapshotCreatedState.new(@context)
     end
   end
@@ -132,13 +135,31 @@ class CopyAmi < Ec2Script
       os_letter = root_device_name.split('/')[2].gsub('sd', '').gsub('xvd', '').gsub(/[0-9]/, '')
       aws_device_letter = device.split('/')[2].gsub('sd', '').gsub('xvd', '').gsub(/[0-9]/, '')
       if !aws_letter.eql?(os_letter)
-        post_message("Detected specific kernel with shift between AWS and Kernel OS for device naming")
+        post_message("Detected specific kernel with shift between AWS and Kernel OS for device naming: '#{aws_root_device}' vs '#{root_device_name}'")
       end
       while !aws_letter.eql?(os_letter)
         aws_letter.succ!
         aws_device_letter.succ!
       end
-      device = "/dev/sd#{aws_device_letter}" 
+
+      device = "/dev/sd#{aws_device_letter}"
+      # detect root partition vs root volume: simply check if we have several /dev/sdx* entries
+      parts_count = get_partition_count(device)
+      if parts_count >= 2
+        # retrieve partition table, in order to restore it in the target region
+        post_message("Detected specific volume with a valid partition table on device '#{device}'...")
+        partition_table = get_partition_table(device)
+        @context[:partition_table] = partition_table
+        #XXX: HANDLE at a LOWER LEVEL
+        # update partition table with device
+        # s/device/@context[:temp_device_name]/ on partition table 
+        #@context[:partition_table] = partition_table.gsub("#{device}", "#{@context[:temp_device_name]}")
+        # retrieve the root partition number
+        os_nb = root_device_name.split('/')[2].gsub('sd', '').gsub('xvd', '').gsub(/[a-z]/, '')
+        device = device + os_nb
+        @context[:root_partition_nb] = os_nb
+        post_message("Using root partition: '#{device}'...")
+      end
       post_message("Using AWS name '#{@context[:temp_device_name]}' and OS name '#{device}'")
       mount_fs(mount_point, device)
       # get root partition label and filesystem type
@@ -176,6 +197,17 @@ class CopyAmi < Ec2Script
       mount_point = "/mnt/tmp_#{@context[:target_volume_id]}"
       attach_volume(@context[:target_volume_id], @context[:target_instance_id], device)
       connect(@context[:target_dns_name], @context[:target_ssh_username], nil, @context[:target_ssh_keydata])
+      # check if we need to create a partition table
+      if !(@context[:partition_table] == nil)
+        post_message("Creating a partition table on device '#{device}'...")
+        set_partition_table(device, @context[:partition_table])
+        #XXX: HANDLE at a LOWER LEVEL
+        # before adding partition table, adjust device name
+        #set_partition_table(device, @context[:partition_table].gsub(/\/dev\/(s|xv)d[a-z]/, "#{@context[:temp_device_name]}"))
+        # adjust partition to mount
+        device = device + @context[:root_partition_nb]
+      end
+      # make root partition
       create_labeled_fs(@context[:target_dns_name], device, @context[:fs_type], @context[:label])
       mount_fs(mount_point, device)
       disconnect()
@@ -233,8 +265,8 @@ class CopyAmi < Ec2Script
   class DataCopiedState < CopyAmiState
     def enter()
       remote_region()
-      #@context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], "Created by Cloudy_Scripts - copy_ami")
-      @context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], @context[:description])
+      @context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], 
+        "Created by CloudyScripts - #{self.get_superclass_name()} from #{@context[:target_volume_id]}")
       TargetSnapshotCreatedState.new(@context)
     end
   end
@@ -246,9 +278,13 @@ class CopyAmi < Ec2Script
       # Get Amazon Kernel Image ID
       aki = get_aws_kernel_image_aki(@context[:source_availability_zone], @context[:kernel_id],
         @context[:target_availability_zone])
+      device = @context[:root_device_name]
+      if !(@context[:partition_table] == nil)
+        device.gsub!(/[0-9]/, '')
+        post_message("Using BlockDevice for snapshot registration rather than RootDevice '#{device}' due to a valid partition table on device...")
+      end
       @context[:result][:image_id] = register_snapshot(@context[:new_snapshot_id], @context[:name],
-        @context[:root_device_name], @context[:description], aki,
-        nil, @context[:architecture])
+        device, @context[:description], aki, nil, @context[:architecture])
       AmiRegisteredState.new(@context)
     end
   end

data/lib/scripts/ec2/copy_mswindows_ami.rb

@@ -4,6 +4,8 @@ require "help/remote_command_handler"
 require "help/dm_crypt_helper"
 require "help/ec2_helper"
 require "AWS"
+require "help/helper"
+
 
 # Copy a given snapshot to another region
 # * start up instance in source-region, create a snapshot from the mounted EBS
@@ -102,8 +104,8 @@ class CopyMsWindowsAmi < Ec2Script
     if @input_params[:fs_type] == nil
       @input_params[:fs_type] = "ext3"
     end
-    if @input_params[:description] == nil || check_string_alnum(@input_params[:description])
-      @input_params[:description] = "Created by Cloudy_Scripts - copy_mswindows_ami"
+    if @input_params[:description] == nil || !check_string_alnum(@input_params[:description])
+      @input_params[:description] = "Created by CloudyScripts - #{self.class.name}"
     end
   end
 
@@ -173,7 +175,8 @@ class CopyMsWindowsAmi < Ec2Script
       stop_instance(instance_id) 
       post_message("Instance '#{instance_id}' stopped, creating snapshot")
       ebs_volume_id = ec2_helper.get_attached_volumes(instance_id)[0]['volumeId']
-      @context[:snapshot_id] = create_snapshot(ebs_volume_id, "Cloudy_Scripts Snapshot for copying AMIs")
+      @context[:snapshot_id] = create_snapshot(ebs_volume_id, 
+        "Created by CloudyScripts - #{self.class.name} from #{ebs_volume_id}")
 
       InitialStateDone.new(@context)
     end

data/lib/scripts/ec2/copy_mswindows_snapshot.rb

@@ -4,7 +4,8 @@ require "help/remote_command_handler"
 require "help/dm_crypt_helper"
 require "help/ec2_helper"
 require "AWS"
-#require 'pp'
+require "help/helper"
+
 
 # Copy a given snapshot to another region
 # * start up instance in source-region, create a snapshot from the mounted EBS
@@ -83,8 +84,8 @@ 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])
-      @input_params[:description] = "Created by Cloudy_Scripts - copy_mswindows_snapshot"
+    if @input_params[:description] == nil || !check_string_alnum(@input_params[:description])
+      @input_params[:description] = "Created by CloudyScripts - #{self.class.name}"
     end
     if @input_params[:compression] != nil && (@input_params[:compression] =~ /^on$/i)
       @input_params[:compression] = true
@@ -376,7 +377,6 @@ class CopyMsWindowsSnapshot < Ec2Script
     def enter()
       remote_region()
       detach_volume(@context[:target_volume_id], @context[:target_instance_id])
-      #@context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], "Created by CloudyScripts - copy_mswindows_ami")
       @context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], @context[:description])
       @context[:result][:snapshot_id] = @context[:new_snapshot_id]
 

data/lib/scripts/ec2/copy_snapshot.rb

@@ -4,6 +4,8 @@ require "help/remote_command_handler"
 require "help/dm_crypt_helper"
 require "help/ec2_helper"
 require "AWS"
+require "help/helper"
+
 
 # Copy a given snapshot to another region
 # * start up instance in source-region, create volume from snapshot, attach volume, and mount it
@@ -49,8 +51,8 @@ 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])
-      @input_params[:description] = "Created by Cloudy_Scripts - copy_snapshot"
+    if @input_params[:description] == nil || !check_string_alnum(@input_params[:description])
+      @input_params[:description] = "Created by CloudyScripts - #{self.class.name}" 
     end
   end
 
@@ -194,8 +196,7 @@ class CopySnapshot< Ec2Script
   class DataCopiedState < CopySnapshotState
     def enter()
       remote_region()
-      #@context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], "Created by Cloudy_Scripts - copy_snapshot")
-      @context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], @context[:description])
+      @context[:new_snapshot_id] = create_snapshot(@context[:target_volume_id], @context[:description]) 
       @context[:result][:snapshot_id] = @context[:new_snapshot_id]
       SnapshotCreatedState.new(@context)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 79
   prerelease: false
   segments: 
   - 2
   - 14
-  - 58
-  version: 2.14.58
+  - 60
+  version: 2.14.60
 platform: ruby
 authors: 
 - Matthias Jung
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-13 00:00:00 +00:00
+date: 2012-07-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -274,6 +274,7 @@ files:
 - lib/help/v_cloud_transition_helper.rb
 - lib/help/v_cloud_api_handler.rb
 - lib/help/remote_command_handler.rb
+- lib/help/helper.rb
 - lib/help/state_change_listener.rb
 - lib/cloudyscripts.rb
 has_rdoc: true