deltacloud-core 0.5.0 → 1.0.0

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

@@ -14,7 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-require 'deltacloud/base_driver'
 require 'cloudfiles'
 require 'cloudservers'
 require 'base64'
@@ -28,10 +27,9 @@ class RackspaceDriver < Deltacloud::BaseDriver
   feature :instances, :user_name
   feature :instances, :authentication_password
   feature :instances, :user_files
+  feature :images, :user_name
 
-  def supported_collections
-    DEFAULT_COLLECTIONS + [ :buckets ] - [ :storage_snapshots, :storage_volumes ]
-  end
+  define_hardware_profile('default')
 
   def hardware_profiles(credentials, opts = {})
     rs = new_client( credentials )
@@ -100,8 +98,8 @@ class RackspaceDriver < Deltacloud::BaseDriver
       image = server.create_image(opts[:name])
       Image.new(
         :id => image.id.to_s,
-        :name => image.name,
-        :description => image.name,
+        :name => opts[:name] || image.name,
+        :description => opts[:description] || image.description,
         :owner_id => credentials.user,
         :state => image.status,
         :architecture => 'x86_64'
@@ -127,7 +125,7 @@ class RackspaceDriver < Deltacloud::BaseDriver
       :password => opts[:password]
     }
     param[:port] = opts[:port] || '22'
-    param[:ip] = target.public_addresses.first
+    param[:ip] = opts[:ip] || target.public_addresses.first.address
     safely do
       Deltacloud::Runner.execute(opts[:cmd], param)
     end
@@ -193,8 +191,8 @@ class RackspaceDriver < Deltacloud::BaseDriver
     start.to( :pending )          .on( :create )
     pending.to( :running )        .automatically
     running.to( :running )        .on( :reboot )
-    running.to( :shutting_down )  .on( :stop )
-    shutting_down.to( :stopped )  .automatically
+    running.to( :stopping )  .on( :stop )
+    stopping.to( :stopped )  .automatically
     stopped.to( :finish )         .automatically
   end
 

data/lib/deltacloud/drivers/rhevm/rhevm_driver.rb

@@ -14,36 +14,20 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# Minihowto: Setting up this driver
-#
-# 1. Setup RHEV-M server
-# 2. Setup RHEV-M API (git://git.fedorahosted.org/rhevm-api.git - follow README)
-# 3. Set URL to API using shell variable (or HTTP header, see comment on provider_url)
-#    export API_PROVIDER="https://x.x.x.x/rhevm-api-powershell"
-# 4. Start Deltacloud using: deltacloudd -i rhevm
-# 5. Use RHEV-M credentials + append Windows Domain
-#    like: admin@rhevm.example.com
-
-require 'deltacloud/base_driver'
-require 'deltacloud/drivers/rhevm/rhevm_client'
+require 'rbovirt'
 
 module Deltacloud
   module Drivers
-    module RHEVM
-
-class RHEVMDriver < Deltacloud::BaseDriver
+    module Rhevm
 
-  def supported_collections
-    DEFAULT_COLLECTIONS - [:storage_snapshots]
-  end
+class RhevmDriver < Deltacloud::BaseDriver
 
+  feature :instances, :user_data
   feature :instances, :user_name do
-    constraint :max_length, 50
+    { :max_length => 50 }
   end
 
-  feature :instances, :user_data
-
-  USER_NAME_MAX = feature(:instances, :user_name).constraints[:max_length]
+  USER_NAME_MAX = constraints(:collection => :instances, :feature => :user_name)[:max_length]
 
   # FIXME: These values are just for ilustration
   # Also I choosed 'SERVER' and 'DESKTOP' names
@@ -119,8 +103,8 @@ class RHEVMDriver < Deltacloud::BaseDriver
       template_name = "#{instance.first.name}-template"
     end
     safely do
-      new_image = client.create_template(opts[:id], :name => (opts[:name] || template_name),
-                                         :description => opts[:description])
+      new_image = client.create_template(:vm => opts[:id], :name => (opts[:name] || template_name),
+                                         :description => opts[:description] || template_name)
       convert_image(client, new_image)
     end
   end
@@ -161,14 +145,14 @@ class RHEVMDriver < Deltacloud::BaseDriver
   def stop_instance(credentials, id)
     client = new_client(credentials)
     safely do
-      raise "ERROR: Operation start failed" unless client.vm_action(id, :shutdown)
+      raise "ERROR: Operation stop failed" unless client.vm_action(id, :shutdown)
     end
   end
 
   def destroy_instance(credentials, id)
     client = new_client(credentials)
     safely do
-      raise "ERROR: Operation start failed" unless client.vm_action(id, :delete)
+      raise "ERROR: Operation destroy failed" unless client.destroy_vm(id)
     end
   end
 
@@ -187,42 +171,39 @@ class RHEVMDriver < Deltacloud::BaseDriver
   def create_instance(credentials, image_id, opts={})
     client = new_client(credentials)
     params = {}
-    name = opts[:name]
-    if not name
-      name = Time.now.to_i.to_s
-    end
-    if name.length > USER_NAME_MAX
-      raise "Parameter name must be #{USER_NAME_MAX} characters or less"
-    end
     safely do
-      params[:name] = name
-      params[:realm_id] = opts[:realm_id] if opts[:realm_id]
-      params[:hwp_id] = opts[:hwp_id] if opts[:hwp_id]
-      params[:hwp_memory] = opts[:hwp_memory] if opts[:hwp_memory]
-      params[:hwp_cpu] = opts[:hwp_cpu] if opts[:hwp_cpu]
-      if opts[:user_data]
-        params[:user_data] = opts[:user_data].gsub(/\n/,'')
+      if opts[:name]
+        raise "Parameter name must be #{USER_NAME_MAX} characters or less" if opts[:name].length > USER_NAME_MAX
       end
-      convert_instance(client, client.create_vm(image_id, params))
+      params[:name] = opts[:name]
+      params[:template] = opts[:image_id]
+      params[:cluster] = opts[:realm_id] if opts[:realm_id]
+      params[:hwp_id] = opts[:hwp_id] if opts[:hwp_id]
+      params[:memory] = (opts[:hwp_memory].to_i * 1024 * 1024) if opts[:hwp_memory]
+      params[:cores] = opts[:hwp_cpu] if opts[:hwp_cpu]
+      params[:user_data] = opts[:user_data].gsub(/\n/,'') if opts[:user_data]
+      params[:fileinject_path] = "deltacloud-user-data.txt"
+      convert_instance(client, client.create_vm(params))
     end
   end
 
   def valid_credentials?(credentials)
-    retval = true
     begin
-      realms(credentials)
-    rescue
-      retval = false
+      realms(credentials) && true
+    rescue => e
+      safely do
+        raise e
+      end
     end
-    retval
   end
 
   private
 
   def new_client(credentials)
-    url, datacenter = api_provider.split(';')
     safely do
-      ::RHEVM::Client.new(credentials.user, credentials.password, url, datacenter)
+      raise 'No API provider set for this request.' unless api_provider
+      url, datacenter = api_provider.split(';')
+      OVIRT::Client.new(credentials.user, credentials.password, url, datacenter)
     end
   end
 
@@ -247,10 +228,11 @@ class RHEVMDriver < Deltacloud::BaseDriver
                                    :hwp_cpu => inst.cores,
                                    :hwp_storage => "#{storage_size}"
     )
-    public_addresses = []
+
     # First try to get IP address from RHEV-M. This require rhev-agent package
     # installed on guest
-    public_addresses << InstanceAddress.new(inst.ip) if inst.ip
+    public_addresses = inst.ips.map { |ip| InstanceAddress.new(ip, :type => :ipv4) }
+
     # ConfServer will overide the IP address returned by RHEV-M guest agent
     if ENV['CONFIG_SERVER_ADDRESS']
       ip = confserver_ip(inst.id)
@@ -258,7 +240,7 @@ class RHEVMDriver < Deltacloud::BaseDriver
     end
     # If IP retrieval failed, fallback to VNC and MAC address
     if public_addresses.empty?
-      public_addresses = inst.macs.collect { |mac_address| InstanceAddress.new(mac_address, :type => :mac) }
+      public_addresses = inst.interfaces.map { |interface| InstanceAddress.new(interface.mac, :type => :mac) }
     end
     if inst.vnc
       public_addresses << InstanceAddress.new(inst.vnc[:address], :port => inst.vnc[:port], :type => :vnc)
@@ -269,7 +251,7 @@ class RHEVMDriver < Deltacloud::BaseDriver
       :state => state,
       :image_id => inst.template.id,
       :realm_id => inst.cluster.id,
-      :owner_id => inst.username,
+      :owner_id => client.credentials[:username],
       :launch_time => inst.creation_time,
       :instance_profile => profile,
       :hardware_profile_id => profile.id,
@@ -293,8 +275,10 @@ class RHEVMDriver < Deltacloud::BaseDriver
     end
     case state.strip.upcase
     when 'WAIT_FOR_LAUNCH', 'REBOOT_IN_PROGRESS', 'SAVING_STATE',
-      'RESTORING_STATE', 'POWERING_DOWN', 'POWERING_UP', 'IMAGE_LOCKED', 'SAVING_STATE' then
+      'RESTORING_STATE', 'POWERING_UP', 'IMAGE_LOCKED', 'SAVING_STATE' then
       'PENDING'
+    when 'POWERING_DOWN' then
+      'STOPPING'
     when 'UNASSIGNED', 'DOWN', 'PAUSED', 'NOT_RESPONDING', 'SUSPENDED', 'IMAGE_ILLEGAL', 'UNKNOWN' then
       'STOPPED'
     when 'UP', 'MIGRATING_TO', 'MIGRATING_FROM'
@@ -323,6 +307,7 @@ class RHEVMDriver < Deltacloud::BaseDriver
       :description => img.description,
       :owner_id => client.credentials[:username],
       :architecture => 'x86_64', # All RHEV-M VMs are x86_64
+      :hardware_profiles => hardware_profiles(nil),
       :state => img.status
     )
   end
@@ -338,31 +323,28 @@ class RHEVMDriver < Deltacloud::BaseDriver
 
   exceptions do
 
-    on /Bad Request/ do
-      status 400
-    end
-
-    on /RestClient::Unauthorized/ do
+    on /Unauthorized/ do
       status 401
     end
 
-    on /RestClient::ResourceNotFound/ do
-      status 404
+    on /(not supported|custom properties are not configured)/ do
+      message "The user_data, require the floppyinject hook installed in your RHEV-M deployment"
+      status 501
     end
 
-    on /RestClient::InternalServerError/ do
+    on /(InternalServerError|nodename nor servname provided|no available running Hosts)/ do
       status 502
     end
 
-    on /(RestClient|RHEVM)/ do
-      status 500
+    on /(404|ResourceNotFound)/ do
+      status 404
     end
 
-    on /(.*) not found^/ do
-      status 400
+    on /(RestClient|RHEVM|OVIRT)/ do
+      status 500
     end
 
-    on /Parameter name/ do
+    on /(Bad Request|Parameter name|No API provider)/ do
       status 400
     end
 

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

@@ -19,68 +19,61 @@
 
 require "net/http"
 require "net/https"
-require "rubygems"
-require "json"
-require "deltacloud/base_driver"
 
-module Deltacloud
-  module Drivers
-    module RimuHosting
+module Deltacloud::Drivers::RimuHosting
 
-class RimuHostingClient
-  def initialize(credentials ,baseuri = 'https://rimuhosting.com/r')
-    @uri = URI.parse(baseuri)
-    @service = Net::HTTP.new(@uri.host, @uri.port)
-    @service.use_ssl = true
-    @auth = "rimuhosting apikey=#{credentials.password}"
-  end
-
-  def request(resource, data='', method='GET')
-    headers = {"Accept" => "application/json", "Content-Type" => "application/json"}
-    if(!@auth.nil?)
-      headers["Authorization"] = @auth
+  class RimuHostingClient
+    def initialize(credentials ,baseuri = 'https://rimuhosting.com/r')
+      @uri = URI.parse(baseuri)
+      @service = Net::HTTP.new(@uri.host, @uri.port)
+      @service.use_ssl = true
+      @auth = "rimuhosting apikey=#{credentials.password}"
     end
-    safely do
-    r = @service.send_request(method, @uri.path + resource, data, headers)
-         puts r.body
-    res = JSON.parse(r.body)
-    res = res[res.keys[0]]
 
-    if(res['response_type'] == "ERROR" and ( (res['error_info']['error_class'] == "PermissionException") or
-					     (res['error_info']['error_class'] == "LoginRequired") ))
-      raise "AuthFailure"
-    end
-    res
-  end
+    def request(resource, data='', method='GET')
+      headers = {"Accept" => "application/json", "Content-Type" => "application/json"}
+      if(!@auth.nil?)
+        headers["Authorization"] = @auth
+      end
+      safely do
+        r = @service.send_request(method, @uri.path + resource, data, headers)
+        res = JSON.parse(r.body)
+        res = res[res.keys[0]]
 
-  def list_images
-    request('/distributions')["distro_infos"]
-  end
+        if(res['response_type'] == "ERROR" and ( (res['error_info']['error_class'] == "PermissionException") or 
+                                                (res['error_info']['error_class'] == "LoginRequired") ))
+          raise "AuthFailure"
+        end
+        res
+      end
 
-  def list_plans
-    request('/pricing-plans;server-type=VPS')["pricing_plan_infos"]
-  end
+      def list_images
+        request('/distributions')["distro_infos"]
+      end
 
-  def list_nodes
-    request('/orders;include_inactive=N')["about_orders"]
-  end
+      def list_plans
+        request('/pricing-plans;server-type=VPS')["pricing_plan_infos"]
+      end
 
-  def set_server_state(id, state)
-    json = {"reboot_request" => {"running_state" => state}}.to_json
-    request("/orders/order-#{id}-a/vps/running-state", json, 'PUT')
-  end
+      def list_nodes
+        request('/orders;include_inactive=N')["about_orders"]
+      end
 
-  def delete_server(id)
-    request("/orders/order-#{id}-a/vps",'', 'DELETE')
-  end
+      def set_server_state(id, state)
+        json = {"reboot_request" => {"running_state" => state}}.to_json
+        request("/orders/order-#{id}-a/vps/running-state", json, 'PUT')
+      end
 
-  def create_server(image_id, plan_code, name)
-    json = {:new_vps => {:instantiation_options => {:domain_name => name, :distro => image_id},
-                        :pricing_plan_code => plan_code}}.to_json
-    request('/orders/new-vps',json, 'POST')[:about_order]
-  end
-end
+      def delete_server(id)
+        request("/orders/order-#{id}-a/vps",'', 'DELETE')
+      end
 
+      def create_server(image_id, plan_code, name)
+        json = {:new_vps => {:instantiation_options => {:domain_name => name, :distro => image_id},
+                             :pricing_plan_code => plan_code}}.to_json
+        request('/orders/new-vps',json, 'POST')[:about_order]
+      end
     end
+
   end
 end

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

@@ -16,14 +16,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-require "deltacloud/base_driver"
 require "deltacloud/drivers/rimuhosting/rimuhosting_client"
 
 module Deltacloud
   module Drivers
-    module RimuHosting
+    module Rimuhosting
 
-class RimuHostingDriver < Deltacloud::BaseDriver
+class RimuhostingDriver < Deltacloud::BaseDriver
 
   feature :instances, :user_name
 
@@ -131,9 +130,9 @@ class RimuHostingDriver < Deltacloud::BaseDriver
             :owner_id => "root",
             :instance_profile => InstanceProfile.new("none"),
             :actions => instance_actions_for("RUNNING"),
-            :public_addresses => [ InstanceAddress.new(inst["allocated_ips"]["primary_ip"] ),
-            :launch_time => inst["billing_info"]["order_date"]["iso_format"]
-    })
+            :public_addresses => [ InstanceAddress.new(inst["allocated_ips"]["primary_ip"] )],
+            :launch_time => inst["billing_info"]["order_date"]["iso_format"]}
+                )
   end
 
   define_instance_states do
@@ -142,9 +141,9 @@ class RimuHostingDriver < Deltacloud::BaseDriver
     pending.to( :running )        .automatically
 
     running.to( :running )        .on(:reboot)
-    running.to( :shutting_down )  .on(:stop)
+    running.to( :stopping )       .on(:stop)
 
-    shutting_down.to( :stopped )  .automatically
+    stopping.to( :stopped )       .automatically
 
     stopped.to( :finish )         .automatically
   end

data/lib/deltacloud/drivers/sbc/sbc_client.rb

@@ -21,7 +21,7 @@ require 'digest/md5'
 
 module Deltacloud
   module Drivers
-    module SBC
+    module Sbc
 
 class FixtureNotFound < Exception; end
 

data/lib/deltacloud/drivers/sbc/sbc_driver.rb

@@ -15,17 +15,17 @@
 # under the License.
 
 require 'nokogiri'
-require 'deltacloud/drivers/sbc/sbc_client'
+require_relative './sbc_client'
 
 module Deltacloud
   module Drivers
-    module SBC
+    module Sbc
 #
 # Driver for the IBM Smart Business Cloud (SBC).
 #
 # 31 January 2011
 #
-class SBCDriver < Deltacloud::BaseDriver
+class SbcDriver < Deltacloud::BaseDriver
   #
   # Retrieves images
   #