cft_smartcloud 0.1.8 → 0.1.9

data/lib/cli_tools/ic-restart-instance.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+############################################################################
+#
+# Licensed Materials - Property of IBM
+#
+# (C) COPYRIGHT International Business Machines Corp. 2009
+#
+# All Rights Reserved.
+#
+# US Government Users Restricted Rights - Use, duplication or
+# disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+#
+#############################################################################
+./ic-cmd.sh -action RestartInstance $*

data/lib/cli_tools/ic-save-instance.cmd

@@ -0,0 +1,27 @@
+@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 SaveInstance %*

data/lib/cli_tools/ic-save-instance.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+############################################################################
+#
+# Licensed Materials - Property of IBM
+#
+# (C) COPYRIGHT International Business Machines Corp. 2009
+#
+# All Rights Reserved.
+#
+# US Government Users Restricted Rights - Use, duplication or
+# disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+#
+#############################################################################
+./ic-cmd.sh -action SaveInstance $*

data/lib/cli_tools/ic-set-default-key.cmd

@@ -0,0 +1,27 @@
+@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 SetDefaultKey %*

data/lib/cli_tools/ic-set-default-key.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+############################################################################
+#
+# Licensed Materials - Property of IBM
+#
+# (C) COPYRIGHT International Business Machines Corp. 2009
+#
+# All Rights Reserved.
+#
+# US Government Users Restricted Rights - Use, duplication or
+# disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+#
+#############################################################################
+./ic-cmd.sh -action SetDefaultKey $*

data/lib/cli_tools/ic-update-instance.cmd

@@ -0,0 +1,27 @@
+@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 UpdateInstance %*

data/lib/cli_tools/ic-update-instance.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+############################################################################
+#
+# Licensed Materials - Property of IBM
+#
+# (C) COPYRIGHT International Business Machines Corp. 2009
+#
+# All Rights Reserved.
+#
+# US Government Users Restricted Rights - Use, duplication or
+# disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+#
+#############################################################################
+./ic-cmd.sh -action UpdateInstance $*

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

@@ -0,0 +1,27 @@
+@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 UpdateKeyPair %*

data/lib/cli_tools/ic-update-keypair.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+############################################################################
+#
+# Licensed Materials - Property of IBM
+#
+# (C) COPYRIGHT International Business Machines Corp. 2009
+#
+# All Rights Reserved.
+#
+# US Government Users Restricted Rights - Use, duplication or
+# disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+#
+#############################################################################
+./ic-cmd.sh -action UpdateKeyPair $*

data/lib/cli_tools/logging.properties

@@ -0,0 +1,7 @@
+handlers = java.util.logging.FileHandler
+java.util.logging.FileHandler.level = INFO
+java.util.logging.FileHandler.pattern = ./logs/log%u.log
+java.util.logging.FileHandler.limit = 50000
+java.util.logging.FileHandler.count = 1
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
+java.util.logging.FileHandler.append = true

data/lib/cli_tools/manifest.rmd

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<defaultprofile:Asset xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI" xmlns:defaultprofile="http:///defaultprofile22.ecore" name="Command Line Tool Reference and Binaries"
+    id="{F1466F46-A4AB-3879-D883-1A26A43BF046}" date="2011-05-13" state="Approved" version="1.4" shortDescription="Cloud API Reference of Command Line Tool">
+  <classification>
+    <descriptorGroup name="AssetType">
+      <nodeDescriptor href="https://www-147.ibm.com/cloud/enterprise/ram/classif/assetTypesSchema.xmi#documentation"/>
+    </descriptorGroup>
+    <descriptorGroup name="StandardInfo">
+      <freeFormValue value="31" freeFormDescriptor="//@classification/@descriptorGroup.1/@freeFormDescriptor.0"/>
+      <freeFormDescriptor name="revisionCount"/>
+    </descriptorGroup>
+  </classification>
+  <solution>
+    <artifact name="GA_CommandLine.pdf" type="application/pdf">
+      <reference value="GA_CommandLine.pdf"/>
+    </artifact>
+    <artifact name="README.txt" type="text/plain">
+      <reference value="README.txt"/>
+    </artifact>
+    <artifact name="DeveloperCloud_CMD_Tool.zip" type="multipart/x-zip">
+      <reference value="DeveloperCloud_CMD_Tool.zip"/>
+    </artifact>
+  </solution>
+  <description value="&lt;p style=&quot;margin: 0px;&quot;>You can retrieve the command line tool and its documentation by clicking the &quot;Content&quot; tab above. &lt;/p>"/>
+</defaultprofile:Asset>

data/lib/mock_smartcloud.rb

@@ -16,11 +16,19 @@ class MockSmartCloud
   end
 
   def describe_image(*args)
-    {"CreatedTime"=>"2011-02-25T01:22:57.000Z", "Owner"=>"SYSTEM", "SupportedInstanceTypes"=>{"InstanceType"=>{"Label"=>"Bronze 32 bit", "ID"=>"BRZ32.1/2048/60*175", "Price"=>{"Rate"=>"0.21", "PricePerQuantity"=>"1", "UnitOfMeasure"=>"UHR  ", "CountryCode"=>"897", "CurrencyCode"=>"USD"}}}, "Name"=>"CohesiveFT VPN-Cubed Datacenter Connect V2.0.0 - BYOL (TOR)", "Location"=>"101", "ProductCodes"=>{"ProductCode"=>"caondc13bV97Kg5TLyGNodD9or7gA"}, "Documentation"=>"https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{974E595E-566E-87E3-A483-AC0FC468C4D9}/1.0/GettingStarted.html", "ID"=>"20016530", "Manifest"=>"https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{974E595E-566E-87E3-A483-AC0FC468C4D9}/1.0/parameters.xml", "Description"=>"CohesiveFT VPN-Cubed 2.0.0 UL - for TOR datacenter", "State"=>"AVAILABLE", "Visibility"=>"PUBLIC", "Platform"=>"Red Hat Enterprise Linux/5.4"}
+    {"CreatedTime"=>"2011-02-25T01:22:57.000Z", "Owner"=>"SYSTEM", 
+      "SupportedInstanceTypes"=>{"InstanceType"=>[
+          {"Label"=>"Bronze 32 bit", "ID"=>"BRZ32.1/2048/60*175", 
+            "Price"=>{"Rate"=>"0.21", "PricePerQuantity"=>"1", "UnitOfMeasure"=>"UHR  ", "CountryCode"=>"897", "CurrencyCode"=>"USD"}}, 
+          {"Label"=>"Copper 32 bit", "ID"=>"COP32.1/2048/60", 
+            "Price"=>{"Rate"=>"0.21", "PricePerQuantity"=>"1", "UnitOfMeasure"=>"UHR  ", "CountryCode"=>"897", "CurrencyCode"=>"USD"}}, 
+        ]
+      }, 
+      "Name"=>"CohesiveFT VPN-Cubed Datacenter Connect V2.0.0 - BYOL (TOR)", "Location"=>"101", "ProductCodes"=>{"ProductCode"=>"caondc13bV97Kg5TLyGNodD9or7gA"}, "Documentation"=>"https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{974E595E-566E-87E3-A483-AC0FC468C4D9}/1.0/GettingStarted.html", "ID"=>"20016530", "Manifest"=>"https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{974E595E-566E-87E3-A483-AC0FC468C4D9}/1.0/parameters.xml", "Description"=>"CohesiveFT VPN-Cubed 2.0.0 UL - for TOR datacenter", "State"=>"AVAILABLE", "Visibility"=>"PUBLIC", "Platform"=>"Red Hat Enterprise Linux/5.4"}
   end
 
   def describe_instance(*args)
-    {"Instance" => {"Status"=>"NEW", "PrimaryIP"=>{"IP"=>{}, "Hostname"=>{}, "Type"=>"DYNAMIC"}, "ImageID"=>"20015391", "DiskSize"=>"60", "Owner"=>"smartes@cohesiveft.com", "RequestID"=>{"name"=>"sir_19_rhel5532-bit-1zGS", "content"=>"102271"}, "Name"=>"DELETEsir_19_rhel5532-bit-1zGS", "ProductCodes"=>{}, "KeyName"=>"si-tempkey-rhel5532-bit-1zGS-eDY4T", "Location"=>"101", "LaunchTime"=>"2011-07-07T22:13:49.891Z", "Volumes"=>{}, "ID"=>"101971", "MiniEphemeral"=>"false", "Software"=>{"Application"=>{"Version"=>"5.5", "Name"=>"Red Hat Enterprise Linux", "Type"=>"OS"}}, "IP"=>{}, "InstanceType"=>"COP32.1/2048/60", "Hostname"=>{}}}
+    {"Status"=>"NEW", "PrimaryIP"=>{"IP"=>{}, "Hostname"=>{}, "Type"=>"DYNAMIC"}, "ImageID"=>"20015391", "DiskSize"=>"60", "Owner"=>"smartes@cohesiveft.com", "RequestID"=>{"name"=>"sir_19_rhel5532-bit-1zGS", "content"=>"102271"}, "Name"=>"MockInstance", "ProductCodes"=>{}, "KeyName"=>"si-tempkey-rhel5532-bit-1zGS-eDY4T", "Location"=>"101", "LaunchTime"=>"2011-07-07T22:13:49.891Z", "Volumes"=>{}, "ID"=>"101971", "MiniEphemeral"=>"false", "Software"=>{"Application"=>{"Version"=>"5.5", "Name"=>"Red Hat Enterprise Linux", "Type"=>"OS"}}, "IP"=>{}, "InstanceType"=>"COP32.1/2048/60", "Hostname"=>{}}
   end
 
   def create_volume(*args)
@@ -44,10 +52,10 @@ class MockSmartCloud
   end
 
   def poll_for_volume_state(*args)
-    true
+    describe_volume(*args)
   end
 
   def poll_for_instance_state(*args)
-    true
+    describe_instance(*args)
   end
 end

data/lib/smartcloud.rb

@@ -23,6 +23,8 @@ 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
 
@@ -100,6 +102,10 @@ class IBMSmartCloud
     get("/locations").Location
   end
 
+  def describe_location(location_id)
+    get("/locations/#{location_id}").Location
+  end
+
   def display_locations
     log = describe_locations.map {|loc| "#{loc.ID.ljust(4)} | #{loc.Location.ljust(15)} | #{loc.Name}"}.join("\n")
     logger.info "\n#{log}"
@@ -197,12 +203,27 @@ 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)
-    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
+    # 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
+    
+    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
+  end
+
+  args :attach_volume, [:instance_id, :volume_id]
+  def attach_volume(instance_id, volume_id)
+    put("/instances/#{instance_id}", :volumeID => volume_id, :attach => true)
+  end
+
+  args :detach_volume, [:instance_id, :volume_id]
+  def detach_volume(instance_id, volume_id)
+    put("/instances/#{instance_id}", :volumeID => volume_id, :detach => true)
   end
 
   # Delete the volume
@@ -212,9 +233,14 @@ 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)}
+  args :delete_volumes, [:volume_ids], %{Example: smartcloud "delete_volumes(12345,12346,12347)"}
+  def delete_volumes(*vol_id_list)
+    threads=[]
+    vol_id_list.each {|vol| 
+      threads << Thread.new { logger.info "Sending delete request for: #{vol}..."; delete_volume(vol); logger.info "Finished delete request for #{vol}" }
+    }
+    threads.each(&:join)
+    true
   end
 
   # generates a keypair and returns the private key
@@ -248,6 +274,14 @@ class IBMSmartCloud
     response
   end
 
+  def display_addresses
+    addresses = describe_addresses
+
+    logger.info "\nID     | Loc  | State      | IP \n" + addresses.map {|a| 
+      a.ID.ljust(6) + " | " + a.Location.ljust(4) + " | " + (a.State[0..9].ljust(10) rescue '?'.ljust(10)) + " | " + (a.IP.to_s || "")
+    }.join("\n")
+  end
+
   # Allows you to poll for a specific storage state
   # ex: storage_state_is?("123456", "UNMOUNTED")
   # storage state string can be given as a string or symbol
@@ -298,7 +332,8 @@ class IBMSmartCloud
   # Optionally supply a location to get offerings filtered to a particular location
   # Optionally supply a name (Small, Medium, Large) to get the specific offering
   args :describe_volume_offerings, [{:location => :opt}, {:name => :opt}]
-  def describe_volume_offerings(location=nil, name=nil)
+  args :describe_storage_offerings, [{:location => :opt}, {:name => :opt}]
+  def describe_storage_offerings(location=nil, name=nil)
     response = get("/offerings/storage")
     if location
       filtered_by_location = response.Offerings.select {|o| o.Location.to_s == location.to_s}
@@ -312,6 +347,8 @@ class IBMSmartCloud
     end
   end
 
+  alias describe_volume_offerings describe_storage_offerings
+
   # Create a volume. offering_id is optional and will be determined automatically
   # for you based on the location and volume size.
   #
@@ -430,11 +467,18 @@ class IBMSmartCloud
   end
 
   # Deletes many instances in a thread
-  args :delete_instances, [:instance_ids => [12345,12346,12347, '...']]
-  def delete_instances(instance_ids)
-    instance_ids.each {|id| delete_instance(id) }
+  args :delete_instances, [:instance_ids], %{Example: smartcloud "delete_instances(12345,12346,12347)"}
+  def delete_instances(*instance_ids)
+    threads=[]
+    instance_ids.each {|id| logger.info "Sending delete request for: #{id}..."; threads << Thread.new { delete_instance(id) }; logger.info "Finished delete request for #{id}" }
+    threads.each(&:join)
+    true
   end
 
+  args :rename_instance, [:instance_id, :new_name]
+  def rename_instance(instance_id, new_name)
+    put("/instances/#{instance_id}", :name => new_name)
+  end
 
   args :delete_instance, [:instance_id]
   def delete_instance(instance_id)
@@ -478,9 +522,11 @@ class IBMSmartCloud
   def display_instances(filters={})
     instances = describe_instances(filters)
 
-    log = %{#{"Started".ljust(18)} | #{"Instance".ljust(8)} | #{"Image".ljust(9)} | #{"Loc".ljust(3)} | #{"Status".ljust(10)} | #{"KeyName".ljust(15)} | #{"IP".ljust(15)} | Name\n} 
+    log = %{#{"Started".ljust(18)} | #{"Instance".ljust(8)} | #{"Image".ljust(9)} | #{"Loc".ljust(3)} | #{"Status".ljust(10)} | #{"KeyName".ljust(15)} | #{"IP".ljust(15)} | #{"Volume".ljust(6)} | Name\n}
     log << instances.map do |ins|
-      "#{DateTime.parse(ins.LaunchTime).strftime("%Y-%m-%d %I:%M%p")} | #{ins.ID.ljust(8)} | #{ins.ImageID.ljust(9)} | #{ins.Location.ljust(3)} | #{ins.Status[0..9].ljust(10)} | #{(ins.KeyName || "").strip[0..14].ljust(15)} | #{(ins.IP.strip=="" ? '[NONE]' : ins.IP.strip).to_s.ljust(15)} | #{ins.Name}"
+      ip = (ins.IP && ins.IP.to_s) || ""
+      ip = (ip.strip == "") ? "[NONE]" : ip.strip
+      "#{DateTime.parse(ins.LaunchTime).strftime("%Y-%m-%d %I:%M%p")} | #{ins.ID.ljust(8)} | #{ins.ImageID.ljust(9)} | #{ins.Location.ljust(3)} | #{ins.Status[0..9].ljust(10)} | #{(ins.KeyName || "").strip[0..14].ljust(15)} | #{ip.ljust(15)} | #{(ins.Volume && ins.Volume || "").ljust(6)} | #{ins.Name}" 
     end.join("\n")
     logger.info "\n#{log}"
   end
@@ -501,6 +547,10 @@ class IBMSmartCloud
     images = filter_and_sort(images, filters)
   end
 
+  def describe_manifest(image_id)
+    get("offerings/image/#{image_id}/manifest").Manifest
+  end
+
   args :display_images, [:filters => :opt]
   def display_images(filters={})
     images = describe_images(filters)
@@ -603,6 +653,42 @@ 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)
+    FileUtils.mkdir_p(File.join(IBM_TOOLS_HOME, 'logs'))
+    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