deltacloud-core 0.0.4 → 0.0.5

data/config.ru

@@ -1,5 +1,5 @@
 require 'sinatra'
 require 'rubygems'
-require 'server.rb'
 
+require 'server.rb'
 run Sinatra::Application

data/deltacloud.rb

@@ -9,6 +9,7 @@ require 'deltacloud/models/base_model'
 require 'deltacloud/models/realm'
 require 'deltacloud/models/image'
 require 'deltacloud/models/instance'
+require 'deltacloud/models/key'
 require 'deltacloud/models/instance_profile'
 require 'deltacloud/models/storage_snapshot'
 require 'deltacloud/models/storage_volume'

data/lib/deltacloud/base_driver/base_driver.rb

@@ -31,6 +31,16 @@ module Deltacloud
     end
   end
 
+  class BackendFeatureUnsupported < StandardError
+    attr_reader :code, :cause, :details
+    def initialize(code, cause, message, details)
+      super(message)
+      @code = code
+      @cause = cause
+      @details = details
+    end
+  end
+
   class BaseDriver
 
     def self.define_hardware_profile(name,&block)
@@ -195,6 +205,25 @@ module Deltacloud
       return false
     end
 
+    def catched_exceptions_list
+      { :error => [], :auth => [], :glob => [] }
+    end
+
+    def safely(&block)
+      begin
+        block.call
+      rescue *catched_exceptions_list[:error] => e
+        raise Deltacloud::BackendError.new(502, e.class.to_s, e.message, e.backtrace)
+      rescue *catched_exceptions_list[:auth] => e
+        raise Deltacloud::AuthException.new
+      rescue => e
+        catched_exceptions_list[:glob].each do |ex|
+          raise Deltacloud::BackendError.new(502, e.class.to_s, e.message, e.backtrace) if e.class.name =~ ex
+        end
+        raise e
+      end
+    end
+
   end
 
 end

data/lib/deltacloud/base_driver/features.rb

@@ -120,6 +120,13 @@ module Deltacloud
     #
     # Declaration of optional features
     #
+    declare_feature :images,  :owner_id do
+      description "Filter images using owner id"
+      operation :index do
+        param :owner_id,  :string,  :optional,  nil,  "Owner ID"
+      end
+    end
+
     declare_feature :instances, :user_name do
       description "Accept a user-defined name on instance creation"
       operation :create do

data/lib/deltacloud/base_driver/mock_driver.rb

@@ -11,10 +11,13 @@ module Mock
       [
         :describe_images,
         :describe_availability_zones,
+        :describe_keypairs,
+        :create_keypair,
         :run_instances,
         :describe_instances,
         :reboot_instances,
-        :terminate_instances
+        :terminate_instances,
+        :delete_keypair
       ]
     end
 

data/lib/deltacloud/drivers/ec2/ec2_driver.rb

@@ -35,8 +35,13 @@ module Deltacloud
     module EC2
 class EC2Driver < Deltacloud::BaseDriver
 
+  def supported_collections
+    DEFAULT_COLLECTIONS + [ :keys ]
+  end
+
   feature :instances, :user_data
   feature :instances, :authentication_key
+  feature :images, :owner_id
 
   define_hardware_profile('m1.small') do
     cpu                1
@@ -170,40 +175,60 @@ class EC2Driver < Deltacloud::BaseDriver
   def create_instance(credentials, image_id, opts)
     ec2 = new_client( credentials )
     realm_id = opts[:realm_id]
-    image = image(credentials, :id => image_id )
-    hwp = find_hardware_profile(credentials, opts[:hwp_id], image.id)
-    ec2_instances = ec2.run_instances(
-      :image_id => image.id,
-      :user_data => opts[:user_data],
-      :key_name => opts[:keyname],
-      :availability_zone => realm_id,
-      :monitoring_enabled => true,
-      :instance_type => hwp.name,
-      :disable_api_termination => false,
-      :instance_initiated_shutdown_behavior => 'terminate'
-    )
-    convert_instance( ec2_instances.instancesSet.item.first, 'pending' )
+    safely do
+      image = image(credentials, :id => image_id )
+      hwp = find_hardware_profile(credentials, opts[:hwp_id], image.id)
+      ec2_instances = ec2.run_instances(
+        :image_id => image.id,
+        :user_data => opts[:user_data],
+        :key_name => opts[:keyname],
+        :availability_zone => realm_id,
+        :monitoring_enabled => true,
+        :instance_type => hwp.name,
+        :disable_api_termination => false,
+        :instance_initiated_shutdown_behavior => 'terminate'
+      )
+      return convert_instance( ec2_instances.instancesSet.item.first, 'pending' )
+    end
+  end
+
+  def generate_instance(ec2, id, backup)
+    begin
+      this_instance = ec2.describe_instances( :instance_id => id ).reservationSet.item.first.instancesSet.item.first
+      convert_instance(this_instance, this_instance.ownerId)
+    rescue Exception => e
+      puts "WARNING: ignored error during instance refresh: #{e.message}"
+      # at this point, the action has succeeded but our follow-up
+      # "describe_instances" failed for some reason.  Create a simple Instance
+      # object with only the ID and new state in place
+      state = backup.instancesSet.item.first.currentState.name
+      Instance.new( {
+        :id => id,
+        :state => state,
+        :actions => instance_actions_for( state ),
+      } )
+    end
   end
 
   def reboot_instance(credentials, id)
     ec2 = new_client(credentials)
-    safely do
-      ec2.reboot_instances( :instance_id => id )
-    end
+    backup = ec2.reboot_instances( :instance_id => id )
+
+    generate_instance(ec2, id, backup)
   end
 
   def stop_instance(credentials, id)
     ec2 = new_client(credentials)
-    safely do
-      ec2.terminate_instances( :instance_id => id )
-    end
+    backup = ec2.terminate_instances( :instance_id => id )
+
+    generate_instance(ec2, id, backup)
   end
 
   def destroy_instance(credentials, id)
     ec2 = new_client(credentials)
-    safely do
-      ec2.terminate_instances( :instance_id => id )
-    end
+    backup = ec2.terminate_instances( :instance_id => id )
+
+    generate_instance(ec2, id, backup)
   end
 
   #
@@ -252,6 +277,39 @@ class EC2Driver < Deltacloud::BaseDriver
     snapshots
   end
 
+  def key(credentials, opts=nil)
+    keys(credentials, opts).first
+  end
+
+  def keys(credentials, opts=nil)
+    ec2 = new_client( credentials )
+    opts[:key_name] = opts[:id] if opts and opts[:id]
+    keypairs = ec2.describe_keypairs(opts || {})
+    result = []
+    safely do
+      keypairs.keySet.item.each do |keypair|
+        result << convert_key(keypair)
+      end
+    end
+    result
+  end
+
+  def create_key(credentials, opts={})
+    key = Key.new
+    ec2 = new_client( credentials )
+    safely do
+      key = convert_key(ec2.create_keypair(opts))
+    end
+    return key
+  end
+
+  def destroy_key(credentials, opts={})
+    safely do
+      ec2 = new_client( credentials )
+      ec2.delete_keypair(opts)
+    end
+  end
+
   private
 
   def new_client(credentials)
@@ -260,7 +318,18 @@ class EC2Driver < Deltacloud::BaseDriver
       :secret_access_key => credentials.password
     }
     opts[:server] = ENV['DCLOUD_EC2_URL'] if ENV['DCLOUD_EC2_URL']
-    AWS::EC2::Base.new(opts)
+    safely do
+      AWS::EC2::Base.new(opts)
+    end
+  end
+
+  def convert_key(key)
+    Key.new({
+      :id => key['keyName'],
+      :fingerprint => key['keyFingerprint'],
+      :credential_type => :key,
+      :pem_rsa_key => key['keyMaterial']
+    })
   end
 
   def convert_image(ec2_image)
@@ -326,14 +395,12 @@ class EC2Driver < Deltacloud::BaseDriver
     } )
   end
 
-  def safely(&block)
-    begin
-      block.call
-    rescue AWS::AuthFailure => e
-        raise Deltacloud::AuthException.new
-    rescue Exception => e
-        puts "ERROR: #{e.message}\n#{e.backtrace.join("\n")}"
-    end
+  def catched_exceptions_list
+    {
+      :auth => [ AWS::AuthFailure ],
+      :error => [],
+      :glob => [ /AWS::(\w+)/ ]
+    }
   end
 
 end

data/lib/deltacloud/drivers/gogrid/gogrid_driver.rb

@@ -44,20 +44,8 @@ class GogridDriver < Deltacloud::BaseDriver
   end
 
   def supported_collections
-    DEFAULT_COLLECTIONS.reject { |c| [ :storage_volumes, :storage_snapshots ].include?(c) }
-  end
-
-  # The only valid option for flavors is server RAM for now
-  def flavors(credentials, opts=nil)
-    flavors = []
-    safely do
-      flavors=new_client(credentials).request('common/lookup/list', { 'lookup' => 'server.ram' })['list'].collect do |flavor|
-        convert_flavor(flavor)
-      end
-    end
-    flavors = filter_on( flavors, :id, opts )
-    flavors = filter_on( flavors, :architecture, opts )
-    flavors
+    DEFAULT_COLLECTIONS.reject! { |c| [ :storage_volumes, :storage_snapshots ].include?(c) }
+    DEFAULT_COLLECTIONS + [ :keys ]
   end
 
   def images(credentials, opts=nil)
@@ -188,6 +176,19 @@ class GogridDriver < Deltacloud::BaseDriver
     end
   end
 
+  def key(credentials, opts=nil)
+    keys(credentials, opts).first
+  end
+
+  def keys(credentials, opts=nil)
+    gogrid = new_client( credentials )
+    creds = []
+    gogrid.request('support/password/list')['list'].each do |password|
+      creds << convert_key(password)
+    end
+    return creds
+  end
+
   define_instance_states do
     start.to( :pending )         .automatically
     pending.to( :running )       .automatically
@@ -219,6 +220,15 @@ class GogridDriver < Deltacloud::BaseDriver
     return login_data
   end
 
+  def convert_key(password)
+    Key.new({
+      :id => password['id'],
+      :username => password['username'],
+      :password => password['password'],
+      :credential_type => :password
+    })
+  end
+
   def convert_image(gg_image, owner_id=nil)
     Image.new( {
       :id=>gg_image['id'],
@@ -237,15 +247,6 @@ class GogridDriver < Deltacloud::BaseDriver
     end
   end
 
-  def convert_flavor(flavor)
-    Flavor.new(
-      :id => flavor['id'],
-      :architecture => 'x86',
-      :memory => flavor['name'].tr('G', ''),
-      :storage => '1'
-    )
-  end
-
   def convert_realm(realm)
     Realm.new(
       :id => realm['id'],
@@ -279,7 +280,6 @@ class GogridDriver < Deltacloud::BaseDriver
       :id => instance['name'],
       :owner_id => owner_id,
       :image_id => instance['image']['id'],
-      :flavor_id => instance['ram']['id'],
       :instance_profile => prof,
       :name => instance['name'],
       :realm_id => instance['type']['id'],
@@ -316,7 +316,7 @@ class GogridDriver < Deltacloud::BaseDriver
     begin
       block.call
     rescue Exception => e
-      puts "ERROR: #{e.message}"
+      raise Deltacloud::BackendError.new(500, e.class.to_s, e.message, e.backtrace)
     end
   end
 

data/lib/deltacloud/drivers/rackspace/rackspace_driver.rb

@@ -29,11 +29,13 @@ class RackspaceDriver < Deltacloud::BaseDriver
 
   def hardware_profiles(credentials, opts = nil)
     racks = new_client( credentials )
-    results = racks.list_flavors.map do |flav|
-      HardwareProfile.new(flav["id"].to_s) do
-        architecture 'x86_64'
-        memory flav["ram"].to_i
-        storage flav["disk"].to_i
+    safely do
+      results = racks.list_flavors.map do |flav|
+        HardwareProfile.new(flav["id"].to_s) do
+          architecture 'x86_64'
+          memory flav["ram"].to_i
+          storage flav["disk"].to_i
+        end
       end
     end
     filter_hardware_profiles(results, opts)
@@ -41,14 +43,16 @@ class RackspaceDriver < Deltacloud::BaseDriver
 
   def images(credentials, opts=nil)
     racks = new_client( credentials )
-    results = racks.list_images.map do |img|
-      Image.new( {
-                   :id=>img["id"].to_s,
-                   :name=>img["name"],
-                   :description => img["name"] + " " + img["status"] + "",
-                   :owner_id=>"root",
-                   :architecture=>'x86_64'
-                 } )
+    safely do
+      results = racks.list_images.map do |img|
+        Image.new( {
+                     :id=>img["id"].to_s,
+                     :name=>img["name"],
+                     :description => img["name"] + " " + img["status"] + "",
+                     :owner_id=>"root",
+                     :architecture=>'x86_64'
+                   } )
+      end
     end
     results.sort_by{|e| [e.description]}
     results = filter_on( results, :id, opts )
@@ -66,7 +70,9 @@ class RackspaceDriver < Deltacloud::BaseDriver
 
   def reboot_instance(credentials, id)
     racks = new_client(credentials)
-    racks.reboot_server(id)
+    safely do
+      racks.reboot_server(id)
+    end
   end
 
   def stop_instance(credentials, id)
@@ -75,7 +81,9 @@ class RackspaceDriver < Deltacloud::BaseDriver
 
   def destroy_instance(credentials, id)
     racks = new_client(credentials)
-    racks.delete_server(id)
+    safely do
+      racks.delete_server(id)
+    end
   end
 
 
@@ -88,7 +96,9 @@ class RackspaceDriver < Deltacloud::BaseDriver
     hwp_id = opts[:hwp_id] || 1
     name = Time.now.to_s
     if (opts[:name]) then name = opts[:name] end
-    convert_srv_to_instance(racks.start_server(image_id, hwp_id, name))
+    safely do
+      return convert_srv_to_instance(racks.start_server(image_id, hwp_id, name))
+    end
   end
 
   #
@@ -97,12 +107,14 @@ class RackspaceDriver < Deltacloud::BaseDriver
   def instances(credentials, opts=nil)
     racks = new_client(credentials)
     instances = []
-    if (opts.nil?)
-      instances = racks.list_servers.map do |srv|
-        convert_srv_to_instance(srv)
+    safely do
+      if (opts.nil?)
+        instances = racks.list_servers.map do |srv|
+          convert_srv_to_instance(srv)
+        end
+      else
+        instances << convert_srv_to_instance(racks.load_server_details(opts[:id]))
       end
-    else
-      instances << convert_srv_to_instance(racks.load_server_details(opts[:id]))
     end
     instances = filter_on( instances, :id, opts )
     instances = filter_on( instances, :state, opts )
@@ -128,7 +140,9 @@ class RackspaceDriver < Deltacloud::BaseDriver
   end
 
   def new_client(credentials)
-    RackspaceClient.new(credentials.user, credentials.password)
+    safely do
+      return RackspaceClient.new(credentials.user, credentials.password)
+    end
   end
 
   define_instance_states do
@@ -144,6 +158,14 @@ class RackspaceDriver < Deltacloud::BaseDriver
     stopped.to( :finish )         .automatically
   end
 
+  def safely(&block)
+    begin
+      block.call
+    rescue Exception => e
+      raise Deltacloud::BackendError.new(500, e.class.to_s, e.message, e.backtrace)
+    end
+  end
+
 end
 
     end

data/lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb

@@ -29,15 +29,17 @@ class RimuHostingDriver < Deltacloud::BaseDriver
   feature :instances, :user_name
 
   def images(credentails, opts=nil)
-    rh = RimuHostingClient.new(credentails)
-    images = rh.list_images.map do | image |
-      Image.new({
-              :id => image["distro_code"].gsub(/\./,"-"),
-              :name => image["distro_code"],
-              :description => image["distro_description"],
-              :owner_id => "root",
-              :architecture => "x86"
-      })
+    safely do
+      rh = RimuHostingClient.new(credentails)
+      images = rh.list_images.map do | image |
+        Image.new({
+                :id => image["distro_code"].gsub(/\./,"-"),
+                :name => image["distro_code"],
+                :description => image["distro_description"],
+                :owner_id => "root",
+                :architecture => "x86"
+        })
+      end
     end
     images.sort_by{|e| [e.description]}
     images = filter_on( images, :id, opts)
@@ -45,15 +47,17 @@ class RimuHostingDriver < Deltacloud::BaseDriver
   end
 
   def hardware_profiles(credentials, opts = nil)
-    rh = RimuHostingClient.new(credentials)
-    results = rh.list_plans.map do |plan|
-      # FIXME: x86 is not a valid architecture; what is Rimu offering ?
-      # FIXME: VPS plans offer a range of memory/storage, but that's
-      #        not contained in hte pricing_plan_infos
-      HardwareProfile.new(plan["pricing_plan_code"]) do
-        memory plan["minimum_memory_mb"].to_f
-        storage plan["minimum_disk_gb"].to_i
-        architecture "x86"
+    safely do
+      rh = RimuHostingClient.new(credentials)
+      results = rh.list_plans.map do |plan|
+        # FIXME: x86 is not a valid architecture; what is Rimu offering ?
+        # FIXME: VPS plans offer a range of memory/storage, but that's
+        #        not contained in hte pricing_plan_infos
+        HardwareProfile.new(plan["pricing_plan_code"]) do
+          memory plan["minimum_memory_mb"].to_f
+          storage plan["minimum_disk_gb"].to_i
+          architecture "x86"
+        end
       end
     end
     filter_hardware_profiles(results, opts)
@@ -68,9 +72,11 @@ class RimuHostingDriver < Deltacloud::BaseDriver
   end
 
   def instances(credentials, opts=nil)
-     rh = RimuHostingClient.new(credentials)
-    instances = rh.list_nodes.map do | inst |
-      convert_srv_to_instance(inst)
+    safely do
+      rh = RimuHostingClient.new(credentials)
+      instances = rh.list_nodes.map do | inst |
+        convert_srv_to_instance(inst)
+      end
     end
     instances = filter_on( instances, :id, opts)
     instances = filter_on( instances, :state, opts )
@@ -78,13 +84,17 @@ class RimuHostingDriver < Deltacloud::BaseDriver
   end
 
   def reboot_instance(credentials, id)
-     rh = RimuHostingClient.new(credentials)
-    rh.set_server_state(id, :RESTARTING)
+    safely do
+      rh = RimuHostingClient.new(credentials)
+      rh.set_server_state(id, :RESTARTING)
+    end
   end
 
   def start_instance(credentials, id)
-    rh = RimuHostingClient.new(credentials)
-    rh.set_server_state(id, :STARTED)
+    safely do
+      rh = RimuHostingClient.new(credentials)
+      rh.set_server_state(id, :STARTED)
+    end
   end
 
   def stop_instance(credentials, id)
@@ -92,8 +102,10 @@ class RimuHostingDriver < Deltacloud::BaseDriver
   end
 
   def destroy_instance(credentials, id)
-     rh = RimuHostingClient.new(credentials)
-    rh.delete_server(id)
+    safely do
+      rh = RimuHostingClient.new(credentials)
+      return rh.delete_server(id)
+    end
   end
 
   def create_instance(credentials, image_id, opts)
@@ -138,6 +150,14 @@ class RimuHostingDriver < Deltacloud::BaseDriver
     stopped.to( :finish )         .automatically
   end
 
+  def safely(&block)
+    begin
+      block.call
+    rescue Exception => e
+      raise Deltacloud::BackendError.new(500, e.class.to_s, e.message, e.backtrace)
+    end
+  end
+
 
 end
 

data/lib/deltacloud/drivers/terremark/terremark_driver.rb

@@ -57,15 +57,17 @@ VAPP_STATE_MAP = { "0" =>  "PENDING", "1" =>  "PENDING", "2" =>  "STOPPED", "4"
   def images(credentials, opts=nil)
       image_list = []
       terremark_client = new_client(credentials)
-      vdc_id = terremark_client.default_vdc_id
-      catalogItems = terremark_client.get_catalog(vdc_id).body['CatalogItems']
-      catalogItems.each{ |catalog_item|
-        current_item_id = catalog_item['href'].split('/').last
-        current_item = terremark_client.get_catalog_item(current_item_id).body['Entity']
-          if(current_item['type'] == 'application/vnd.vmware.vcloud.vAppTemplate+xml')
-            image_list << convert_image(current_item, credentials.user)
-          end
-      } #end of catalogItems.each
+      safely do
+        vdc_id = terremark_client.default_vdc_id
+        catalogItems = terremark_client.get_catalog(vdc_id).body['CatalogItems']
+        catalogItems.each{ |catalog_item|
+          current_item_id = catalog_item['href'].split('/').last
+          current_item = terremark_client.get_catalog_item(current_item_id).body['Entity']
+            if(current_item['type'] == 'application/vnd.vmware.vcloud.vAppTemplate+xml')
+              image_list << convert_image(current_item, credentials.user)
+            end
+        } #end of catalogItems.each
+      end
       image_list = filter_on( image_list, :id, opts )
       image_list = filter_on( image_list, :architecture, opts )
       image_list = filter_on( image_list, :owner_id, opts )
@@ -91,14 +93,16 @@ VAPP_STATE_MAP = { "0" =>  "PENDING", "1" =>  "PENDING", "2" =>  "STOPPED", "4"
   def instances(credentials, opts=nil)
       instances = []
       terremark_client = new_client(credentials)
-      vdc_items = terremark_client.get_vdc(terremark_client.default_vdc_id()).body['ResourceEntities']
-      vdc_items.each{|current_item|
-        if(current_item['type'] == 'application/vnd.vmware.vcloud.vApp+xml')
-           vapp_id =  current_item['href'].split('/').last
-           vapp = terremark_client.get_vapp(vapp_id)
-           instances  << convert_instance(vapp, terremark_client, credentials.user)
-        end
-      }#end vdc_items.each
+      safely do
+        vdc_items = terremark_client.get_vdc(terremark_client.default_vdc_id()).body['ResourceEntities']
+        vdc_items.each{|current_item|
+          if(current_item['type'] == 'application/vnd.vmware.vcloud.vApp+xml')
+             vapp_id =  current_item['href'].split('/').last
+             vapp = terremark_client.get_vapp(vapp_id)
+             instances  << convert_instance(vapp, terremark_client, credentials.user)
+          end
+        }#end vdc_items.each
+      end
       instances = filter_on( instances, :id, opts )
       instances
   end
@@ -135,37 +139,45 @@ VAPP_STATE_MAP = { "0" =>  "PENDING", "1" =>  "PENDING", "2" =>  "STOPPED", "4"
     end
     vapp_opts['cpus'] = opts[:hwp_cpu]
     vapp_opts['memory'] =  opts[:hwp_memory]
-    terremark_client = new_client(credentials)
+    safely do
+      terremark_client = new_client(credentials)
 #######
 #FIXME#  what happens if there is an issue getting the new vapp id? (eg even though created succesfully)
 #######
-    vapp_id = terremark_client.instantiate_vapp_template(name, image_id, vapp_opts).body['href'].split('/').last
-    new_vapp = terremark_client.get_vapp(vapp_id)
-    return convert_instance(new_vapp, terremark_client, credentials.user) #return an Instance object
+      vapp_id = terremark_client.instantiate_vapp_template(name, image_id, vapp_opts).body['href'].split('/').last
+      new_vapp = terremark_client.get_vapp(vapp_id)
+      return convert_instance(new_vapp, terremark_client, credentials.user) #return an Instance object
+    end
   end
 
 #--
 # REBOOT INSTANCE
 #--
   def reboot_instance(credentials, id)
-    terremark_client =  new_client(credentials)
-    terremark_client.power_reset(id)
+    safely do
+      terremark_client =  new_client(credentials)
+      return terremark_client.power_reset(id)
+    end
   end
 
 #--
 # START INSTANCE
 #--
 def start_instance(credentials, id)
+  safely do
     terremark_client =  new_client(credentials)
-    terremark_client.power_on(id)
+    return terremark_client.power_on(id)
+  end
 end
 
 #--
 # STOP INSTANCE
 #--
 def stop_instance(credentials, id)
+  safely do
     terremark_client = new_client(credentials)
-    terremark_client.power_shutdown(id)
+    return terremark_client.power_shutdown(id)
+  end
 end
 
 #--
@@ -173,8 +185,10 @@ end
 #--
 #shuts down... in terremark need to do a futher delete to get rid of a vapp entirely
 def destroy_instance(credentials, id)
+  safely do
     terremark_client = new_client(credentials)
-    terremark_client.delete_vapp(id)
+    return terremark_client.delete_vapp(id)
+  end
 end
 
 #--
@@ -246,14 +260,24 @@ end
   def new_client(credentials)
     #Fog constructor expecting  credentials[:terremark_password] and credentials[:terremark_username]
     terremark_credentials = {:terremark_vcloud_username => "#{credentials.user}", :terremark_vcloud_password => "#{credentials.password}" }
-    terremark_client = Fog::Terremark::Vcloud.new(terremark_credentials)
-    vdc_id = terremark_client.default_vdc_id
+    safely do
+      terremark_client = Fog::Terremark::Vcloud.new(terremark_credentials)
+      vdc_id = terremark_client.default_vdc_id
+    end
     if (vdc_id.nil?)
        raise DeltaCloud::AuthException.new
     end
     terremark_client
   end
 
+  def safely(&block)
+    begin
+      block.call
+    rescue Exception => e
+      raise Deltacloud::BackendError.new(500, e.class.to_s, e.message, e.backtrace)
+    end
+  end
+
 
 end
 

data/lib/deltacloud/helpers/application_helper.rb

@@ -106,4 +106,10 @@ module ApplicationHelper
     end
   end
 
+  def cdata(&block)
+    text = capture_haml(&block)
+    text.gsub!("\n", "\n ")
+    "<![CDATA[\n #{text}\n]]>"
+  end
+
 end

data/lib/deltacloud/models/key.rb

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2009  Red Hat, Inc.
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+class Key < BaseModel
+
+  attr_accessor :credential_type
+  attr_accessor :fingerprint
+  attr_accessor :username
+  attr_accessor :password
+  attr_accessor :pem_rsa_key
+
+  def is_password?
+    true if @credential_type.eql?(:password)
+  end
+
+  def is_key?
+    true if @credential_type.eql?(:key)
+  end
+
+end

data/lib/sinatra/url_for.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Sinatra
   module UrlForHelper
     # Construct a link to +url_fragment+, which should be given relative to
@@ -30,7 +32,8 @@ module Sinatra
       else
         raise TypeError, "Unknown url_for mode #{mode}"
       end
-      "#{base}#{url_fragment}"
+      url_escape = URI.escape(url_fragment)
+      "#{base}#{url_escape}"
     end
 
     def root_url

data/server.rb

@@ -100,7 +100,6 @@ END
     "owner_id" and "architecture" parameter
 END
     param :id,            :string
-    param :owner_id,      :string
     param :architecture,  :string,  :optional
     control { filter_all(:images) }
   end
@@ -300,3 +299,56 @@ collection :storage_volumes do
     control { show(:storage_volume) }
   end
 end
+
+get '/api/keys/new' do
+  respond_to do |format|
+    format.html { haml :"keys/new" }
+  end
+end
+
+collection :keys do
+  description "Instance authentication credentials"
+
+  operation :index do
+    description "List all available credentials which could be used for instance authentication"
+    control do
+      filter_all :keys
+    end
+  end
+
+  operation :show do
+    description "Show details about given instance credential"
+    param :id,  :string,  :required
+    control { show :key }
+  end
+
+  operation :create do
+    description "Create a new instance credential if backend supports this"
+    param :name,  :string,  :required
+    control do
+      unless driver.respond_to?(:create_key)
+        raise Deltacloud::BackendFeatureUnsupported.new('501',
+          'Creating instance credentials is not supported in backend')
+      end
+      @key = driver.create_key(credentials, { :key_name => params[:name] })
+      respond_to do |format|
+        format.html { haml :"keys/show" }
+        format.xml { haml :"keys/show" }
+      end
+    end
+  end
+
+  operation :destroy do
+    description "Destroy given instance credential if backend supports this"
+    param :id,  :string,  :required
+    control do
+      unless driver.respond_to?(:destroy_key)
+        raise Deltacloud::BackendFeatureUnsupported.new('501',
+          'Creating instance credentials is not supported in backend')
+      end
+      driver.destroy_key(credentials, { :key_name => params[:id]})
+      redirect(keys_url)
+    end
+  end
+
+end

data/views/errors/backend_error.html.haml

@@ -14,4 +14,6 @@
     %dd= @error.cause
   %di
     %dt Details
-    %dd= @error.details
+    %dd
+      %pre
+        =@error.details.join("\n")

data/views/images/index.html.haml

@@ -22,7 +22,7 @@
         %td
           = image.name
         %td
-          = link_to image.owner_id, images_url( :owner_id => image.owner_id )
+          = link_to image.owner_id, images_url
         %td
           = image.architecture
         %td

data/views/instances/index.html.haml

@@ -16,7 +16,7 @@
         %td
           = link_to instance.id, instance_url( instance.id )
         %td
-          = link_to instance.owner_id, images_url( instance.owner_id )
+          = link_to instance.owner_id, images_url
         %td
           = instance.name
         %td

data/views/instances/show.xml.haml

@@ -1,30 +1,39 @@
 !!! XML
 %instance{:href => instance_url(@instance.id), :id => @instance.id}
-  %name<
-    =@instance.name
-  %owner_id<
-    =@instance.owner_id
-  %image{:href => image_url(@instance.image_id), :id => @instance.image_id }
-  %realm{:href => realm_url(@instance.realm_id), :id => @instance.realm_id }
-  %state<
-    =@instance.state
-  - haml_tag :"hardware_profile", {:id => @instance.instance_profile.id, :href => hardware_profile_url(@instance.instance_profile.id)} do
-    - @instance.instance_profile.overrides.each do |p, v|
-      %property{:kind => 'fixed', :name => p, :value => v, :unit => Deltacloud::HardwareProfile::unit(p)}
-  %actions
-    - @instance.actions.compact.each do |instance_action|
-      %link{:rel => instance_action, :method => instance_action_method(instance_action), :href => self.send("#{instance_action}_instance_url", @instance.id)}
+  - if @instance.name
+    %name<
+      =@instance.name
+  - if @instance.owner_id
+    %owner_id<
+      =@instance.owner_id
+  - if @instance.image_id
+    %image{:href => image_url(@instance.image_id), :id => @instance.image_id }
+  - if @instance.realm_id
+    %realm{:href => realm_url(@instance.realm_id), :id => @instance.realm_id }
+  - if @instance.state
+    %state<
+      =@instance.state
+  - if @instance.instance_profile
+    - haml_tag :"hardware_profile", {:id => @instance.instance_profile.id, :href => hardware_profile_url(@instance.instance_profile.id)} do
+      - @instance.instance_profile.overrides.each do |p, v|
+        %property{:kind => 'fixed', :name => p, :value => v, :unit => Deltacloud::HardwareProfile::unit(p)}
+  - if @instance.actions
+    %actions
+      - @instance.actions.compact.each do |instance_action|
+        %link{:rel => instance_action, :method => instance_action_method(instance_action), :href => self.send("#{instance_action}_instance_url", @instance.id)}
   - if @instance.instance_variables.include?("@launch_time")
     %launch_time<
       =@instance.launch_time
-  %public_addresses
-    - @instance.public_addresses.each do |address|
-      %address<
-        =address
-  %private_addresses
-    - @instance.private_addresses.each do |address|
-      %address<
-        =address
+  - if @instance.public_addresses
+    %public_addresses
+      - @instance.public_addresses.each do |address|
+        %address<
+          =address
+  - if @instance.private_addresses
+    %private_addresses
+      - @instance.private_addresses.each do |address|
+        %address<
+          =address
   - if driver_has_auth_features?
     %authentication{ :type => driver_auth_feature_name }
       - if @instance.authn_feature_failed?

data/views/keys/index.html.haml

@@ -0,0 +1,26 @@
+%h1 Keys
+
+%table.display
+  %thead
+    %tr
+      %th ID
+      %th Credentials details
+      %th Actions
+  %tbody
+    - @elements.each do |key|
+      %tr
+        %td
+          = link_to key.id, key_url( key.id )
+        %td
+          - if key.credential_type.eql?(:key)
+            = key.fingerprint
+          - if key.credential_type.eql?(:password)
+            = "#{key.username} - #{key.password}"
+        %td
+          - if driver.respond_to?(:destroy_key)
+            =link_to 'Destroy', destroy_key_url(key.id), :class => 'delete'
+  %tfoot
+    - if driver.respond_to?(:create_key)
+      %tr
+        %td{:colspan => 3, :style => "text-align:right;"}
+          =link_to 'Create »', "#{url_for('/api/keys/new')}", :class => 'button'

data/views/keys/index.xml.haml

@@ -0,0 +1,4 @@
+!!!XML
+%keys
+  - @elements.each do |c|
+    = haml :'keys/show', :locals => { :@key => c, :partial => true }

data/views/keys/new.html.haml

@@ -0,0 +1,8 @@
+%h1 New key
+
+%form{ :action => '/api/keys', :method => :post }
+  %p
+    %label
+      Name:
+    %input{ :name => 'name', :size => 30 }/
+    %input{ :type => :submit, :name => "commit", :value => "create" }/

data/views/keys/show.html.haml

@@ -0,0 +1,22 @@
+%h1
+  = @key.id
+
+%dl
+  - if @key.is_key?
+    %di
+      %dt Fingerprint
+      %dd
+        = @key.fingerprint
+      - if @key.pem_rsa_key
+        %dt PEM key
+        %dd
+          %pre
+            = @key.pem_rsa_key
+  - if @key.is_password?
+    %di
+      %dt Username
+      %dd
+        = @key.username
+      %dt Password
+      %dd
+        = @key.password

data/views/keys/show.xml.haml

@@ -0,0 +1,20 @@
+- unless defined?(partial)
+  !!! XML
+%key{ :href => key_url(@key.id), :id => @key.id, :type => "#{@key.credential_type}" }
+  %actions
+    - if driver.respond_to?(:destroy_key)
+      %link{ :rel => "destroy", :method => "delete", :href => destroy_key_url(@key.id)}
+  - if @key.is_key?
+    %fingerprint<
+      =@key.fingerprint
+    - unless @key.pem_rsa_key.nil?
+      %pem<
+        =cdata do
+          =@key.pem_rsa_key
+  - if @key.is_password?
+    %username<
+      =cdata do
+        =@key.username
+    %password<
+      =cdata do
+        =@key.password

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 +02:00
+date: 2010-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -245,6 +245,7 @@ files:
 - lib/deltacloud/models/realm.rb
 - lib/deltacloud/models/storage_snapshot.rb
 - lib/deltacloud/models/storage_volume.rb
+- lib/deltacloud/models/key.rb
 - lib/deltacloud/state_machine.rb
 - lib/deltacloud/validation.rb
 - lib/drivers.rb
@@ -313,6 +314,11 @@ files:
 - views/storage_volumes/index.xml.haml
 - views/storage_volumes/show.html.haml
 - views/storage_volumes/show.xml.haml
+- views/keys/index.html.haml
+- views/keys/index.xml.haml
+- views/keys/new.html.haml
+- views/keys/show.html.haml
+- views/keys/show.xml.haml
 - views/instance_states/show.gv.erb
 - public/favicon.ico
 - public/images/grid.png