deltacloud-core 1.0.2 → 1.0.3

data/Rakefile

@@ -116,7 +116,7 @@ task :routes do
   end
 end
 
-DRIVERS = [:mock, :ec2, :rhevm]
+DRIVERS = [:mock, :ec2, :rhevm, :google, :gogrid, :openstack]
 
 desc 'Run all tests'
 task :test do
@@ -164,6 +164,7 @@ namespace :test do
     end
     t.test_files = FileList[
       'tests/helpers/core_ext/*test.rb',        # Deltacloud extensions (core_ext) and other helpers
+      'tests/helpers/rack/*test.rb',            # Rack extensions Deltacloud use
       'tests/drivers/base/*test.rb',            # Deltacloud drivers API tests
       'tests/drivers/models/*test.rb',          # Deltacloud models tests
       'tests/deltacloud/*test.rb',              # Deltacloud internal API tests

data/bin/deltacloudd

@@ -150,10 +150,15 @@ end
 
 if options[:config]
   cfg = YAML::load(File.read(options[:config]))
-  if c = cfg[ENV["API_DRIVER"].to_sym]
-    ENV["API_PROVIDER"] ||= c[:provider]
-    ENV["API_USER"] ||= c[:user]
-    ENV["API_PASSWORD"] ||= c[:password]
+  if cfg.keys.any? { |k| k.is_a?(Symbol) }
+    puts "The config file #{options[:config]} uses symbols as keys"
+    puts "  Change them to be ordinary strings"
+    exit(1)
+  end
+  if c = cfg[ENV["API_DRIVER"]]
+    ENV["API_PROVIDER"] ||= c["provider"]
+    ENV["API_USER"] ||= c["user"]
+    ENV["API_PASSWORD"] ||= c["password"]
   end
 end
 
@@ -234,7 +239,8 @@ else
     argv_opts.unshift "thin"
     command = argv_opts.join(" ")
     Dir::chdir($top_srcdir)
-    rerun = Rerun::Runner.new(command, :dir => $top_srcdir)
+    rerun = Rerun::Runner.new(command,
+      :dir => File::join($top_srcdir, "lib", "deltacloud"))
     rerun.start
     rerun.join
   else

data/config.ru

@@ -24,7 +24,7 @@ load File.join(File.dirname(__FILE__), 'lib', 'deltacloud_rack.rb')
 
 Deltacloud::configure do |server|
   server.root_url '/api'
-  server.version '1.0.2'
+  server.version Deltacloud::API_VERSION
   server.klass 'Deltacloud::API'
   server.logger Rack::DeltacloudLogger.setup(ENV['API_LOG'], ENV['API_VERBOSE'])
   server.default_driver ENV['API_DRIVER']
@@ -32,14 +32,14 @@ end
 
 Deltacloud::configure(:cimi) do |server|
   server.root_url '/cimi'
-  server.version '1.0.2'
+  server.version Deltacloud::API_VERSION
   server.klass 'CIMI::API'
   server.logger Rack::DeltacloudLogger.setup(ENV['API_LOG'], ENV['API_VERBOSE'])
   server.default_driver ENV['API_DRIVER']
 end
 
 Deltacloud::configure(:ec2) do |server|
-  server.root_url '/'
+  server.root_url '/ec2'
   server.version '2012-04-01'
   server.klass 'Deltacloud::EC2::API'
   server.logger Rack::DeltacloudLogger.setup(ENV['API_LOG'], ENV['API_VERBOSE'])

data/deltacloud-core.gemspec

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-require 'rake'
+Kernel::load File::join(File::dirname(__FILE__), './lib/deltacloud/version.rb')
 
 Gem::Specification.new do |s|
   s.author = 'The Apache Software Foundation'
@@ -29,10 +29,10 @@ Gem::Specification.new do |s|
     which implements the REST interface.
   EOF
 
-  s.version = '1.0.2'
+  s.version = Deltacloud::API_VERSION
   s.date = Time.now
   s.summary = %q{Deltacloud REST API}
-  s.files = FileList[
+  s.files = [
     'Rakefile',
     '*.gemspec',
     'config.ru',
@@ -58,17 +58,17 @@ Gem::Specification.new do |s|
     'public/stylesheets/images/*.png',
     'public/stylesheets/compiled/*.css',
     'bin/deltacloudd'
-  ].to_a
+  ].map { |f| Dir[f] }.flatten
 
   s.bindir = 'bin'
   s.executables = 'deltacloudd'
   s.test_files= Dir.glob("tests/**/*_test.rb")
   s.extra_rdoc_files = Dir["LICENSE", "DISCLAIMER", "NOTICE"]
-  s.required_ruby_version = '>= 1.8.1'
+  s.required_ruby_version = '>= 1.8.6'
   s.has_rdoc = 'false'
   s.add_dependency('rake', '>= 0.8.7')
   s.add_dependency('haml', '>= 2.2.17')
-  s.add_dependency('sinatra', '>= 0.9.4')
+  s.add_dependency('sinatra', '>= 1.3.0')
   s.add_dependency('sinatra-rabbit', '>= 1.0.10')
   s.add_dependency('crack')
   s.add_dependency('rack', '>= 1.0.0')
@@ -79,33 +79,39 @@ Gem::Specification.new do |s|
   s.add_dependency('nokogiri', '>= 1.4.3')
   s.add_dependency('require_relative') if RUBY_VERSION < '1.9'
 
-# dependencies for various cloud providers:
-# RHEV-M
-  s.add_dependency('rbovirt', '>=0.0.6')
+  # dependencies for various cloud providers:
 
-# Amazon EC2 S3
+  # RHEV-M and oVirt
+  s.add_dependency('rbovirt', '>=0.0.12')
+
+  # Amazon EC2 S3
   s.add_dependency('aws', '>=2.5.4')
-# Microsoft Azure
+  # Microsoft Azure
   s.add_dependency('waz-storage', '>=1.1.0')
 
-# Rackspace Cloudservers Cloudfiles
+  # Rackspace Cloudservers Cloudfiles
   s.add_dependency('cloudservers')
   s.add_dependency('cloudfiles')
 
-# Terremark Vcloud Express
+  # Terremark Vcloud Express
   s.add_dependency('fog', '>= 1.4.0')
   s.add_dependency('excon', '>= 0.14.2' )
 
-# Rhevm and Condor Cloud
+  # Rhevm and Condor Cloud
   s.add_dependency('rest-client')
 
-# Condor Cloud
+  # Condor Cloud
   s.add_dependency('uuidtools', '>= 2.1.1')
 
-# Openstack Compute and Object-Storage
-  s.add_dependency('openstack', '>= 1.0.1')
+  # Openstack Compute and Object-Storage
+  s.add_dependency('openstack', '>= 1.0.4')
 
-# Aruba Cloud
+  # Aruba Cloud
   s.add_dependency('savon', '>= 1.0.0')
 
+  # VSphere
+  s.add_dependency('rbvmomi')
+
+
+
 end

data/lib/cimi/collections/address_templates.rb

@@ -16,11 +16,11 @@
 module CIMI::Collections
   class AddressTemplates < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
 
     collection :address_templates do
 
-      operation :index do
+      operation :index, :with_capability => :address_templates do
         description 'List all AddressTemplates in the AddressTemplateCollection'
         param :CIMISelect, :string, :optional
         control do
@@ -32,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :address_template do
         description 'Show a specific AddressTemplate'
         control do
           address_template = CIMI::Model::AddressTemplate.find(params[:id], self)

data/lib/cimi/collections/addresses.rb

@@ -16,12 +16,13 @@
 module CIMI::Collections
   class Addresses < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
+
     collection :addresses do
 
       description 'An Address represents an IP address, and its associated metdata, for a particular Network.'
 
-      operation :index do
+      operation :index, :with_capability => :addresses do
         description 'List all Addresses in the AddressCollection'
         param :CIMISelect, :string, :optional
         control do
@@ -33,7 +34,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :address do
         description 'Show a specific Address'
         control do
           address = CIMI::Model::Address.find(params[:id], self)
@@ -44,7 +45,7 @@ module CIMI::Collections
         end
       end
 
-      operation :create do
+      operation :create, :with_capability => :create_address do
         description "Create a new Address"
         control do
           if request.content_type.end_with?("json")
@@ -59,7 +60,7 @@ module CIMI::Collections
         end
       end
 
-      operation :destroy do
+      operation :destroy, :with_capability => :delete_address do
         description "Delete a specified Address"
         param :id, :string, :required
         control do

data/lib/cimi/collections/entity_metadata.rb

@@ -16,8 +16,6 @@
 module CIMI::Collections
   class EntityMetadata < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
-
     collection :entity_metadata do
 
       operation :index do

data/lib/cimi/collections/machine_admins.rb

@@ -16,12 +16,12 @@
 module CIMI::Collections
   class MachineAdmins < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
 
     collection :machine_admins do
       description 'Machine Admin entity'
 
-      operation :index do
+      operation :index, :with_capability => :keys do
         description "List all machine admins"
         param :CIMISelect,  :string,  :optional
         control do
@@ -33,7 +33,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :key do
         description "Show specific machine admin"
         control do
           machine_admin = MachineAdmin.find(params[:id], self)
@@ -44,7 +44,7 @@ module CIMI::Collections
         end
       end
 
-      operation :create do
+      operation :create, :with_capability => :create_key do
         description "Show specific machine admin"
         control do
           if request.content_type.end_with?("+json")
@@ -60,7 +60,7 @@ module CIMI::Collections
         end
       end
 
-      operation :delete do
+      operation :delete, :with_capability => :destroy_key do
         description "Delete specified MachineAdmin entity"
         control do
           MachineAdmin.delete!(params[:id], self)

data/lib/cimi/collections/machine_configurations.rb

@@ -21,7 +21,7 @@ module CIMI::Collections
     collection :machine_configurations do
       description 'List all machine configurations'
 
-      operation :index do
+      operation :index, :with_capability => :hardware_profiles do
         param :CIMISelect,  :string,  :optional
         description "List all machine configurations"
         control do
@@ -33,7 +33,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :hardware_profile do
         control do
           machine_conf = MachineConfiguration.find(params[:id], self)
           respond_to do |format|

data/lib/cimi/collections/machine_images.rb

@@ -16,12 +16,12 @@
 module CIMI::Collections
   class MachineImages < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
 
     collection :machine_images do
       description 'List all machine images'
 
-      operation :index do
+      operation :index, :with_capability => :images do
         description "List all machine configurations"
         param :CIMISelect,  :string,  :optional
         control do
@@ -33,7 +33,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :image do
         description "Show specific machine image."
         control do
           machine_image = MachineImage.find(params[:id], self)

data/lib/cimi/collections/machines.rb

@@ -16,12 +16,12 @@
 module CIMI::Collections
   class Machines < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
 
     collection :machines do
       description 'List all machine'
 
-      operation :index do
+      operation :index, :with_capability => :instances do
         param :CIMISelect,  :string,  :optional
         description "List all machines"
         control do
@@ -33,7 +33,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :instance do
         description "Show specific machine."
         control do
           machine = Machine.find(params[:id], self)
@@ -44,7 +44,7 @@ module CIMI::Collections
         end
       end
 
-      operation :create do
+      operation :create, :with_capability => :create_instance do
         description "Create a new Machine entity."
         control do
           if request.content_type.end_with?("+json")
@@ -60,7 +60,7 @@ module CIMI::Collections
         end
       end
 
-      operation :destroy do
+      operation :destroy, :with_capability => :destroy_instance do
         description "Delete a specified machine."
         param :id,          :string,    :required
         control do
@@ -69,7 +69,7 @@ module CIMI::Collections
         end
       end
 
-      action :stop do
+      action :stop, :with_capability => :stop_instance do
         description "Stop specific machine."
         control do
           machine = Machine.find(params[:id], self)
@@ -85,7 +85,7 @@ module CIMI::Collections
         end
       end
 
-      action :restart do
+      action :restart, :with_capability => :restart_instance do
         description "Start specific machine."
         control do
           machine = Machine.find(params[:id], self)
@@ -101,7 +101,7 @@ module CIMI::Collections
         end
       end
 
-      action :start do
+      action :start, :with_capability => :start_instance do
         description "Start specific machine."
         control do
           machine = Machine.find(params[:id], self)
@@ -117,10 +117,32 @@ module CIMI::Collections
         end
       end
 
+      operation :disks, :with_capability => :hardware_profiles do
+        description "Retrieve the Machine's DiskCollection"
+        control do
+          disks = DiskCollection.default(params[:id], self)
+          respond_to do |format|
+            format.json {disks.to_json}
+            format.xml  {disks.to_xml}
+          end
+        end
+      end
+
+      operation :volumes, :with_capability => :storage_volumes do
+        description "Retrieve the Machine's MachineVolumeCollection"
+        control do
+          volumes = MachineVolumeCollection.default(params[:id], self)
+          respond_to do |format|
+            format.json {volumes.to_json}
+            format.xml  {volumes.to_xml}
+          end
+        end
+      end
+
       #NOTE: The routes for attach/detach used here are NOT as specified by CIMI
       #will likely move later. CIMI specifies PUT of the whole Machine description
       #with inclusion/ommission of the volumes you want [att|det]ached
-      action :attach_volume, :http_method => :put do
+      action :attach_volume, :http_method => :put, :with_capability => :attach_storage_volume do
         description "Attach CIMI Volume(s) to a machine."
         control do
           if request.content_type.end_with?("+json")
@@ -136,7 +158,7 @@ module CIMI::Collections
         end
       end
 
-      action :detach_volume, :http_method => :put do
+      action :detach_volume, :http_method => :put, :with_capability => :detach_storage_volume do
         description "Detach CIMI Volume(s) from a machine."
         control do
           if request.content_type.end_with?("+json")

data/lib/cimi/collections/network_configurations.rb

@@ -16,10 +16,11 @@
 module CIMI::Collections
   class NetworkConfigurations < Base
 
-    check_capability :for => lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |m| driver.respond_to? m }
+
     collection :network_configurations do
 
-      operation :index do
+      operation :index, :with_capability => :network_configurations do
         description 'List all NetworkConfigurations'
         param :CIMISelect, :string, :optional
         control do
@@ -31,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show do
+      operation :show, :with_capability => :network_configuration do
         description 'Show a specific NetworkConfiguration'
         control do
           network_config = NetworkConfiguration.find(params[:id], self)