CloudyScripts 0.0.5 → 0.0.6

data/Rakefile

@@ -12,7 +12,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'CloudyScripts'
-  s.version = '0.0.5'
+  s.version = '0.0.6'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
   s.summary = 'Scripts to facilitate programming for infrastructure clouds.'

data/lib/help/ec2_helper.rb

@@ -0,0 +1,54 @@
+require "AWS"
+
+# Implements some helper methods around the EC2 API and methods that are
+# not yet implemented in the amazon-ec2 gem
+
+class AWS::EC2::Base
+  def describe_instance_attribute(options)
+    params = {}
+    params["InstanceId"] = options[:instance_id].to_s
+    params["Attribute"] = "rootDeviceName" unless options[:attributes][:rootDeviceName] == nil
+    return response_generator(:action => "DescribeInstanceAttribute", :params => params)
+  end
+end
+
+class Ec2Helper
+  # expects an instance of AWS::EC2::Base from the amazon-ec2 gem
+  def initialize(ec2_api)
+    @ec2_api = ec2_api
+  end
+
+  # Checks if the specified volume is acting as a root-device for the instance
+  # to which it is attached. It therefore first calls ec2_describe_volumes() to
+  # retrieve the instance linked to the volume specified, then calls
+  # ec2_describe_instance_attribute() to retrieve the rootDeviceName of that
+  # instance, and finally calls describe_instances() to retrieve all volumes
+  # to check against volume_id and rootDeviceName.
+  def is_root_device?(volume_id)
+    vols = @ec2_api.describe_volumes(:volume_id => volume_id)
+    if vols['volumeSet']['item'][0]['attachmentSet'] == nil || vols['volumeSet']['item'][0]['attachmentSet']['item'].size == 0
+      #not linked to any instance, cannot be a root-device
+      return false
+    end
+    instance_id = vols['volumeSet']['item'][0]['attachmentSet']['item'][0]['instanceId']
+    res = @ec2_api.describe_instance_attribute(:instance_id => instance_id, :attributes => {:rootDeviceName => true})
+    if res["rootDeviceName"] == nil
+      return false
+    end
+    rdn = res['rootDeviceName']['value']
+    res = @ec2_api.describe_instances(:instance_id => instance_id)
+    if res['reservationSet']['item'][0]['instancesSet']['item'][0]['blockDeviceMapping']['item'].size == 0
+      # volume unattached in the meantime
+      return false
+    end
+    attached = res['reservationSet']['item'][0]['instancesSet']['item'][0]['blockDeviceMapping']['item']
+    attached.each() {|ebs|
+      volume = ebs['ebs']['volumeId']
+      device_name = ebs['deviceName']
+      if volume == volume_id && rdn == device_name
+        return true
+      end
+    }
+    return false
+  end
+end

data/lib/scripts/ec2/ami2_ebs_conversion.rb

@@ -154,7 +154,6 @@ class Ami2EbsConversion < Ec2Script
       @logger.debug "start up AMI #{@context[:ami_id]}"
       res = @context[:ec2_api_handler].run_instances(:image_id => @context[:ami_id], 
         :security_group => @context[:security_group_name], :key_name => @context[:key_name])
-      puts "res = #{res.inspect}"#TODO:remove
       instance_id = res['instancesSet']['item'][0]['instanceId']
       @context[:instance_id] = instance_id
       @logger.info "started instance #{instance_id}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: CloudyScripts
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Matthias Jung
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +01:00
+date: 2010-01-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - Rakefile
 - lib/cloudyscripts.rb
 - lib/help/dm_crypt_helper.rb
+- lib/help/ec2_helper.rb
 - lib/help/remote_command_handler.rb
 - lib/help/script_execution_state.rb
 - lib/help/state_change_listener.rb