deltacloud-core 1.0.5 → 1.1.0

data/Rakefile

@@ -128,7 +128,14 @@ task :routes do
   Rake::Task['deltacloud:routes'].invoke
 end
 
-DRIVERS = [:mock, :ec2, :rhevm, :google, :gogrid, :openstack]
+# TODO: The 'google' driver tests are failing under jRuby
+#       need to investigate in future.
+#
+if RUBY_PLATFORM == 'java'
+  DRIVERS = [:mock, :ec2, :rhevm, :gogrid, :openstack]
+else
+  DRIVERS = [:mock, :ec2, :rhevm, :google, :gogrid, :openstack]
+end
 
 desc 'Run all tests'
 task :test do
@@ -160,7 +167,7 @@ namespace :test do
 
     DRIVERS.each do |driver|
       Rake::TestTask.new(driver) do |t|
-        t.ruby_opts << '-r./tests/test_helper.rb'   # Load SimpleCov when COVERAGE=1 is set
+        #t.ruby_opts << '-r./tests/test_helper.rb'   # Load SimpleCov when COVERAGE=1 is set
         unless RUBY_VERSION < '1.9.0'
           t.loader = :testrb
         end
@@ -199,6 +206,7 @@ namespace :test do
         t.loader = :testrb
       end
       t.test_files = FileList[
+        'tests/cimi/db/*test.rb',            # CIMI frontend database tests
         'tests/cimi/model/*spec.rb',            # CIMI frontend serialization API tests
         'tests/cimi/collections/*test.rb',      # CIMI frontend API tests
       ]

data/bin/deltacloudd

@@ -85,7 +85,7 @@ BANNER
   opts.on( '-V', '--verbose', 'Set verbose logging on') do |verbose|
     ENV["API_VERBOSE"] ||= 'true'
   end
-  opts.on(  nil, '--webrick', 'Force the use of WEBRick as a server') do |opt|
+  opts.on( '-w', '--webrick', 'Force the use of WEBRick as a server') do |opt|
     options[:webrick] = true
   end
   opts.on('--logdir LOGDIR', "Directory for log files, defaults to #{options[:logdir]}") do |opt|
@@ -165,7 +165,10 @@ end
 ENV["API_HOST"] = "localhost" unless ENV["API_HOST"]
 ENV["API_PORT"] = "3001" unless ENV["API_PORT"]
 
-unless options[:daemon]
+have_thin = options[:webrick].nil? && library_present?('thin')
+have_rerun = library_present?('rerun')
+
+if !options[:daemon] || options[:daemon] && !have_thin
   msg = "Starting Deltacloud API :: #{ENV["API_DRIVER"]} "
   msg << ":: #{ENV['API_PROVIDER']} " if ENV['API_PROVIDER']
   api_uri = ENV['API_FRONTEND'] == 'cimi' ? 'cimi/cloudEntryPoint' : 'api'
@@ -184,12 +187,11 @@ if ENV['API_USER'] && ENV['API_PASSWORD']
   puts
 end
 
-have_thin = options[:webrick].nil? && library_present?('thin')
-have_rerun = library_present?('rerun')
-
 unless have_thin
   require 'rack'
 
+  puts "To start Deltacloud as a daemon, install 'thin' (gem install thin)\n\n" if options[:daemon]
+
   # Read in config.ru and convert it to an instance of Rack::Builder
   cfgfile = File.read(File.join($top_srcdir, 'config.ru'))
   inner_app = eval("Rack::Builder.new {(" + cfgfile + "\n )}.to_app",
@@ -197,19 +199,17 @@ unless have_thin
 
   app = Rack::Builder.new {
     use Rack::CommonLogger # apache-like logging
-    use Rack::Reloader if options[:env] == "development"
-    unless RUBY_PLATFORM == 'java'
-      set :root, $top_srcdir # Set Sinatra root since we can't chdir to ../
-    end
+    use Rack::Reloader #if options[:env] == "development"
     run inner_app
   }.to_app
 
   # There's a bug with string ports on JRuby so convert to int
   # http://jira.codehaus.org/browse/JRUBY-4868
   port = ENV["API_PORT"].to_i
-
   puts "=> Ctrl-C to shutdown server"
+  Dir::chdir($top_srcdir)
   Rack::Server::start(:app => app,
+                      :server => :webrick,
                       :Host => ENV["API_HOST"],
                       :Port => port,
                       :AccessLog => [])

data/config.ru

@@ -30,7 +30,7 @@ end
 
 Deltacloud::configure(:cimi) do |server|
   server.root_url '/cimi'
-  server.version Deltacloud::API_VERSION
+  server.version Deltacloud::CIMI_API_VERSION
   server.klass 'CIMI::API'
 end
 
@@ -54,6 +54,7 @@ end
 #       different root_url's
 #
 frontends.each do |frontend|
+  frontend = frontend.strip
   if Deltacloud[frontend.to_sym].nil?
     puts "ERROR: Unknown frontend (#{frontend}). Valid values are 'deltacloud,cimi,ec2'"
     exit(1)

data/config/drivers/digitalocean.yaml

@@ -0,0 +1,3 @@
+---
+:digitalocean:
+  :name: Digitalocean

data/deltacloud-core.gemspec

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-Kernel::load File::join(File::dirname(__FILE__), './lib/deltacloud/version.rb')
+require File::expand_path(File::join(File::dirname(__FILE__), './lib/deltacloud/version.rb'))
 
 Gem::Specification.new do |s|
   s.author = 'The Apache Software Foundation'
@@ -70,22 +70,29 @@ Gem::Specification.new do |s|
   s.add_dependency('haml', '>= 2.2.17')
   s.add_dependency('sinatra', '>= 1.3.0')
   s.add_dependency('sinatra-rabbit', '>= 1.0.11')
-  s.add_dependency('crack')
   s.add_dependency('rack', '>= 1.0.0')
   s.add_dependency('rack-accept')
   s.add_dependency('json', '>= 1.1.9')
   s.add_dependency('net-ssh', '>= 2.0.0')
-  s.add_dependency('thin', '>= 1.2.5') unless RUBY_PLATFORM == 'java'
   s.add_dependency('nokogiri', '>= 1.4.3')
   s.add_dependency('require_relative') if RUBY_VERSION < '1.9'
 
+  s.add_dependency('sequel', '<= 3.42.0')
+
+  if RUBY_PLATFORM == 'java'
+    s.add_dependency('jdbc-sqlite3')
+  else
+    s.add_dependency('sqlite3')
+    s.add_dependency('thin', '>= 1.2.5')
+  end
+
   # dependencies for various cloud providers:
 
   # RHEV-M and oVirt
-  s.add_dependency('rbovirt', '>=0.0.13')
+  s.add_dependency('rbovirt', '>=0.0.16')
 
   # Amazon EC2 S3
-  s.add_dependency('aws', '>=2.5.4')
+  s.add_dependency('aws', '>=2.6.0')
   # Microsoft Azure
   s.add_dependency('waz-storage', '>=1.1.0')
 
@@ -104,7 +111,7 @@ Gem::Specification.new do |s|
   s.add_dependency('uuidtools', '>= 2.1.1')
 
   # Openstack Compute and Object-Storage
-  s.add_dependency('openstack', '>= 1.0.6')
+  s.add_dependency('openstack', '>= 1.0.7')
 
   # Aruba Cloud
   s.add_dependency('savon', '>= 1.0.0')

data/lib/cimi/collections.rb

@@ -39,7 +39,7 @@ module CIMI
     Dir[File.join(File::dirname(__FILE__), "collections", "*.rb")].each do |collection|
       base_collection_name = File.basename(collection).gsub('.rb', '')
       next if base_collection_name == 'base'
-      require_relative collection
+      require collection
       cimi_module_class = CIMI::Collections.const_get(base_collection_name.camelize)
       cimi_modules << cimi_module_class
       unless cimi_module_class.collections.nil?

data/lib/cimi/collections/address_templates.rb

@@ -16,11 +16,11 @@
 module CIMI::Collections
   class AddressTemplates < Base
 
-    set :capability, lambda { |m| driver.respond_to? m }
+    set :capability, lambda { |t| true }
 
     collection :address_templates do
 
-      operation :index, :with_capability => :address_templates do
+      operation :index do
         description 'List all AddressTemplates in the AddressTemplateCollection'
         control do
           address_templates = AddressTemplate.list(self).filter_by(params['$select'])
@@ -31,7 +31,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show, :with_capability => :address_templates do
+      operation :show do
         description 'Show a specific AddressTemplate'
         control do
           address_template = CIMI::Model::AddressTemplate.find(params[:id], self)
@@ -42,6 +42,30 @@ module CIMI::Collections
         end
       end
 
+      operation :create do
+        description "Create new AddressTemplate"
+        control do
+          if grab_content_type(request.content_type, request.body) == :json
+            new_address_template = CIMI::Model::AddressTemplate.create_from_json(request.body.read, self)
+          else
+            new_address_template = CIMI::Model::AddressTemplate.create_from_xml(request.body.read, self)
+          end
+          headers_for_create new_address_template
+          respond_to do |format|
+            format.json { new_address_template.to_json }
+            format.xml { new_address_template.to_xml }
+          end
+        end
+      end
+
+      operation :destroy do
+        description "Delete a specified AddressTemplate"
+        control do
+          CIMI::Model::AddressTemplate.delete!(params[:id], self)
+          no_content_with_status(200)
+        end
+      end
+
     end
 
   end

data/lib/cimi/collections/addresses.rb

@@ -47,7 +47,7 @@ module CIMI::Collections
       operation :create, :with_capability => :create_address do
         description "Create a new Address"
         control do
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             address = CIMI::Model::Address.create(request.body.read, self, :json)
           else
             address = CIMI::Model::Address.create(request.body.read, self, :xml)

data/lib/cimi/collections/base.rb

@@ -23,6 +23,7 @@ module CIMI::Collections
     include CIMI::Model
 
     helpers Deltacloud::Helpers::Drivers
+    helpers Deltacloud::Helpers::Database
     helpers Sinatra::AuthHelper
     helpers Sinatra::Rabbit::URLHelper
     helpers Deltacloud::Helpers::Application

data/lib/cimi/collections/cloud_entry_point.rb

@@ -16,6 +16,10 @@
 module CIMI::Collections
   class CloudEntryPoint < Base
 
+    get '/' do
+      redirect url('/cloudEntryPoint'), 301
+    end
+
     collection :cloudEntryPoint do
       description 'Cloud entry point'
       operation :index do

data/lib/cimi/collections/credentials.rb

@@ -46,12 +46,12 @@ module CIMI::Collections
       operation :create, :with_capability => :create_key do
         description "Show specific machine admin"
         control do
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             new_admin = Credential.create_from_json(request.body.read, self)
           else
             new_admin = Credential.create_from_xml(request.body.read, self)
           end
-          status 201 # Created
+          headers_for_create new_admin
           respond_to do |format|
             format.json { new_admin.to_json }
             format.xml { new_admin.to_xml }

data/lib/cimi/collections/machine_images.rb

@@ -43,6 +43,26 @@ module CIMI::Collections
         end
       end
 
+      operation :create, :with_capability => :create_image do
+        description "Create a new machine image."
+        control do
+          machine_image = CIMI::Model::MachineImage.create(request.body, self)
+          headers_for_create machine_image
+          respond_to do |format|
+            format.xml { machine_image.to_xml }
+            format.json { machine_image.to_json }
+          end
+        end
+      end
+
+      operation :destroy, :with_capability => :destroy_image do
+        description "Delete a specified MachineImage"
+        control do
+          CIMI::Model::MachineImage.delete!(params[:id], self)
+          no_content_with_status 200
+        end
+      end
+
     end
 
   end

data/lib/cimi/collections/machine_templates.rb

@@ -0,0 +1,72 @@
+# 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.
+
+module CIMI::Collections
+  class MachineTemplates < Base
+
+    set :capability, lambda { |t| true }
+
+    collection :machine_templates do
+
+      operation :index do
+        description "List all machine templates"
+        control do
+          machine_templates = CIMI::Model::MachineTemplate.list(self).filter_by(params['$select'])
+          respond_to do |format|
+            format.xml { machine_templates.to_xml }
+            format.json { machine_templates.to_json }
+          end
+        end
+      end
+
+      operation :show do
+        description "Show specific machine template"
+        control do
+          machine_template = CIMI::Model::MachineTemplate.find(params[:id], self)
+          respond_to do |format|
+            format.xml { machine_template.to_xml }
+            format.json { machine_template.to_json }
+          end
+        end
+      end
+
+      operation :create do
+        description "Create new machine template"
+        control do
+          if grab_content_type(request.content_type, request.body) == :json
+            new_machine_template = CIMI::Model::MachineTemplate.create_from_json(request.body.read, self)
+          else
+            new_machine_template = CIMI::Model::MachineTemplate.create_from_xml(request.body.read, self)
+          end
+          headers_for_create new_machine_template
+          respond_to do |format|
+            format.json { new_machine_template.to_json }
+            format.xml { new_machine_template.to_xml }
+          end
+        end
+      end
+
+      operation :destroy do
+        description "Delete a specified machine template"
+        control do
+          CIMI::Model::MachineTemplate.delete!(params[:id], self)
+          no_content_with_status(200)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/cimi/collections/machines.rb

@@ -46,13 +46,12 @@ module CIMI::Collections
       operation :create, :with_capability => :create_instance do
         description "Create a new Machine entity."
         control do
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             new_machine = Machine.create_from_json(request.body.read, self)
           else
             new_machine = Machine.create_from_xml(request.body.read, self)
           end
-          status 201 # Created
-          headers 'Location' => new_machine.id
+          headers_for_create new_machine
           respond_to do |format|
             format.json { new_machine.to_json }
             format.xml { new_machine.to_xml }
@@ -73,7 +72,7 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if request.content_type.end_with?("json")
+          if grab_content_type(request.content_type, request.body) == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -85,15 +84,15 @@ module CIMI::Collections
         end
       end
 
-      action :restart, :with_capability => :restart_instance do
+      action :restart, :with_capability => :reboot_instance do
         description "Start specific machine."
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if request.content_type.end_with?("json")
-            action = Action.from_json(request.body.read)
+          if  grab_content_type(request.content_type, request.body) == :json
+            action = Action.from_json(request.body.read.gsub("restart", "reboot"))
           else
-            action = Action.from_xml(request.body.read)
+            action = Action.from_xml(request.body.read.gsub("restart", "reboot"))
           end
           machine.perform(action, self) do |operation|
             no_content_with_status(202) if operation.success?
@@ -107,7 +106,7 @@ module CIMI::Collections
         param :id,          :string,    :required
         control do
           machine = Machine.find(params[:id], self)
-          if request.content_type.end_with?("json")
+          if  grab_content_type(request.content_type, request.body) == :json
             action = Action.from_json(request.body.read)
           else
             action = Action.from_xml(request.body.read)
@@ -131,54 +130,64 @@ module CIMI::Collections
         end
       end
 
-      operation :volumes, :with_capability => :storage_volumes do
-        description "Retrieve the Machine's MachineVolumeCollection"
-        param :id,          :string,    :required
-        control do
-          volumes = MachineVolumeCollection.default(params[:id], self)
-          respond_to do |format|
-            format.json {volumes.to_json}
-            format.xml  {volumes.to_xml}
+      #use rabbit subcollections for volumes index/show:
+      collection :volumes, :with_id => :vol_id do
+
+        operation :index, :with_capability => :storage_volumes do
+          description "Retrieve the Machine's MachineVolumeCollection"
+          control do
+            volumes = CIMI::Model::MachineVolume.collection_for_instance(params[:id], self)
+            respond_to do |format|
+              format.json {volumes.to_json}
+              format.xml  {volumes.to_xml}
+            end
           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, :with_capability => :attach_storage_volume do
-        description "Attach CIMI Volume(s) to a machine."
-        param :id,          :string,    :required
-        control do
-          if request.content_type.end_with?("json")
-            volumes_to_attach = Volume.find_to_attach_from_json(request.body.read, self)
-          else
-            volumes_to_attach = Volume.find_to_attach_from_xml(request.body.read, self)
+        operation :show, :with_capability => :storage_volumes do
+          description "Retrieve a Machine's specific MachineVolume"
+          control do
+            volume = CIMI::Model::MachineVolume.find(params[:id], self, params[:vol_id])
+            respond_to do |format|
+              format.json {volume.to_json}
+              format.xml  {volume.to_xml}
+            end
           end
-          machine = Machine.attach_volumes(volumes_to_attach, self)
-          respond_to do |format|
-            format.json{ machine.to_json}
-            format.xml{machine.to_xml}
+        end
+
+        operation :destroy, :with_capability => :detach_storage_volume do
+          description "Remove/detach a volume from the Machine's MachineVolumeCollection"
+          control do
+            machine_volume = CIMI::Model::MachineVolume.find(params[:id], self, params[:vol_id])
+            location = machine_volume.initial_location
+            machine_volumes = Machine.detach_volume(params[:vol_id], location, self)
+            respond_to do |format|
+              format.json{ machine_volumes.to_json}
+              format.xml{ machine_volumes.to_xml}
+            end
           end
         end
+
       end
 
-      action :detach_volume, :http_method => :put, :with_capability => :detach_storage_volume do
-        description "Detach CIMI Volume(s) from a machine."
+      operation :volume_attach, :http_method => :post, :with_capability => :attach_storage_volume do
+        description "Attach CIMI Volume(s) to a machine."
         param :id,          :string,    :required
         control do
-          if request.content_type.end_with?("json")
-            volumes_to_detach = Volume.find_to_attach_from_json(request.body.read, self)
+          if  grab_content_type(request.content_type, request.body) == :json
+            volume_to_attach, location = MachineVolume.find_to_attach_from_json(request.body.read, self)
           else
-            volumes_to_detach = Volume.find_to_attach_from_xml(request.body.read, self)
+            volume_to_attach, location = MachineVolume.find_to_attach_from_xml(request.body.read, self)
           end
-          machine = Machine.detach_volumes(volumes_to_detach, self)
+          machine_volume = Machine.attach_volume(volume_to_attach,location, self)
+          headers_for_create machine_volume
           respond_to do |format|
-            format.json{ machine.to_json}
-            format.xml{machine.to_xml}
+            format.json{ machine_volume.to_json}
+            format.xml{machine_volume.to_xml}
           end
         end
       end
+
     end
 
   end