deltacloud-core 1.1.1 → 1.1.2

data/Rakefile

@@ -29,6 +29,8 @@ rescue LoadError
   exit(1)
 end
 
+require 'require_relative' if RUBY_VERSION < '1.9'
+
 $top_srcdir = File.dirname(__FILE__)
 $:.unshift File.join($top_srcdir, 'lib')
 
@@ -46,40 +48,44 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
 end
 
+# Not meant for enduser consumption; make sure we run our initializers
+task :initialize do
+  require_relative 'lib/initialize.rb'
+end
+
+namespace :db do
+  desc 'Execute the database migrations'
+  task 'migrate' do
+    load File.join(File.dirname(__FILE__), 'bin', 'deltacloud-db-upgrade')
+  end
+end
+
 namespace :mock do
   namespace :fixtures do
     desc "Setup Mock driver fixtures"
-    task 'setup' do
-      if ENV["DELTACLOUD_MOCK_STORAGE"]
-        storage_root = ENV["DELTACLOUD_MOCK_STORAGE"]
-      elsif ENV["USER"]
-        storage_root = File::join("/var/tmp", "deltacloud-mock-#{ENV["USER"]}")
-      else
-        raise "Please set either the DELTACLOUD_MOCK_STORAGE or USER environment variable"
-      end
-      data = Dir::glob(File::join(File::dirname(__FILE__), "lib", "deltacloud", "drivers", "mock", "data", "*"))
-      FileUtils::mkdir_p(storage_root, :verbose => true)
-      FileUtils::cp_r(data, storage_root, :verbose => true)
+    task 'setup' => :initialize do
+      srcdir = File::join(File::dirname(__FILE__), "lib", "deltacloud", "drivers", "mock", "data")
+      data = Dir::glob(File::join(srcdir, "*"))
+      srcdir.gsub!(/^#{ENV["PWD"]}/, ".")
+      srcdir.gsub!(/^#{ENV["HOME"]}/, "~")
+      puts "Copy mock data to #{MOCK_STORAGE_DIR}"
+      puts "  (from #{srcdir})"
+      FileUtils::cp_r(data, MOCK_STORAGE_DIR, :verbose => false)
     end
 
     desc "Remove Mock driver fixtures"
-    task 'clean' do
-      if ENV["DELTACLOUD_MOCK_STORAGE"]
-        storage_root = ENV["DELTACLOUD_MOCK_STORAGE"]
-      elsif ENV["USER"]
-        storage_root = File::join("/var/tmp", "deltacloud-mock-#{ENV["USER"]}")
-      else
-        raise "Please set either the DELTACLOUD_MOCK_STORAGE or USER environment variable"
-      end
-      FileUtils::rm_rf(storage_root, :verbose => true)
+    task 'clean' => :initialize do
+      puts "Remove mock data in #{MOCK_STORAGE_DIR}"
+      files = Dir::glob(File::join(MOCK_STORAGE_DIR, "*"))
+      FileUtils::rm_rf(files, :verbose => false)
     end
 
     desc "Reset Mock driver fixtures"
-    task 'reset' do
-      Rake::Task["mock:fixtures:clean"].reenable
-      Rake::Task["mock:fixtures:clean"].invoke
-      Rake::Task["mock:fixtures:setup"].reenable
-      Rake::Task["mock:fixtures:setup"].invoke
+    task 'reset' => :initialize do
+      ["mock:fixtures:clean", "mock:fixtures:setup"].each do |t|
+        Rake::Task[t].reenable
+        Rake::Task[t].invoke
+      end
     end
 
   end
@@ -91,7 +97,8 @@ desc "List the routes defined by Rabbit"
     desc "Print all routes defined for #{frontend.to_s.capitalize}"
     task :routes do
       ENV['API_FRONTEND'] = frontend.to_s
-      load File.join(File.dirname(__FILE__), 'config.ru')
+      require_relative './lib/initialize'
+      Deltacloud.generate_routes
       f_class = (frontend == :cimi) ? CIMI : Deltacloud
       f_class.collections.each do |c|
         puts "\033[1;32;m#{c.name}\33[0m"
@@ -132,9 +139,9 @@ end
 #       need to investigate in future.
 #
 if RUBY_PLATFORM == 'java'
-  DRIVERS = [:mock, :ec2, :rhevm, :gogrid, :openstack]
+  DRIVERS = [:mock, :ec2, :rhevm, :gogrid, :openstack, :fgcp]
 else
-  DRIVERS = [:mock, :ec2, :rhevm, :google, :gogrid, :openstack]
+  DRIVERS = [:mock, :ec2, :rhevm, :google, :gogrid, :openstack, :fgcp]
 end
 
 desc 'Run all tests'
@@ -149,6 +156,11 @@ task :test do
   puts "\n[ \033[1;37;mrake test:cimi\33[0m ]\n"
   Rake::Task["test:cimi"].invoke
   DRIVERS.each do |driver|
+    #
+    # FIXME: Skip FGCP tests under jRuby as jRuby openssl lacks
+    #        the OpenSSL::PKCS12::PKCS12Error class
+    #
+    next if RUBY_PLATFORM == 'java' and driver == :fgcp
     puts "\n[ \033[1;37;mrake drivers:#{driver}\33[0m ]\n"
     Rake::Task["test:drivers:#{driver}"].invoke
   end

data/bin/deltacloud-db-upgrade

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+# 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 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+# Force DB upgrade
+ENV['DB_UPGRADE'] = 'true'
+
+require_relative './../lib/initializers/mock_initialize'
+require_relative './../lib/initializers/database_initialize'

data/bin/deltacloudd

@@ -178,7 +178,6 @@ if !options[:daemon] || options[:daemon] && !have_thin
     msg << ":: http://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/#{api_uri}"
   end
   puts msg
-  puts
 end
 
 if ENV['API_USER'] && ENV['API_PASSWORD']
@@ -192,11 +191,11 @@ unless have_thin
 
   puts "To start Deltacloud as a daemon, install 'thin' (gem install thin)\n\n" if options[:daemon]
 
+  port = ENV["API_PORT"].to_i
   # 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",
                    nil, 'config.ru')
-
   app = Rack::Builder.new {
     use Rack::CommonLogger # apache-like logging
     use Rack::Reloader #if options[:env] == "development"
@@ -208,11 +207,20 @@ unless have_thin
   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 => [])
+
+  if RUBY_PLATFORM == 'java'
+    require 'puma'
+    events = Puma::Events.new STDOUT, STDERR
+    server = Puma::Server.new app, events
+    server.add_tcp_listener ENV['API_HOST'], port
+    server.run(false)
+  else
+    Rack::Server::start(:app => app,
+                        :Host => ENV["API_HOST"],
+                        :Port => port,
+                        :server => 'webrick',
+                        :AccessLog => [])
+  end
 else
   argv_opts = ARGV.clone
   argv_opts << ['start'] unless Thin::Runner.commands.include?(options[0])
@@ -231,7 +239,9 @@ else
     argv_opts << [ "--daemonize", "--user", options[:user] || 'nobody', "--tag", "deltacloud-#{ENV['API_DRIVER']}"]
     argv_opts << [ "--pid", options[:pid]] if options[:pid]
     argv_opts << [ "--group", options[:group] || 'nobody' ]
-    argv_opts << [ "--log", File.join(options[:logdir], "#{ENV['API_DRIVER']}.log")]
+    unless ENV['API_LOG']
+      argv_opts << [ "--log", File.join(options[:logdir], "#{ENV['API_DRIVER']}.log")]
+    end
   end
   argv_opts.flatten!
 
@@ -240,7 +250,8 @@ else
     command = argv_opts.join(" ")
     Dir::chdir($top_srcdir)
     rerun = Rerun::Runner.new(command,
-      :dir => File::join($top_srcdir, "lib"))
+      :dir => File::join($top_srcdir, "lib"),
+      :pattern => "**/*")
     rerun.start
     rerun.join
   else

data/config.ru

@@ -14,56 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# The default URL prefix (where to mount Deltacloud API)
-
-# The default driver is 'mock'
-ENV['API_DRIVER'] ||= 'mock'
-ENV['API_FRONTEND'] ||= 'deltacloud'
-
-load File.join(File.dirname(__FILE__), 'lib', 'deltacloud_rack.rb')
-
-Deltacloud::configure do |server|
-  server.root_url '/api'
-  server.version Deltacloud::API_VERSION
-  server.klass 'Deltacloud::API'
-end
-
-Deltacloud::configure(:cimi) do |server|
-  server.root_url '/cimi'
-  server.version Deltacloud::CIMI_API_VERSION
-  server.klass 'CIMI::API'
-end
-
-Deltacloud::configure(:ec2) do |server|
-  server.root_url '/ec2'
-  server.version '2012-04-01'
-  server.klass 'Deltacloud::EC2::API'
-end
-
-routes = {}
-
-def frontends
-  ENV['API_FRONTEND'].split(',').size > 1 ?
-    ENV['API_FRONTEND'].split(',') : [ENV['API_FRONTEND']]
-end
-
-# If user wants to launch multiple frontends withing a single instance of DC API
-# then require them and prepare the routes for Rack
-#
-# NOTE: The '/' will not be generated, since multiple frontends could have
-#       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)
-  end
-  Deltacloud[frontend.to_sym].require!
-  routes.merge!({
-    Deltacloud[frontend].root_url => Deltacloud[frontend].klass
-  })
-end
+load File.join(File.dirname(__FILE__), 'lib', 'initialize.rb')
 
 def static_dir_for(name)
   Rack::Directory.new( File.join(File.dirname(__FILE__), "public", name))
@@ -71,14 +22,22 @@ end
 
 # Mount static assets directories and index entrypoint
 #
-routes.merge!({
+# The 'IndexApp' is small Sinatra::Base application that
+# sits on the '/' route and display list of available frontends.
+#
+static_files = {
   '/' => Deltacloud::IndexApp,
   '/stylesheets' =>  static_dir_for('stylesheets'),
   '/javascripts' =>  static_dir_for('javascripts'),
   '/images' =>  static_dir_for('images')
-})
+}
+
+# The 'generate_routes_for' also require the frontend
+# servers and all dependencies.
+#
+routes = Deltacloud.generate_routes
 
 run Rack::Builder.new {
   use Rack::MatrixParams
-  run Rack::URLMap.new(routes)
+  run Rack::URLMap.new(routes.merge(static_files))
 }

data/db/migrations/1_add_realm_to_machine_template.rb

@@ -0,0 +1,23 @@
+# 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.
+
+Sequel.migration do
+  up do
+    add_column :entities, :realm, String
+  end
+  down do
+    drop_column :entities, :realm
+  end
+end

data/deltacloud-core.gemspec

@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
     'lib/**/*.rb',
     'lib/**/*.yml',
     'lib/**/*.haml',
+    'db/**/*.rb',
     'tests/**/*.rb',
     'views/**/*.haml',
     'views/instance_states/*.erb',
@@ -61,24 +62,29 @@ Gem::Specification.new do |s|
   ].map { |f| Dir[f] }.flatten
 
   s.bindir = 'bin'
-  s.executables = 'deltacloudd'
+  s.executables = ['deltacloudd', 'deltacloud-db-upgrade']
   s.test_files= Dir.glob("tests/**/*_test.rb")
   s.extra_rdoc_files = Dir["LICENSE", "DISCLAIMER", "NOTICE"]
   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', '>= 1.3.0')
-  s.add_dependency('sinatra-rabbit', '>= 1.0.11')
+  s.add_dependency('sinatra-rabbit', '>= 1.1.6')
   s.add_dependency('rack', '>= 1.0.0')
   s.add_dependency('rack-accept')
   s.add_dependency('json_pure', '>= 1.5.0')
   s.add_dependency('net-ssh', '>= 2.0.0')
   s.add_dependency('nokogiri', '>= 1.4.3')
   s.add_dependency('require_relative') if RUBY_VERSION < '1.9'
-
   s.add_dependency('sequel', '<= 3.42.0')
 
+  # FIXME: These dependencies are locked due to bugs that
+  #        we will not address in this release.
+  #
+  s.add_dependency('tilt', '<=1.3.3')
+  s.add_dependency('sinatra', '<=1.3.5')
+
+
   if RUBY_PLATFORM == 'java'
     s.add_dependency('jdbc-sqlite3')
   else
@@ -102,7 +108,7 @@ Gem::Specification.new do |s|
 
   # Terremark Vcloud Express
   s.add_dependency('fog', '>= 1.4.0')
-  s.add_dependency('excon', '>= 0.14.2' )
+  s.add_dependency('excon', '>= 0.14.2', '<0.17.0' )
 
   # Rhevm and Condor Cloud
   s.add_dependency('rest-client')

data/lib/cimi/collections.rb

@@ -15,45 +15,18 @@
 # under the License.
 
 require_relative './collections/base'
+require_relative './../deltacloud/helpers/collection_helper'
 
 module CIMI
 
-  def self.collection_names
-    @collections.map { |c| c.collection_name }
-  end
-
-  def self.collections
-    @collections ||= []
-  end
-
   module Collections
+    extend Deltacloud::CollectionHelper
 
-    def self.collection(name)
-      CIMI.collections.find { |c| c.collection_name == name }
-    end
-
-    def self.cimi_modules
-      @cimi_modules ||= []
-    end
-
-    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 collection
-      cimi_module_class = CIMI::Collections.const_get(base_collection_name.camelize)
-      cimi_modules << cimi_module_class
-      unless cimi_module_class.collections.nil?
-        cimi_module_class.collections.each do |c|
-          CIMI.collections << c
-        end
-      else
-        warn "WARNING: File %s placed in collections directory but does not have any collections defined" % base_collection_name
-      end
-    end
+    load_collections_for :cimi, :from => File.join(File.dirname(__FILE__), 'collections')
 
     def self.included(klass)
       klass.class_eval do
-        CIMI::Collections.cimi_modules.each { |c| use c }
+        CIMI::Collections.modules(:cimi).each { |c| use c }
       end
     end
 

data/lib/cimi/collections/address_templates.rb

@@ -45,11 +45,8 @@ module CIMI::Collections
       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
+          addr_templ = CIMI::Model::AddressTemplateCreate.parse(request.body, request.content_type)
+          new_address_template = addr_templ.create(self)
           headers_for_create new_address_template
           respond_to do |format|
             format.json { new_address_template.to_json }

data/lib/cimi/collections/addresses.rb

@@ -47,11 +47,8 @@ module CIMI::Collections
       operation :create, :with_capability => :create_address do
         description "Create a new Address"
         control do
-          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)
-          end
+          addr = CIMI::Model::AddressCreate.parse(request.body, request.content_type)
+          address = addr.create(self)
           respond_to do |format|
             format.xml { address.to_xml }
             format.json { address.to_json }

data/lib/cimi/collections/base.rb

@@ -18,6 +18,10 @@ require_relative '../models'
 module CIMI::Collections
   class Base < Sinatra::Base
 
+    Sinatra::Rabbit.configure do
+      enable :use_namespace
+    end
+
     include Sinatra::Rabbit
     include Sinatra::Rabbit::Features
     include CIMI::Model
@@ -40,8 +44,8 @@ module CIMI::Collections
     set :root_path, config.root_url
     set :version, config.version
     set :root, File.join(File.dirname(__FILE__), '..', '..', '..')
-    set :views, root + '/views/cimi'
-    set :public_folder, root + '/public'
+    set :views, File.join(root, 'views')
+    set :public_folder, File.join(root, 'public')
     set :documentation_class, CIMI
     set :haml, :format => :xhtml
 
@@ -53,14 +57,22 @@ module CIMI::Collections
       report_error
     end
 
+    error CIMI::Model::ValidationError do
+      report_error
+    end
+
+    error JSON::ParserError do
+      report_error(400, "Bad request (#{request.env['sinatra.error'].message})")
+    end
+
+    error REXML::ParseException do
+      report_error(400)
+    end
+
     before do
       # Respond with 400, If we don't get a http Host header,
       halt 400, "Unable to find HTTP Host header" if @env['HTTP_HOST'] == nil
     end
 
-    after do
-      headers 'CIMI-Specification-Version' => Deltacloud[:cimi].version
-    end
-
   end
 end