deltacloud-core 0.4.0 → 0.4.1

data/bin/deltacloudd

@@ -73,6 +73,9 @@ BANNER
   opts.on( '-t', '--timeout TIMEOUT', 'Timeout for single request (default: 60)') do |timeout|
     ENV["API_TIMEOUT"] = timeout
   end
+  opts.on( '-V', '--verbose', 'Set verbose logging on') do |verbose|
+    ENV["API_VERBOSE"] ||= 'true'
+  end
   opts.on( '-h', '--help', '') { options[:help] = true }
 
   opts.separator <<EOS
@@ -166,10 +169,6 @@ have_rerun = library_present?('rerun')
 unless have_thin
   require 'rack'
 
-  # We can't chdir with webrick so add our root directory
-  # onto the load path
-  $: << dirname
-
   # Read in config.ru and convert it to an instance of Rack::Builder
   cfgfile = File.read(File.join(dirname, 'config.ru'))
   inner_app = eval("Rack::Builder.new {(" + cfgfile + "\n )}.to_app",
@@ -196,8 +195,7 @@ else
   argv_opts << ['start'] unless Thin::Runner.commands.include?(options[0])
   argv_opts << ['--address', ENV["API_HOST"] ]
   argv_opts << ['--port', ENV["API_PORT"] ]
-  argv_opts << ['--rackup', 'config.ru' ]
-  argv_opts << ['--chdir', dirname ]
+  argv_opts << ['--rackup', File.join(dirname, 'config.ru') ]
   argv_opts << ['-e', options[:env] ]
   argv_opts << ['--timeout', ENV["API_TIMEOUT"] || '60']
   argv_opts << ['--threaded', '-D' ]
@@ -208,7 +206,7 @@ else
   if options[:daemon]
     options[:env] = "production"
     argv_opts << [ "--daemonize", "--user", options[:user] || 'nobody', "--tag", "deltacloud-#{ENV['API_DRIVER']}"]
-    argv << [ "--pid", options[:pid]] if options[:pid]
+    argv_opts << [ "--pid", options[:pid]] if options[:pid]
   end
   argv_opts.flatten!
 
@@ -220,6 +218,7 @@ else
     rerun.start
     rerun.join
   else
+    $:.unshift File.join(dirname)
     thin = Thin::Runner.new(argv_opts)
     thin.run!
   end

data/config.ru

@@ -16,8 +16,10 @@
 
 require 'rubygems'
 
-$:.unshift File.join(File.dirname(__FILE__), '.')
+top_srcdir = File.dirname(__FILE__)
 
-require 'server.rb'
+$:.unshift File.join(top_srcdir, 'lib')
+
+load File.join(top_srcdir, 'server.rb')
 
 run Sinatra::Application

data/deltacloud-core.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     which implements the REST interface.
   EOF
 
-  s.version = '0.4.0'
+  s.version = '0.4.1'
   s.date = Time.now
   s.summary = %q{Deltacloud REST API}
   s.files = FileList[
@@ -73,11 +73,26 @@ Gem::Specification.new do |s|
   s.add_dependency('json', '>= 1.1.9')
   s.add_dependency('net-ssh', '>= 2.0.0')
   s.add_dependency('thin', '>= 1.2.5')
-  s.add_dependency('nokogiri', ">= 1.4.3")
-  s.add_development_dependency('compass', '>= 0.8.17')
-  s.add_development_dependency('nokogiri', '>= 1.4.1')
-  s.add_development_dependency('rack-test', '>= 0.5.3')
-  s.add_development_dependency('cucumber', '>= 0.6.3')
-  s.add_development_dependency('rcov', '>= 0.9.8')
+  s.add_dependency('nokogiri', '>= 1.4.3')
+
+# dependencies for various cloud providers:
+# Amazon EC2 S3
+  s.add_dependency('aws', '>=2.5.4')
+# Microsoft Azure
+  s.add_dependency('waz-storage', '>=1.1.0')
+
+# Rackspace Cloudservers Cloudfiles
+  s.add_dependency('cloudservers')
+  s.add_dependency('cloudfiles')
+
+# Terremark Vcloud Express
+  s.add_dependency('fog')
+  s.add_dependency('excon')
+
+# Rhevm and Condor Cloud
+  s.add_dependency('rest-client')
+
+# Condor Cloud
+  s.add_dependency('uuidtools', '>= 2.1.1')
 
 end

data/lib/deltacloud.rb

@@ -0,0 +1,27 @@
+#
+# 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.
+
+require 'deltacloud/drivers'
+
+require 'deltacloud/core_ext'
+
+require 'deltacloud/base_driver'
+require 'deltacloud/hardware_profile'
+require 'deltacloud/state_machine'
+require 'deltacloud/helpers'
+require 'deltacloud/models'
+require 'deltacloud/validation'
+require 'deltacloud/runner'

data/lib/deltacloud/core_ext.rb

@@ -16,3 +16,4 @@
 
 require 'deltacloud/core_ext/string'
 require 'deltacloud/core_ext/integer'
+require 'deltacloud/core_ext/hash'

data/lib/deltacloud/core_ext/hash.rb

@@ -0,0 +1,29 @@
+# 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 Hash
+  def gsub_keys(rgx_pattern, replacement)
+    remove = []
+    self.each_key do |key|
+      if key.to_s.match(rgx_pattern)
+         new_key = key.to_s.gsub(rgx_pattern, replacement).downcase
+         self[new_key] = self[key]
+         remove << key
+      end
+    end
+    #remove the original keys
+    self.delete_if{|k,v| remove.include?(k)}
+  end
+end

data/lib/{drivers.rb → deltacloud/drivers.rb}

@@ -34,7 +34,8 @@ module Deltacloud
     def driver_config
       if Thread::current[:drivers].nil?
         Thread::current[:drivers] = {}
-        Dir[File.join(File::dirname(__FILE__), '..', 'config', 'drivers', '*.yaml')].each do |driver_file|
+        top_srcdir = File.join(File.dirname(__FILE__), '..', '..')
+        Dir[File.join(top_srcdir, 'config', 'drivers', '*.yaml')].each do |driver_file|
           Thread::current[:drivers].merge!(YAML::load(File::read(driver_file)))
         end
       end

data/lib/deltacloud/drivers/condor/condor_driver.rb

@@ -36,7 +36,7 @@ module Deltacloud
     module Condor
 
       require 'base64'
-      require 'uuid'
+      require 'uuidtools'
       require 'fileutils'
 
       class CondorDriver < Deltacloud::BaseDriver
@@ -139,7 +139,7 @@ module Deltacloud
               config_server_address = nil
             end
           end
-          vm_uuid ||= UUID::new.generate
+          vm_uuid ||= UUIDTools::UUID.random_create.to_s
           vm_otp ||= vm_uuid[0..7]
           new_client(credentials) do |condor|
             config_server_address ||= condor.ip_agent.address

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

@@ -212,21 +212,23 @@ module Deltacloud
         def create_instance(credentials, image_id, opts={})
           ec2 = new_client(credentials)
           instance_options = {}
-          instance_options.merge!(:user_data => opts[:user_data]) if opts[:user_data]
-          instance_options.merge!(:key_name => opts[:keyname]) if opts[:keyname]
-          instance_options.merge!(:availability_zone => opts[:realm_id]) if opts[:realm_id]
-          instance_options.merge!(:instance_type => opts[:hwp_id]) if opts[:hwp_id] && opts[:hwp_id].length > 0
+          if opts[:user_data]
+            instance_options[:user_data] = Base64::decode64(opts[:user_data])
+          end
+          instance_options[:key_name] = opts[:keyname] if opts[:keyname]
+          instance_options[:availability_zone] = opts[:realm_id] if opts[:realm_id]
+          instance_options[:instance_type] = opts[:hwp_id] if opts[:hwp_id] && opts[:hwp_id].length > 0
           firewalls = opts.inject([]){|res, (k,v)| res << v if k =~ /firewalls\d+$/; res}
-          instance_options.merge!(:group_ids => firewalls ) unless firewalls.empty?
-          instance_options.merge!(
-            :min_count => opts[:instance_count],
-            :max_count => opts[:instance_count]
-          ) if opts[:instance_count] and opts[:instance_count].length!=0
+          instance_options[:group_ids] = firewalls unless firewalls.empty?
+          if opts[:instance_count] and opts[:instance_count].length != 0
+            instance_options[:min_count] = opts[:instance_count]
+            instance_options[:max_count] = opts[:instance_count]
+          end
           if opts[:snapshot_id] and opts[:device_name]
-            instance_options.merge!(:block_device_mappings => [{
+            instance_options[:block_device_mappings] = [{
               :snapshot_id => opts[:snapshot_id],
               :device_name => opts[:device_name]
-            }])
+            }]
           end
           safely do
             new_instance = convert_instance(ec2.launch_instances(image_id, instance_options).first)

data/lib/deltacloud/drivers/mock/mock_driver.rb

@@ -18,6 +18,7 @@
 require 'deltacloud/base_driver'
 require 'yaml'
 require 'deltacloud/drivers/mock/mock_client'
+require 'base64'
 
 module Deltacloud::Drivers::Mock
 
@@ -200,7 +201,7 @@ module Deltacloud::Drivers::Mock
         :realm_id=>realm_id,
         :create_image=>true,
         :actions=>instance_actions_for( 'RUNNING' ),
-        :user_data => opts[:user_data]
+        :user_data => opts[:user_data] ? Base64::decode64(opts[:user_data]) : nil
       }
       @client.store(:instances, instance)
       Instance.new( instance )

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

@@ -23,10 +23,26 @@ require 'json'
 
 module RHEVM
 
+  # NOTE: Injected file will be available in floppy drive inside
+  #       the instance. (Be sure you 'modprobe floppy' on Linux)
+  FILEINJECT_PATH = "deltacloud-user-data.txt"
+
   def self.client(url)
     RestClient::Resource.new(url)
   end
 
+  class BackendVersionUnsupportedException < StandardError; end
+  class RHEVMBackendException < StandardError
+    def initialize(message)
+      @message = message
+      super
+    end
+
+    def message
+      @message
+    end
+  end
+
   class Client
 
     attr_reader :credentials, :api_entrypoint
@@ -61,11 +77,31 @@ module RHEVM
         RHEVM::client(@api_entrypoint)["/vms/%s" % id].delete(headers)
       else
         xml_response = Client::parse_response(RHEVM::client(@api_entrypoint)["/vms/%s/%s" % [id, action]].post('<action/>', headers))
-        return false if (xml_response/'action/status').first.text!="COMPLETE"
+        return false if (xml_response/'action/status').first.text.strip.upcase!="COMPLETE"
       end
       return true
     end
 
+    def api_version?(major)
+      headers = {
+        :content_type => 'application/xml',
+        :accept => 'application/xml'
+      }
+      headers.merge!(auth_header)
+      result_xml = Nokogiri::XML(RHEVM::client(@api_entrypoint)["/"].get(headers))
+      (result_xml/'/api/system_version').first[:major].strip == major
+    end
+
+    def cluster_version?(cluster_id, major)
+      headers = {
+        :content_type => 'application/xml',
+        :accept => 'application/xml'
+      }
+      headers.merge!(auth_header)
+      result_xml = Nokogiri::XML(RHEVM::client(@api_entrypoint)["/clusters/%s" % cluster_id].get(headers))
+      (result_xml/'/cluster/version').first[:major].strip == major
+    end
+
     def create_vm(template_id, opts={})
       opts ||= {}
       builder = Nokogiri::XML::Builder.new do
@@ -78,6 +114,23 @@ module RHEVM
           cpu {
             topology( :cores => (opts[:hwp_cpu] || '1'), :sockets => '1' )
           }
+          if opts[:user_data] and not opts[:user_data].empty?
+            if api_version?('3') and cluster_version?((opts[:realm_id] || clusters.first.id), '3')
+              custom_properties {
+                #
+                # FIXME: 'regexp' parameter is just a temporary workaround. This
+                # is a reported and verified bug and should be fixed in next
+                # RHEV-M release.
+                #
+                custom_property({
+                  :name => "floppyinject",
+                  :value => "#{RHEVM::FILEINJECT_PATH}:#{Base64.decode64(opts[:user_data])}",
+                  :regexp => "^([^:]+):(.*)$"})
+              }
+            else
+              raise BackendVersionUnsupportedException.new
+            end
+          end
         }
       end
       headers = opts[:headers] || {}
@@ -86,7 +139,16 @@ module RHEVM
         :accept => 'application/xml',
       })
       headers.merge!(auth_header)
-      vm = RHEVM::client(@api_entrypoint)["/vms"].post(Nokogiri::XML(builder.to_xml).root.to_s, headers)
+      begin
+        vm = RHEVM::client(@api_entrypoint)["/vms"].post(Nokogiri::XML(builder.to_xml).root.to_s, headers)
+      rescue
+        if $!.respond_to?(:http_body)
+          fault = (Nokogiri::XML($!.http_body)/'/fault/detail').first
+          fault = fault.text.gsub(/\[|\]/, '') if fault
+        end
+        fault ||= $!.message
+        raise RHEVMBackendException::new(fault)
+      end
       RHEVM::VM::new(self, Nokogiri::XML(vm).root)
     end
 

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

@@ -37,6 +37,8 @@ class RHEVMDriver < Deltacloud::BaseDriver
     constraint :max_length, 50
   end
 
+  feature :instances, :user_data
+
   USER_NAME_MAX = feature(:instances, :user_name).constraints[:max_length]
 
   # FIXME: These values are just for ilustration
@@ -192,6 +194,9 @@ class RHEVMDriver < Deltacloud::BaseDriver
       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/,'')
+      end
       convert_instance(client, client.create_vm(image_id, params))
     end
   end
@@ -305,8 +310,8 @@ class RHEVMDriver < Deltacloud::BaseDriver
   def convert_realm(r, dc)
     Realm.new(
       :id => r.id,
-      :name => dc.name,
-      :state => dc.status == 'UP' ? 'AVAILABLE' : 'DOWN',
+      :name => r.name,
+      :state => dc.status.strip.upcase == 'UP' ? 'AVAILABLE' : 'DOWN',
       :limit => :unlimited
     )
   end

data/lib/deltacloud/drivers/vsphere/vsphere_driver.rb

@@ -41,14 +41,14 @@ module Deltacloud::Drivers::VSphere
       vsphere = new_client(credentials)
       safely do
         service = vsphere.serviceInstance.content
-        max_memory, max_cpu_cores = 0, 0
+        max_memory, max_cpu_cores = [], []
         service.rootFolder.childEntity.grep(RbVmomi::VIM::Datacenter).each do |dc|
-          max_memory += dc.hostFolder.childEntity.first.summary.effectiveMemory
-          max_cpu_cores += dc.hostFolder.childEntity.first.summary.numCpuCores
+          max_memory << dc.hostFolder.childEntity.first.summary.effectiveMemory
+          max_cpu_cores << dc.hostFolder.childEntity.first.summary.numCpuCores
         end
         [Deltacloud::HardwareProfile::new('default') do
-          cpu (1..max_cpu_cores)
-          memory (128..max_memory)
+          cpu (1..max_cpu_cores.min)
+          memory (128..max_memory.min)
           architecture ['x86_64', 'i386']
         end]
       end
@@ -207,6 +207,7 @@ module Deltacloud::Drivers::VSphere
       safely do
         rootFolder = vsphere.serviceInstance.content.rootFolder
         vm = find_vm(credentials, opts[:image_id])
+        raise "ERROR: Could not find the image in given datacenter" unless vm[:instance]
         # New instance need valid resource pool and datastore to be placed.
         # For this reason, realm_id **needs** to be set.
         if opts and opts[:realm_id]
@@ -219,6 +220,7 @@ module Deltacloud::Drivers::VSphere
         relocate = { :pool => resourcePool, :datastore => datastore }
         relocateSpec = RbVmomi::VIM.VirtualMachineRelocateSpec(relocate)
         # Set extra configuration for VM, like template_id
+        raise "ERROR: Memory must be multiple of 4" unless valid_memory_value?(opts[:hwp_memory])
         machine_config = {
           :memoryMB => opts[:hwp_memory],
           :numCPUs => opts[:hwp_cpu],
@@ -240,6 +242,7 @@ module Deltacloud::Drivers::VSphere
             machine_config[:extraConfig] << {
               :key => 'user_data_file', :value => "#{opts[:name]}.iso"
             }
+            device.connectable.startConnected = true
             device.backing = RbVmomi::VIM.VirtualCdromIsoBackingInfo(:fileName => "[#{opts[:realm_id] || vm[:datastore]}] "+
                                                                      "/#{VSphere::FileManager::DIRECTORY_PATH}/#{opts[:name]}.iso")
             machine_config.merge!({
@@ -259,6 +262,7 @@ module Deltacloud::Drivers::VSphere
             machine_config[:extraConfig] << {
               :key => 'user_iso_file', :value => "#{opts[:name]}.iso"
             }
+            device.connectable.startConnected = true
             device.backing = RbVmomi::VIM.VirtualCdromIsoBackingInfo(:fileName => "[#{opts[:realm_id] || vm[:datastore]}] "+
                                                                      "/#{VSphere::FileManager::DIRECTORY_PATH}/#{opts[:name]}.iso")
             machine_config.merge!({
@@ -376,7 +380,7 @@ module Deltacloud::Drivers::VSphere
     def convert_realm(datastore)
       Realm::new(
         :id => datastore.name,
-        :name => datastore.name, 
+        :name => datastore.name,
         :limit => datastore.summary.freeSpace,
         :state => datastore.summary.accessible ? 'AVAILABLE' : 'UNAVAILABLE'
       )
@@ -400,6 +404,10 @@ module Deltacloud::Drivers::VSphere
       new_state
     end
 
+    def valid_memory_value?(val)
+      true if (val.to_i%4) == 0
+    end
+
   end
 
 end