cft_smartcloud 0.3.1 → 0.3.2

data/README.md

@@ -89,10 +89,6 @@ This project uses the jeweler gem for packaging. See the tasks:
     rake version:bump:...
     rake build
 
-To publish to RubyForge
-
-    rake gemcutter:release
-
 Screencast
 ===
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/cft_smartcloud.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cft_smartcloud}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["yan", "cohesive"]
-  s.date = %q{2012-03-12}
+  s.date = %q{2011-11-22}
   s.description = %q{CohesiveFT Ruby Interface for IBM SmartCloud and 'smartcloud' command line helper.}
   s.email = %q{yan.pritzker@cohesiveft.com}
   s.executables = ["cft_smartcloud", "smartcloud"]

data/lib/dynamic_help_generator.rb

@@ -46,7 +46,7 @@ module DynamicHelpGenerator
         puts %{  * #{method.to_s}#{'(' + args + ')' if args}#{extra_help}}
     else
       # These verbs help us figure out what 'group' the method belongs to
-      verbs = %w(describe display create get allocate clone export attach detach delete generate update remove restart rename)
+      verbs = %w(describe display create get allocate clone export attach detach delete generate update remove restart rename save)
       verb_noun = /(#{verbs.join('|')})_(.*)(s|es)?/ # we're going to remove the verb and trailing 's'
 
       methods = public_methods - Object.public_methods - ['post','get','put','delete','logger','logger=','help']

data/lib/smartcloud.rb

@@ -202,6 +202,24 @@ class IBMSmartCloud
     response.Image.ID
   end
 
+  help_for :delete_image, [:image_id => :req],  
+  def delete_image(image_id)
+    delete("/offerings/image/#{image_id}")
+    true
+  end
+
+  help_for :delete_images, [:image_ids], %{
+    Example: smartcloud "delete_images(12345,12346,12347)"
+  }
+  def delete_images(*image_id_list)
+    threads=[]
+    image_id_list.each {|image| 
+      threads << Thread.new { logger.info "Sending delete request for: #{image}..."; delete_image(image); logger.info "Finished delete request for #{image}" }
+    }
+    threads.each(&:join)
+    true
+  end
+
   # Launches a clone request and returns ID of new volume
   # TODO: the API call does not work, we have to use the cli for now
   help_for :clone_volume, [:name, :source_disk_id]
@@ -360,15 +378,26 @@ class IBMSmartCloud
   # ex: create_volume("yan", 61, "Small", "20001208", 61)
   #
   # NOTE: storage area id is not currently supported by IBM (according to docs)
-  help_for :create_volume, [{:name => :req},{:location_id => :req},{:size => ['Small','Medium','Large']}, {:offering_id => :opt}, {:format => :opt}]
+  # NOTE: At one point sizes were only handled by "Name". Now they seem to support
+  #       the numbers 60, 256, 512, 1024, 2048, 4112, 8224 and 10240.
+  #       The original names were:
+  #         Small  ==  256 GB
+  #         Medium ==  512 GB
+  #         Large  == 2048 GB
+  #
+  help_for :create_volume, [{:name => :req},{:location_id => :req},
+                            {:size => ['Small','Medium','Large','60','256','512','1024','2048','4112','8224','10240']}, 
+                            {:offering_id => :opt}, {:format => :opt}]
   def create_volume(name, location, size, offering_id=nil, format="EXT3")
 
     # figure out the offering ID automatically based on location and size
     if offering_id.nil?
       logger.debug "Looking up volume offerings based on location: #{location} and size: #{size}"
-      offering = describe_volume_offerings(location, size)
-      offering_id = if offering
-        offering.ID
+
+      filter_size = ( ["Small", "Medium", "Large"].include?( size )) ? size: "Storage" 
+      offering = describe_volume_offerings(location, filter_size)
+      if( offering && offering.SupportedSizes.split(",").include?(size) || ["Small", "Medium", "Large"].include?( size ))
+        offering_id = offering.ID
       else
         raise "Unable to locate offering with location #{location}, size #{size}."
       end
@@ -502,6 +531,12 @@ class IBMSmartCloud
     put("/instances/#{instance_id}", :state => "restart")
     true
   end
+  
+  help_for :save_instance, [:instance_id, :name, :desc]
+  def save_instance(instance_id, name, desc = "")
+    put("/instances/#{instance_id}", :state => "save", :name => name, :description => desc)
+    true
+  end
 
   help_for :describe_instance, [:instance_id]
   def describe_instance(instance_id)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cft_smartcloud
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - yan
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 -05:00
+date: 2011-11-22 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -232,23 +233,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: CohesiveFT IBM SmartCloud API Gem