deltacloud-core 1.0.1 → 1.0.2

data/Rakefile

@@ -20,88 +20,18 @@
 require 'rake'
 require 'rake/testtask'
 require 'rubygems/package_task'
-require 'rspec/core/rake_task'
 
 begin
-  require 'ci/reporter/rake/test_unit'
+  require "bundler"
+  Bundler.setup
 rescue LoadError
+  $stderr.puts "Please install bundler with 'gem install bundler'"
+  exit(1)
 end
 
 $top_srcdir = File.dirname(__FILE__)
 $:.unshift File.join($top_srcdir, 'lib')
 
-begin
-  require 'cucumber'
-  require 'cucumber/rake/task'
-  namespace :cucumber do
-    %w(mock ec2 sbc).each do |driver|
-      namespace driver do
-        Cucumber::Rake::Task.new(:test) do |t|
-          t.cucumber_opts = "../tests/#{driver} --format pretty"
-          t.rcov = false
-        end
-        Cucumber::Rake::Task.new(:features) do |t|
-          t.cucumber_opts = "../tests/#{driver} --format html --out ../tests/tmp/cucumber_#{driver}.html"
-          t.rcov = false
-        end
-        Cucumber::Rake::Task.new(:junit) do |t|
-          t.cucumber_opts = "../tests/#{driver} --format junit --out #{File.join(File.dirname(__FILE__), "tmp", "junit_#{driver}")}"
-        end
-      end
-    end
-  end
-  Cucumber::Rake::Task.new(:cimi) do |t|
-    t.cucumber_opts = "tests/cimi/features --format pretty"
-    t.rcov = false
-  end
-  namespace :cimi do
-    Cucumber::Rake::Task.new(:machines) do |t|
-      t.cucumber_opts = "tests/cimi/features/machines.feature --format pretty"
-      t.rcov = false
-    end
-    Cucumber::Rake::Task.new(:machine_images) do |t|
-      t.cucumber_opts = "tests/cimi/features/machine_images.feature --format pretty"
-      t.rcov = false
-    end
-    Cucumber::Rake::Task.new(:volumes) do |t|
-      t.cucumber_opts = "tests/cimi/features/volumes.feature --format pretty"
-      t.rcov = false
-   end
-  end
-rescue LoadError
-end
-
-
-desc "Call our Test::Unit suite"
-task :test do
-  %w(mock rackspace rhevm openstack google fgcp).each do |driver|
-   Rake::Task["test:#{driver}"].reenable
-   Rake::Task["test:#{driver}"].invoke
-  end
-end
-
-desc "Call our Cucumber suite"
-task :cucumber do
-  %w(mock ec2 sbc).each do |driver|
-   Rake::Task["cucumber:#{driver}:test"].reenable
-   Rake::Task["cucumber:#{driver}:test"].invoke
-  end
-end
-
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = FileList['spec/**/*_spec.rb']
-  t.rspec_opts = [ "--format", "nested", "--color", "-r ./spec/spec_helper.rb"]
-end
-
-Dir['spec/**/*_spec.rb'].each do |file|
-  RSpec::Core::RakeTask.new("spec:#{File.basename(file).gsub(/_spec\.rb$/, '')}") do |t|
-    t.pattern = FileList[file]
-    t.rspec_opts = [ "--format", "nested", "--color", "-r ./spec/spec_helper.rb"]
-  end
-end
-
-
-
 begin
   require 'yard'
   YARD::Rake::YardocTask.new do |t|
@@ -116,25 +46,6 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
 end
 
-namespace :routes do
-  desc "List all REST routes for the Deltacloud API"
-  task :api do
-    require 'deltacloud/server.rb'
-    Sinatra::Rabbit::routes.each do |m, path|
-      puts sprintf("\033[1;30m%-8s\033[0m %s", m.to_s.upcase, path)
-    end
-  end
-
-  desc "List all REST routes for the CIMI API"
-  task :cimi do
-    require 'cimi/server.rb'
-    Sinatra::Rabbit::routes.each do |m, path|
-      puts sprintf("\033[1;30m%-8s\033[0m %s", m.to_s.upcase, path)
-    end
-  end
-end
-
-
 namespace :mock do
   namespace :fixtures do
     desc "Setup Mock driver fixtures"
@@ -174,64 +85,111 @@ namespace :mock do
   end
 end
 
-namespace :openshift do
-
-  desc "Deploy Deltacloud API to OpenShift"
-  task :deploy do
-    print "RHN or OpenShift login with OpenShift Express access: "
-    STDOUT.flush
-    login = STDIN.gets.chomp
-    print "Password: "
-    system "stty -echo"
-    password = STDIN.gets.chomp
-    system "stty echo"
-    puts `rhc-create-app --rhlogin #{login} --app deltacloudtest --password '#{password}' --type ruby-1.8`
+desc "List the routes defined by Rabbit"
+task :routes do
+  load File.join(File.dirname(__FILE__), 'config.ru')
+  Deltacloud.collections.each do |c|
+    puts "\033[1;32;m#{c.name}\33[0m"
+    c.operations.each do |o|
+      puts "\033[1;37m%6s\033[0m :%-10s %-30s (%s)" % [
+        o.http_method.to_s.upcase,
+        o.operation_name,
+        o.full_path,
+        o.description[0..100]
+      ]
+    end
+    unless c.collections.empty?
+      puts
+      c.collections.each do |s|
+        puts "\033[1;32;m#{s.name}\33[0m"
+        s.operations.each do |o|
+          puts "\033[1;37m%6s\033[0m :%-10s %-30s (%s)" % [
+            o.http_method.to_s.upcase,
+            o.operation_name,
+            o.full_path,
+            o.description[0..100]
+          ]
+        end
+      end
+    end
+    puts
   end
 end
 
-namespace :rabbit do
-  load File.join(File.dirname(__FILE__), 'config.ru')
+DRIVERS = [:mock, :ec2, :rhevm]
 
-  desc "List the routes defined by Rabbit"
-  task :routes do
-    Deltacloud.collections.each do |c|
-      puts "\033[1;32;m#{c.name}\33[0m"
-      c.operations.each do |o|
-        puts "\033[1;37m%6s\033[0m :%-10s %-30s (%s)" % [
-          o.http_method.to_s.upcase,
-          o.operation_name,
-          o.full_path,
-          o.description[0..100]
-        ]
-      end
-      unless c.collections.empty?
-        puts
-        c.collections.each do |s|
-          puts "\033[1;32;m#{s.name}\33[0m"
-          s.operations.each do |o|
-            puts "\033[1;37m%6s\033[0m :%-10s %-30s (%s)" % [
-              o.http_method.to_s.upcase,
-              o.operation_name,
-              o.full_path,
-              o.description[0..100]
-            ]
-          end
+desc 'Run all tests'
+task :test do
+
+  Rake::Task["mock:fixtures:reset"].invoke
+  puts "\n[ \033[1;37;mrake test:base\33[0m ]\n"
+  Rake::Task["test:base"].invoke
+  Rake::Task["mock:fixtures:reset"].invoke
+  puts "\n[ \033[1;37;mrake test:ec2\33[0m ]\n"
+  Rake::Task["test:ec2"].invoke
+  puts "\n[ \033[1;37;mrake test:cimi:models\33[0m ]\n"
+  Rake::Task["test:cimi:models"].invoke
+  DRIVERS.each do |driver|
+    puts "\n[ \033[1;37;mrake drivers:#{driver}\33[0m ]\n"
+    Rake::Task["test:drivers:#{driver}"].invoke
+  end
+end
+
+namespace :test do
+
+  desc "Run all tests and generate code coverage report"
+  task :coverage do
+    ENV['COVERAGE'] = '1'
+    puts "[ \033[1;37;mCoverage report will be generated to server/coverage\33[0m ]\n\n"
+    Rake::Task["test"].invoke
+  end
+
+  namespace :drivers 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
+        unless RUBY_VERSION < '1.9.0'
+          t.loader = :testrb
         end
+        t.test_files = FileList["tests/drivers/#{driver}/*test.rb"]
       end
-      puts
     end
+
   end
 
-end
+  Rake::TestTask.new(:base) do |t|
+    unless RUBY_VERSION < '1.9.0'
+      t.loader = :testrb
+    end
+    t.test_files = FileList[
+      'tests/helpers/core_ext/*test.rb',        # Deltacloud extensions (core_ext) and other helpers
+      '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
+      'tests/deltacloud/collections/*test.rb',  # Deltacloud collections
+    ]
+  end
 
-namespace :test do
+  Rake::TestTask.new(:ec2) do |t|
+    unless RUBY_VERSION < '1.9.0'
+      t.loader = :testrb
+    end
+    t.test_files = FileList[
+      'tests/ec2/*test.rb',                     # EC2 frontend internal API tests
+    ]
+  end
 
-  %w(mock rackspace rhevm openstack google fgcp ec2).each do |driver|
-    desc "Run #{driver} unit tests"
-    Rake::TestTask.new(driver) { |t|
-      t.test_files = FileList.new("tests/drivers/#{driver}/*_test.rb")
-      t.verbose = true
-      t.warning = false
-    }
+  namespace :cimi do
+    Rake::TestTask.new(:models) do |t|
+      unless RUBY_VERSION < '1.9.0'
+        t.loader = :testrb
+      end
+      t.test_files = FileList[
+        'tests/cimi/spec/cimi/model/*spec.rb',        # CIMI frontend serialization API tests
+        'tests/cimi/collections/*test.rb',        # CIMI frontend API tests
+      ]
+    end
   end
+
 end

data/bin/deltacloudd

@@ -75,6 +75,7 @@ BANNER
   opts.on( '-g', '--group GROUP', 'Group to run daemon as. Use with -d (default: "nobody")') { |group| options[:group] = group }
   opts.on( '-b', '--pid PID', 'File to store PID (default: tmp/pids/thin.pid)') { |pid| options[:pid] = pid }
   opts.on( '-l', '--drivers', 'List available drivers') { |env| options[:drivers] = true }
+  opts.on( '-L', '--log FILE', 'Log requests to a file (default: disabled)') { |log| ENV['API_LOG'] = log }
   opts.on( '-s', '--ssl', 'Enable SSL (default: disabled)') { |ssl| options[:ssl] = true }
   opts.on( '-k', '--ssl-key KEY', 'SSL key file to use') { |key| options[:ssl_key] = key }
   opts.on( '-C', '--ssl-cert CERT', 'SSL certificate file to use') { |cert| options[:ssl_cert] = cert }
@@ -192,7 +193,9 @@ unless have_thin
   app = Rack::Builder.new {
     use Rack::CommonLogger # apache-like logging
     use Rack::Reloader if options[:env] == "development"
-    set :root, $top_srcdir # Set Sinatra root since we can't chdir to ../
+    unless RUBY_PLATFORM == 'java'
+      set :root, $top_srcdir # Set Sinatra root since we can't chdir to ../
+    end
     run inner_app
   }.to_app
 

data/config.ru

@@ -24,20 +24,26 @@ load File.join(File.dirname(__FILE__), 'lib', 'deltacloud_rack.rb')
 
 Deltacloud::configure do |server|
   server.root_url '/api'
-  server.version '1.0.0'
+  server.version '1.0.2'
   server.klass 'Deltacloud::API'
+  server.logger Rack::DeltacloudLogger.setup(ENV['API_LOG'], ENV['API_VERBOSE'])
+  server.default_driver ENV['API_DRIVER']
 end
 
 Deltacloud::configure(:cimi) do |server|
   server.root_url '/cimi'
-  server.version '1.0.0'
+  server.version '1.0.2'
   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.version '2012-04-01'
   server.klass 'Deltacloud::EC2::API'
+  server.logger Rack::DeltacloudLogger.setup(ENV['API_LOG'], ENV['API_VERBOSE'])
+  server.default_driver ENV['API_DRIVER']
 end
 
 routes = {}
@@ -51,21 +57,22 @@ routes = {}
 if ENV['API_FRONTEND'].split(',').size > 1
 
   ENV['API_FRONTEND'].split(',').each do |frontend|
-    Deltacloud.require_frontend!(frontend)
+    Deltacloud[frontend.to_sym].require!
     routes.merge!({
       Deltacloud[frontend].root_url => Deltacloud[frontend].klass
     })
   end
 
 else
-  Deltacloud.require_frontend!(ENV['API_FRONTEND'])
+  Deltacloud[ENV['API_FRONTEND'].to_sym].require!
+  Deltacloud[ENV['API_FRONTEND'].to_sym].default_frontend!
   class IndexEntrypoint < Sinatra::Base
     get "/" do
-      redirect Deltacloud[ENV['API_FRONTEND']].root_url, 301
+      redirect Deltacloud.default_frontend.root_url, 301
     end
   end
   routes['/'] = IndexEntrypoint.new
-  routes[Deltacloud[ENV['API_FRONTEND']].root_url] = Deltacloud[ENV['API_FRONTEND']].klass
+  routes[Deltacloud.default_frontend.root_url] = Deltacloud.default_frontend.klass
 end
 
 

data/config/drivers/aruba.yaml

@@ -0,0 +1,8 @@
+---
+:aruba:
+  :entrypoints:
+    compute:
+      dc1: https://api.dc1.computing.cloud.it/WsEndUser/v1.7/WsEndUser.svc?wsdl
+      dc2: https://api.dc2.computing.cloud.it/WsEndUser/v1.7/WsEndUser.svc?wsdl
+      dc3: https://api.dc3.computing.cloud.it/WsEndUser/v1.7/WsEndUser.svc?wsdl
+  :name: Aruba

data/config/drivers/fgcp.yaml

@@ -1,13 +1,14 @@
 ---
 :fgcp:
   :name: FGCP
-  :username: Username
+  :username: Folder name containing User Certificate
   :password: Secret Key Password of User Certificate
   :entrypoints:
     default:
-      jp: https://api.oviss.jp.fujitsu.com/ovissapi/endpoint
+      jp-east: https://api.oviss.jp.fujitsu.com/ovissapi/endpoint
       au: https://api.globalcloud.fujitsu.com.au/ovissapi/endpoint
       sg: https://api.globalcloud.sg.fujitsu.com/ovissapi/endpoint
       uk: https://api.globalcloud.uk.fujitsu.com/ovissapi/endpoint
       us: https://api.globalcloud.us.fujitsu.com/ovissapi/endpoint
       de: https://api.globalcloud.de.fujitsu.com/ovissapi/endpoint
+      jp-west: https://api.oviss2.jp.fujitsu.com/ovissapi/endpoint

data/deltacloud-core.gemspec

@@ -17,9 +17,8 @@
 require 'rake'
 
 Gem::Specification.new do |s|
-
   s.author = 'The Apache Software Foundation'
-  s.homepage = 'http://www.deltacloud.org'
+  s.homepage = "http://www.deltacloud.org"
   s.email = 'dev@deltacloud.apache.org'
   s.name = 'deltacloud-core'
 
@@ -30,7 +29,7 @@ Gem::Specification.new do |s|
     which implements the REST interface.
   EOF
 
-  s.version = '1.0.1'
+  s.version = '1.0.2'
   s.date = Time.now
   s.summary = %q{Deltacloud REST API}
   s.files = FileList[
@@ -48,6 +47,7 @@ Gem::Specification.new do |s|
     'support/condor/config/**',
     'lib/**/*.rb',
     'lib/**/*.yml',
+    'lib/**/*.haml',
     'tests/**/*.rb',
     'views/**/*.haml',
     'views/instance_states/*.erb',
@@ -62,21 +62,22 @@ Gem::Specification.new do |s|
 
   s.bindir = 'bin'
   s.executables = 'deltacloudd'
-  s.test_files= Dir.glob("tests/*_test.rb")
+  s.test_files= Dir.glob("tests/**/*_test.rb")
   s.extra_rdoc_files = Dir["LICENSE", "DISCLAIMER", "NOTICE"]
   s.required_ruby_version = '>= 1.8.1'
   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-rabbit', '>= 1.0.5')
+  s.add_dependency('sinatra-rabbit', '>= 1.0.10')
   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')
+  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'
 
 # dependencies for various cloud providers:
 # RHEV-M
@@ -92,8 +93,8 @@ Gem::Specification.new do |s|
   s.add_dependency('cloudfiles')
 
 # Terremark Vcloud Express
-  s.add_dependency('fog')
-  s.add_dependency('excon')
+  s.add_dependency('fog', '>= 1.4.0')
+  s.add_dependency('excon', '>= 0.14.2' )
 
 # Rhevm and Condor Cloud
   s.add_dependency('rest-client')
@@ -102,6 +103,9 @@ Gem::Specification.new do |s|
   s.add_dependency('uuidtools', '>= 2.1.1')
 
 # Openstack Compute and Object-Storage
-  s.add_dependency('openstack')
+  s.add_dependency('openstack', '>= 1.0.1')
+
+# Aruba Cloud
+  s.add_dependency('savon', '>= 1.0.0')
 
 end