cft_smartcloud 0.1.5 → 0.1.8

data/CHANGELOG

@@ -1,3 +1,12 @@
+2011-08-09 0.1.8:
+ * Updated create_instance to return the Instance object rather 
+   than the xml request, for consistency with describe_instance
+ * Improved help system, especially for create_instance
+
+2011-08-05 0.1.6:
+ * clone volume changed to api call instead of CLI
+ * support for deleting multiple volumes at once (delete_volumes)
+
 2011-07-25 0.1.4:
  * Better display of launch times
  * delete_unused_keys function deletes all unused keys, prompting for each one

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.8

data/cft_smartcloud.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cft_smartcloud}
-  s.version = "0.1.5"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["yan", "cohesive"]
-  s.date = %q{2011-07-26}
+  s.date = %q{2011-08-10}
   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"]
@@ -27,95 +27,6 @@ Gem::Specification.new do |s|
      "bin/cft_smartcloud",
      "bin/smartcloud",
      "cft_smartcloud.gemspec",
-     "lib/cli_tools/README.txt",
-     "lib/cli_tools/ic-add-keypair.cmd",
-     "lib/cli_tools/ic-add-keypair.sh",
-     "lib/cli_tools/ic-allocate-address.cmd",
-     "lib/cli_tools/ic-allocate-address.sh",
-     "lib/cli_tools/ic-attach-volume.cmd",
-     "lib/cli_tools/ic-attach-volume.sh",
-     "lib/cli_tools/ic-clone-image.cmd",
-     "lib/cli_tools/ic-clone-image.sh",
-     "lib/cli_tools/ic-clone-volume.cmd",
-     "lib/cli_tools/ic-clone-volume.sh",
-     "lib/cli_tools/ic-cmd.cmd",
-     "lib/cli_tools/ic-cmd.sh",
-     "lib/cli_tools/ic-create-instance.cmd",
-     "lib/cli_tools/ic-create-instance.sh",
-     "lib/cli_tools/ic-create-password.cmd",
-     "lib/cli_tools/ic-create-password.sh",
-     "lib/cli_tools/ic-create-volume.cmd",
-     "lib/cli_tools/ic-create-volume.sh",
-     "lib/cli_tools/ic-delete-image.cmd",
-     "lib/cli_tools/ic-delete-image.sh",
-     "lib/cli_tools/ic-delete-instance.cmd",
-     "lib/cli_tools/ic-delete-instance.sh",
-     "lib/cli_tools/ic-delete-volume.cmd",
-     "lib/cli_tools/ic-delete-volume.sh",
-     "lib/cli_tools/ic-describe-address-offerings.cmd",
-     "lib/cli_tools/ic-describe-address-offerings.sh",
-     "lib/cli_tools/ic-describe-addresses.cmd",
-     "lib/cli_tools/ic-describe-addresses.sh",
-     "lib/cli_tools/ic-describe-image-agreement.cmd",
-     "lib/cli_tools/ic-describe-image-agreement.sh",
-     "lib/cli_tools/ic-describe-image.cmd",
-     "lib/cli_tools/ic-describe-image.sh",
-     "lib/cli_tools/ic-describe-images.cmd",
-     "lib/cli_tools/ic-describe-images.sh",
-     "lib/cli_tools/ic-describe-instance.cmd",
-     "lib/cli_tools/ic-describe-instance.sh",
-     "lib/cli_tools/ic-describe-instances.cmd",
-     "lib/cli_tools/ic-describe-instances.sh",
-     "lib/cli_tools/ic-describe-keypair.cmd",
-     "lib/cli_tools/ic-describe-keypair.sh",
-     "lib/cli_tools/ic-describe-keypairs.cmd",
-     "lib/cli_tools/ic-describe-keypairs.sh",
-     "lib/cli_tools/ic-describe-location.cmd",
-     "lib/cli_tools/ic-describe-location.sh",
-     "lib/cli_tools/ic-describe-locations.cmd",
-     "lib/cli_tools/ic-describe-locations.sh",
-     "lib/cli_tools/ic-describe-request.cmd",
-     "lib/cli_tools/ic-describe-request.sh",
-     "lib/cli_tools/ic-describe-vlans.cmd",
-     "lib/cli_tools/ic-describe-vlans.sh",
-     "lib/cli_tools/ic-describe-volume-offerings.cmd",
-     "lib/cli_tools/ic-describe-volume-offerings.sh",
-     "lib/cli_tools/ic-describe-volume.cmd",
-     "lib/cli_tools/ic-describe-volume.sh",
-     "lib/cli_tools/ic-describe-volumes.cmd",
-     "lib/cli_tools/ic-describe-volumes.sh",
-     "lib/cli_tools/ic-detach-volume.cmd",
-     "lib/cli_tools/ic-detach-volume.sh",
-     "lib/cli_tools/ic-extend-reservation.cmd",
-     "lib/cli_tools/ic-extend-reservation.sh",
-     "lib/cli_tools/ic-generate-keypair.cmd",
-     "lib/cli_tools/ic-generate-keypair.sh",
-     "lib/cli_tools/ic-release-address.cmd",
-     "lib/cli_tools/ic-release-address.sh",
-     "lib/cli_tools/ic-remove-keypair.cmd",
-     "lib/cli_tools/ic-remove-keypair.sh",
-     "lib/cli_tools/ic-restart-instance.cmd",
-     "lib/cli_tools/ic-restart-instance.sh",
-     "lib/cli_tools/ic-save-instance.cmd",
-     "lib/cli_tools/ic-save-instance.sh",
-     "lib/cli_tools/ic-set-default-key.cmd",
-     "lib/cli_tools/ic-set-default-key.sh",
-     "lib/cli_tools/ic-update-instance.cmd",
-     "lib/cli_tools/ic-update-instance.sh",
-     "lib/cli_tools/ic-update-keypair.cmd",
-     "lib/cli_tools/ic-update-keypair.sh",
-     "lib/cli_tools/lib/DeveloperCloud_API_Client_JAR.jar",
-     "lib/cli_tools/lib/DeveloperCloud_CMD_Tool.jar",
-     "lib/cli_tools/lib/commons-beanutils-1.6.1.jar",
-     "lib/cli_tools/lib/commons-cli-1.2.jar",
-     "lib/cli_tools/lib/commons-codec-1.3.jar",
-     "lib/cli_tools/lib/commons-collections-3.2.1.jar",
-     "lib/cli_tools/lib/commons-digester-1.8.jar",
-     "lib/cli_tools/lib/commons-httpclient-3.1.jar",
-     "lib/cli_tools/lib/commons-lang-2.3.jar",
-     "lib/cli_tools/lib/commons-logging-1.1.1.jar",
-     "lib/cli_tools/logging.properties",
-     "lib/cli_tools/manifest.rmd",
      "lib/config/config.yml",
      "lib/hash_fix.rb",
      "lib/mime-types-1.16/History.txt",

data/lib/smartcloud.rb

@@ -23,8 +23,6 @@ require 'hash_fix'
 require 'xmlsimple'
 require 'smartcloud_logger'
 
-IBM_TOOLS_HOME=File.join(File.dirname(__FILE__), "cli_tools") unless defined?(IBM_TOOLS_HOME)
-
 # Encapsulates communications with IBM SmartCloud via REST
 class IBMSmartCloud
 
@@ -49,17 +47,24 @@ class IBMSmartCloud
   class << self
     @config = YAML.load_file(File.join(File.dirname(__FILE__), "config/config.yml"))
     attr_reader :method_help
+    attr_reader :method_help_supplemental
     attr_reader :config
   end
 
-  def self.args(method, args)
+  def self.args(method, args, extra_help={})
     @method_help||={}
+    @method_help_supplemental||={}
     @method_help[method.to_s] = args
+    @method_help_supplemental[method.to_s] = extra_help
   end
 
   def help(method=nil)
     if method
       args = (self.class.method_help[method.to_s]) 
+      if !(self.respond_to?(method))
+        return "Sorry, I don't know method: #{method}"
+      end
+
       if args.nil?
         puts method.to_s
       else
@@ -80,7 +85,9 @@ class IBMSmartCloud
           end
         end.join(", ")
 
-        puts "#{method.to_s}(#{args})"
+        extra_help = self.class.method_help_supplemental[method.to_s] || ""
+
+        puts "#{method.to_s}(#{args})\n#{extra_help}"
       end
     else
       methods = public_methods - Object.public_methods - ['post','get','put','delete','logger','logger=','help']
@@ -102,7 +109,12 @@ class IBMSmartCloud
   # CLI-style attribute naming. I.e. "image-id" or "data-center"
   # or API-style (imageID, location). If the CLI-style params are
   # provided, they will be remapped to the correct API params.
-  args :create_instance, [:instance_params_hash]
+  args :create_instance, [:instance_params_hash], %{
+    Available hash keys: :name, :imageID, :instanceType, :location, :publicKey, :ip, :volumeID, 
+                         :ConfigurationData, :vlanID, :antiCollocationInstance, :isMiniEphemeral
+
+    Example: smartcloud "create_instance(:name => 'MyTest', :instanceType=>'COP32.1/2048/60', ...)"
+  }
   def create_instance(instance_params)
     param_remap = { "name" => "name",
       "image-id" => "imageID",
@@ -134,7 +146,8 @@ class IBMSmartCloud
       config_data_params.each {|k,v| instance_params[k]=v} # add it into the standard instance params array
     end
 
-    post "/instances", instance_params, param_remap
+    result = post "/instances", instance_params, param_remap
+    result.Instance
   end
 
   # Find a location by its name. Assumes locations have unique names (not verified by ibm docs)
@@ -184,12 +197,12 @@ class IBMSmartCloud
   # TODO: the API call does not work, we have to use the cli for now
   args :clone_volume, [:name, :source_disk_id]
   def clone_volume(name, source_disk_id)
-    # result = post("/storage", :name => name, :SourceDiskID => source_disk_id)
-    # result.Volume.ID
-    create_password_file
-    result = run_ibm_tool("ic-clone-volume.sh -n #{name} -S #{source_disk_id}")
-    result =~ /ID : (.*)/
-    return $1 # grab the id of the created volume
+    original_disk = describe_volume(source_disk_id)
+    logger.info "Looking up volume #{source_disk_id} to prepare for cloning..."
+    offering = describe_volume_offerings(original_disk.Location).detect {|offer| offer.ID == original_disk.OfferingID}
+    logger.info "Original volume size: #{offering.Name}"
+    result = post("/storage", :name => name, :SourceDiskID => source_disk_id, :format => original_disk.Format.upcase, :location => original_disk.Location, :size => offering.Name, :offeringID => original_disk.OfferingID )
+    result.Volume.ID
   end
 
   # Delete the volume
@@ -199,6 +212,11 @@ class IBMSmartCloud
     true
   end
 
+  args :delete_volumes, [:array_of_vol_ids]
+  def delete_volumes(vol_id_list)
+    vol_id_list.each {|vol| delete_volume(vol)}
+  end
+
   # generates a keypair and returns the private key
   args :generate_keypair, [:name]
   def generate_keypair(name)
@@ -585,41 +603,6 @@ class IBMSmartCloud
     array_or_object.is_a?(Array) ? array_or_object : [array_or_object]
   end
 
-  # TODO: all methods below here can be nuked once CLI tools are removed
-  def run_ibm_tool(command)
-    cmd = "cd #{IBM_TOOLS_HOME} && ./#{command} -u #{@username} -w #{passphrase} -g #{password_file}"
-    logger.debug cmd
-    output = if @debug
-      IBMMockResponseGenerator.respond(command)
-    else
-      `#{cmd}` 
-    end
-
-    logger.debug output
-
-    if output =~ /ErrorMessage : (.*)/
-      raise $1 # raise the error message matched above
-    else
-      return output
-    end
-  end
- 
-  def create_password_file
-    # if no passphrase or password file is supplied, we'll generate it
-    run_ibm_tool("ic-create-password.sh -u #{@username} -p #{@password}")
-  end
-
-  def password_file
-    @password_file ||= "/tmp/smrtcloud-pwfile-#{Time.now.to_i.to_s}"
-  end
-
-  def passphrase
-    @passphrase ||= Time.now.to_i.to_s
-  end
-  # End CLI tool helpers 
-  
-  
-
 end
 
 # predefine an instance for convenience

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - yan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -07:00
+date: 2011-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -39,95 +39,6 @@ files:
 - bin/cft_smartcloud
 - bin/smartcloud
 - cft_smartcloud.gemspec
-- lib/cli_tools/README.txt
-- lib/cli_tools/ic-add-keypair.cmd
-- lib/cli_tools/ic-add-keypair.sh
-- lib/cli_tools/ic-allocate-address.cmd
-- lib/cli_tools/ic-allocate-address.sh
-- lib/cli_tools/ic-attach-volume.cmd
-- lib/cli_tools/ic-attach-volume.sh
-- lib/cli_tools/ic-clone-image.cmd
-- lib/cli_tools/ic-clone-image.sh
-- lib/cli_tools/ic-clone-volume.cmd
-- lib/cli_tools/ic-clone-volume.sh
-- lib/cli_tools/ic-cmd.cmd
-- lib/cli_tools/ic-cmd.sh
-- lib/cli_tools/ic-create-instance.cmd
-- lib/cli_tools/ic-create-instance.sh
-- lib/cli_tools/ic-create-password.cmd
-- lib/cli_tools/ic-create-password.sh
-- lib/cli_tools/ic-create-volume.cmd
-- lib/cli_tools/ic-create-volume.sh
-- lib/cli_tools/ic-delete-image.cmd
-- lib/cli_tools/ic-delete-image.sh
-- lib/cli_tools/ic-delete-instance.cmd
-- lib/cli_tools/ic-delete-instance.sh
-- lib/cli_tools/ic-delete-volume.cmd
-- lib/cli_tools/ic-delete-volume.sh
-- lib/cli_tools/ic-describe-address-offerings.cmd
-- lib/cli_tools/ic-describe-address-offerings.sh
-- lib/cli_tools/ic-describe-addresses.cmd
-- lib/cli_tools/ic-describe-addresses.sh
-- lib/cli_tools/ic-describe-image-agreement.cmd
-- lib/cli_tools/ic-describe-image-agreement.sh
-- lib/cli_tools/ic-describe-image.cmd
-- lib/cli_tools/ic-describe-image.sh
-- lib/cli_tools/ic-describe-images.cmd
-- lib/cli_tools/ic-describe-images.sh
-- lib/cli_tools/ic-describe-instance.cmd
-- lib/cli_tools/ic-describe-instance.sh
-- lib/cli_tools/ic-describe-instances.cmd
-- lib/cli_tools/ic-describe-instances.sh
-- lib/cli_tools/ic-describe-keypair.cmd
-- lib/cli_tools/ic-describe-keypair.sh
-- lib/cli_tools/ic-describe-keypairs.cmd
-- lib/cli_tools/ic-describe-keypairs.sh
-- lib/cli_tools/ic-describe-location.cmd
-- lib/cli_tools/ic-describe-location.sh
-- lib/cli_tools/ic-describe-locations.cmd
-- lib/cli_tools/ic-describe-locations.sh
-- lib/cli_tools/ic-describe-request.cmd
-- lib/cli_tools/ic-describe-request.sh
-- lib/cli_tools/ic-describe-vlans.cmd
-- lib/cli_tools/ic-describe-vlans.sh
-- lib/cli_tools/ic-describe-volume-offerings.cmd
-- lib/cli_tools/ic-describe-volume-offerings.sh
-- lib/cli_tools/ic-describe-volume.cmd
-- lib/cli_tools/ic-describe-volume.sh
-- lib/cli_tools/ic-describe-volumes.cmd
-- lib/cli_tools/ic-describe-volumes.sh
-- lib/cli_tools/ic-detach-volume.cmd
-- lib/cli_tools/ic-detach-volume.sh
-- lib/cli_tools/ic-extend-reservation.cmd
-- lib/cli_tools/ic-extend-reservation.sh
-- lib/cli_tools/ic-generate-keypair.cmd
-- lib/cli_tools/ic-generate-keypair.sh
-- lib/cli_tools/ic-release-address.cmd
-- lib/cli_tools/ic-release-address.sh
-- lib/cli_tools/ic-remove-keypair.cmd
-- lib/cli_tools/ic-remove-keypair.sh
-- lib/cli_tools/ic-restart-instance.cmd
-- lib/cli_tools/ic-restart-instance.sh
-- lib/cli_tools/ic-save-instance.cmd
-- lib/cli_tools/ic-save-instance.sh
-- lib/cli_tools/ic-set-default-key.cmd
-- lib/cli_tools/ic-set-default-key.sh
-- lib/cli_tools/ic-update-instance.cmd
-- lib/cli_tools/ic-update-instance.sh
-- lib/cli_tools/ic-update-keypair.cmd
-- lib/cli_tools/ic-update-keypair.sh
-- lib/cli_tools/lib/DeveloperCloud_API_Client_JAR.jar
-- lib/cli_tools/lib/DeveloperCloud_CMD_Tool.jar
-- lib/cli_tools/lib/commons-beanutils-1.6.1.jar
-- lib/cli_tools/lib/commons-cli-1.2.jar
-- lib/cli_tools/lib/commons-codec-1.3.jar
-- lib/cli_tools/lib/commons-collections-3.2.1.jar
-- lib/cli_tools/lib/commons-digester-1.8.jar
-- lib/cli_tools/lib/commons-httpclient-3.1.jar
-- lib/cli_tools/lib/commons-lang-2.3.jar
-- lib/cli_tools/lib/commons-logging-1.1.1.jar
-- lib/cli_tools/logging.properties
-- lib/cli_tools/manifest.rmd
 - lib/config/config.yml
 - lib/hash_fix.rb
 - lib/mime-types-1.16/History.txt

data/lib/cli_tools/README.txt

@@ -1,50 +0,0 @@
-						Command Line Tool
-							---- IBM Smart Business Development & Test on the IBM Cloud
-Version 1.4.1.CC20110505-2046 March 2011
----------------
-Changes:
-1. Add an option in command ic-describe-images, -y --ignoreAdditionalInfo to ignore the additional information. With this 
-   option, it won't download the parameters.xml from RAM. 
-
-Version 1.4.0.CC20110112-2159 January 2011
----------------
-Changes:
-1.Add command ic-update-instance
-2.Add command ic-attach-volume & ic-detach-volume
-
-Version 1.3.0.CC20101207-1012 November 2010
----------------
-Changes:
-1. Add DataCenterDownException in several commands.
-	
-Version 1.2.0.20101019-0015 October 2010
----------------
-Changes:
-1. Add command ic-clone-volume
-2. Add parameter -e/--isMiniEphemeral for ic-create-instance to support provision an instance with minimal ephemeral storage
-3. Support multiple addresses attached in one instance
-                        
-Version 1.1.3.20101012-0333 October 2010
----------------
-Changes:
-1. Increase the value of the so_timeout
-
-Version 1.1.2.20100906-0202 September 2010
----------------                            
-Changes:
-1. Update DeveloperCloud_API_Client_JAR.jar.
-   Correct the business logic in createInstance.
-
-Version 1.1.1.20100829-2101 August 2010
----------------                            
-Changes:
-1. Update DeveloperCloud_API_Client_JAR-javadoc.jar.
-
-Version 1.1.0.20100623-1406 June 2010
----------------
-Changes:
-1. Add command and parameters to support Vlan
-    1) ic-describe-vlans
-    2) ic-allocate-address
-    3) ic-create-instance
-2. Add commands ic-describe-image-agreement.

data/lib/cli_tools/ic-add-keypair.cmd

@@ -1,29 +0,0 @@
-@echo off
-
-REM ###########################################################################
-
-REM #
-
-REM # Licensed Materials - Property of IBM
-
-REM #
-
-REM # (C) COPYRIGHT International Business Machines Corp. 2009
-
-REM #
-
-REM # All Rights Reserved.
-
-REM #
-
-REM # US Government Users Restricted Rights - Use, duplication or
-
-REM # disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-
-REM #
-
-REM #############################################################################
-
-
-
-ic-cmd.cmd -action AddKeyPair %*