deltacloud-core 0.4.1 → 0.5.0

data/Rakefile

@@ -20,12 +20,16 @@
 require 'rake'
 require 'rake/testtask'
 require 'rubygems/package_task'
+require 'rspec/core/rake_task'
 
 begin
   require 'ci/reporter/rake/test_unit'
 rescue LoadError
 end
 
+$top_srcdir = File.dirname(__FILE__)
+$:.unshift File.join($top_srcdir, 'lib')
+
 begin
   require 'cucumber'
   require 'cucumber/rake/task'
@@ -46,11 +50,29 @@ begin
       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
 
 namespace :test do
-  %w(mock rackspace rhevm).each do |driver|
+  %w(mock rackspace rhevm openstack google).each do |driver|
     desc "Run #{driver} unit tests"
     Rake::TestTask.new(driver) { |t|
       t.test_files = ['tests/common.rb', "tests/drivers/#{driver}/setup.rb"] + FileList.new("tests/drivers/#{driver}/*_test.rb") + FileList.new('tests/rabbit_test.rb')
@@ -59,11 +81,20 @@ namespace :test do
       t.warning = false
     }
   end
+
+  desc "Run CIMI frontend tests"
+  Rake::TestTask.new "cimi" do |t|
+    t.test_files = ["tests/cimi/cimi.rb", "tests/cimi/common/*_test.rb"]
+    t.options = "-v -v"
+    t.verbose = true
+    t.warning = false
+  end
+
 end
 
 desc "Call our Test::Unit suite"
 task :test do
-  %w(mock rackspace rhevm).each do |driver|
+  %w(mock rackspace rhevm openstack google).each do |driver|
    Rake::Task["test:#{driver}"].reenable
    Rake::Task["test:#{driver}"].invoke
   end
@@ -77,6 +108,20 @@ task :cucumber do
   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|
@@ -91,14 +136,25 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
 end
 
-desc "List all REST routes defined through Rabbit"
-task :routes do
-  require 'server.rb'
-  Sinatra::Rabbit::routes.each do |m, path|
-    puts sprintf("\033[1;30m%-8s\033[0m %s", m.to_s.upcase, path)
+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"

data/bin/deltacloudd

@@ -16,6 +16,8 @@
 # under the License.
 #
 
+$top_srcdir = File::expand_path(File.join(File.dirname(__FILE__), '..'))
+
 require 'rubygems'
 require 'optparse'
 require 'yaml'
@@ -33,6 +35,7 @@ def library_present?(name)
 end
 
 DEFAULT_CONFIG = "~/.deltacloud/config"
+
 options = {
   :env => 'development'
 }
@@ -57,6 +60,9 @@ BANNER
   opts.on( '-P', '--provider PROVIDER', 'Use PROVIDER (default is set in the driver)') do |provider|
     ENV['API_PROVIDER'] = provider
   end
+  opts.on('--cimi', 'USe the DMTF CIMI frontend, not the Deltacloud frontend') do
+    ENV['API_FRONTEND'] = 'cimi'
+  end
   opts.on( '-c', '--config [FILE]', 'Read provider and other config from FILE (default: ~/.deltacloud/config)') do |config|
     options[:config] = File::expand_path(config || DEFAULT_CONFIG)
   end
@@ -65,7 +71,8 @@ BANNER
     options[:daemon] = true
   end
   opts.on( '-u', '--user USER', 'User to run daemon as. Use with -d (default: "nobody")') { |user| options[:user] = user }
-  opts.on( '', '--pid PID', 'File to store PID (default: tmp/pids/thin.pid)') { |pid| options[:pid] = pid }
+  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( '-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 }
@@ -76,6 +83,9 @@ 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|
+    options[:webrick] = true
+  end
   opts.on( '-h', '--help', '') { options[:help] = true }
 
   opts.separator <<EOS
@@ -112,7 +122,9 @@ unless options[:drivers] or ENV["API_DRIVER"]
 end
 
 if options[:drivers]
-  require 'server.rb'
+  $:.unshift File.join($top_srcdir, 'lib')
+  server_dir = ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud'
+  load File.join($top_srcdir, 'lib', server_dir, 'server.rb')
   puts "Available drivers:\n\n"
   puts "* " + driver_config.keys.map{ |d| d.to_s }.join("\n* ")
   puts
@@ -146,10 +158,11 @@ ENV["API_PORT"] = "3001" unless ENV["API_PORT"]
 unless options[:daemon]
   msg = "Starting Deltacloud API :: #{ENV["API_DRIVER"]} "
   msg << ":: #{ENV['API_PROVIDER']} " if ENV['API_PROVIDER']
+  api_uri = ENV['API_FRONTEND'] == 'cimi' ? 'cimi/cloudEntryPoint' : 'api'
   if options[:ssl]
-    msg << ":: https://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/api"
+    msg << ":: https://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/#{api_uri}"
   else
-    msg << ":: http://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/api"
+    msg << ":: http://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/#{api_uri}"
   end
   puts msg
   puts
@@ -161,23 +174,21 @@ if ENV['API_USER'] && ENV['API_PASSWORD']
   puts
 end
 
-dirname="#{File.dirname(__FILE__)}/.."
-
-have_thin = library_present?('thin')
+have_thin = options[:webrick].nil? && library_present?('thin')
 have_rerun = library_present?('rerun')
 
 unless have_thin
   require 'rack'
 
   # Read in config.ru and convert it to an instance of Rack::Builder
-  cfgfile = File.read(File.join(dirname, 'config.ru'))
+  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"
-    set :root, dirname # Set Sinatra root since we can't chdir to ../
+    set :root, $top_srcdir # Set Sinatra root since we can't chdir to ../
     run inner_app
   }.to_app
 
@@ -186,16 +197,16 @@ unless have_thin
   port = ENV["API_PORT"].to_i
 
   puts "=> Ctrl-C to shutdown server"
-  Rack::Handler::WEBrick.run(app,
-                             :Host => ENV["API_HOST"],
-                             :Port => port,
-                             :AccessLog => [])
+  Rack::Server::start(:app => app,
+                      :Host => ENV["API_HOST"],
+                      :Port => port,
+                      :AccessLog => [])
 else
   argv_opts = ARGV.clone
   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', File.join(dirname, 'config.ru') ]
+  argv_opts << ['--rackup', File.join($top_srcdir, 'config.ru') ]
   argv_opts << ['-e', options[:env] ]
   argv_opts << ['--timeout', ENV["API_TIMEOUT"] || '60']
   argv_opts << ['--threaded', '-D' ]
@@ -207,18 +218,19 @@ else
     options[:env] = "production"
     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("/var/log/deltacloud-core", "#{ENV['API_DRIVER']}.log")]
   end
   argv_opts.flatten!
 
   if have_rerun && options[:env] == "development"
     argv_opts.unshift "thin"
     command = argv_opts.join(" ")
-    topdir = File::expand_path(File::join(File::dirname(__FILE__), ".."))
-    rerun = Rerun::Runner.new(command, :dir => topdir)
+    Dir::chdir($top_srcdir)
+    rerun = Rerun::Runner.new(command, :dir => $top_srcdir)
     rerun.start
     rerun.join
   else
-    $:.unshift File.join(dirname)
     thin = Thin::Runner.new(argv_opts)
     thin.run!
   end

data/config.ru

@@ -16,10 +16,12 @@
 
 require 'rubygems'
 
-top_srcdir = File.dirname(__FILE__)
+$top_srcdir ||= File::expand_path(File.dirname(__FILE__))
 
-$:.unshift File.join(top_srcdir, 'lib')
+$:.unshift File.join($top_srcdir, 'lib')
 
-load File.join(top_srcdir, 'server.rb')
+server_dir = ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud'
+
+load File.join($top_srcdir, 'lib', server_dir, 'server.rb')
 
 run Sinatra::Application

data/config/drivers/ec2.yaml

@@ -3,17 +3,26 @@
   :entrypoints:
     s3:
       us-west-1: s3-us-west-1.amazonaws.com
+      us-west-2: s3-us-west-2.amazonaws.com
       ap-southeast-1: s3-ap-southeast-1.amazonaws.com
+      ap-northeast-1: s3-ap-northeast-1.amazonaws.com
       eu-west-1: s3-eu-west-1.amazonaws.com
       us-east-1: s3.amazonaws.com
+      sa-east-1: s3-sa-east-1.amazonaws.com
     elb:
       us-west-1: elasticloadbalancing.us-west-1.amazonaws.com
+      us-west-2: elasticloadbalancing.us-west-2.amazonaws.com
       ap-southeast-1: elasticloadbalancing.ap-southeast-1.amazonaws.com
+      ap-northeast-1: elasticloadbalancing.ap-northeast-1.amazonaws.com
       eu-west-1: elasticloadbalancing.eu-west-1.amazonaws.com
       us-east-1: elasticloadbalancing.us-east-1.amazonaws.com
+      sa-east-1: elasticloadbalancing.sa-east-1.amazonaws.com
     ec2:
       us-west-1: ec2.us-west-1.amazonaws.com
+      us-west-2: ec2.us-west-2.amazonaws.com
       ap-southeast-1: ec2.ap-southeast-1.amazonaws.com
+      ap-northeast-1: ec2.ap-northeast-1.amazonaws.com
       eu-west-1: ec2.eu-west-1.amazonaws.com
       us-east-1: ec2.us-east-1.amazonaws.com
+      sa-east-1: ec2.sa-east-1.amazonaws.com
   :name: EC2

data/config/drivers/google.yaml

@@ -0,0 +1,3 @@
+---
+:google:
+  :name: Google

data/config/drivers/openstack.yaml

@@ -0,0 +1,3 @@
+---
+:openstack:
+  :name: Openstack

data/deltacloud-core.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     which implements the REST interface.
   EOF
 
-  s.version = '0.4.1'
+  s.version = '0.5.0'
   s.date = Time.now
   s.summary = %q{Deltacloud REST API}
   s.files = FileList[

data/lib/cimi/dependencies.rb

@@ -0,0 +1,62 @@
+#
+# 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.
+
+#this file defines all the required components for dmtf implementation.
+#if new dependencies are needed, please make changes to this file.
+
+require 'sinatra'
+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/base_model'
+require 'deltacloud/models/realm'
+require 'deltacloud/models/image'
+require 'deltacloud/models/instance'
+require 'deltacloud/models/key'
+require 'deltacloud/models/address'
+require 'deltacloud/models/instance_profile'
+require 'deltacloud/models/storage_snapshot'
+require 'deltacloud/models/storage_volume'
+require 'deltacloud/models/bucket'
+require 'deltacloud/models/blob'
+require 'deltacloud/models/load_balancer'
+require 'deltacloud/models/firewall'
+require 'deltacloud/models/firewall_rule'
+
+require 'json'
+require 'sinatra/rack_accept'
+require 'sinatra/static_assets'
+require 'sinatra/rabbit'
+require 'sinatra/lazy_auth'
+require 'erb'
+require 'haml'
+require 'open3'
+require 'uuidtools'
+require 'xmlsimple'
+require 'benchmark'
+require 'deltacloud/helpers/blob_stream'
+require 'sinatra/rack_driver_select'
+require 'sinatra/rack_runtime'
+require 'sinatra/rack_etag'
+require 'sinatra/rack_date'
+require 'sinatra/rack_matrix_params'
+require 'sinatra/rack_syslog'
+require 'sinatra/sinatra_verbose'
+
+CMWG_NAMESPACE = "http://www.dmtf.org/cimi"

data/lib/cimi/helpers/cimi_helper.rb

@@ -0,0 +1,50 @@
+# 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 CIMIHelper
+
+  def no_content_with_status(code=200)
+    body ''
+    status code
+  end
+
+end
+
+helpers CIMIHelper
+
+class Array
+  def to_xml_cimi_collection(_self)
+    model_name = first.class.xml_tag_name
+    XmlSimple.xml_out({
+      "xmlns" => "http://www.dmtf.org/cimi",
+      "uri" => [ _self.send(:"#{model_name.underscore.pluralize}_url") ],
+      "name" => [ "default" ],
+      "created" => [ Time.now.to_s ],
+      model_name => map { |model| { 'href' => model.uri } }
+    }, :root_name => "#{model_name}Collection")
+  end
+
+  def to_json_cimi_collection(_self)
+    model_name = first.class.xml_tag_name
+    {
+      "uri" => _self.send(:"#{model_name.underscore.pluralize}_url"),
+      "name" => "default",
+      "created" => Time.now.to_s,
+      model_name.pluralize.uncapitalize => map { |model| { 'href' => model.uri } }
+    }.to_json
+  end
+
+end
+

data/lib/cimi/model.rb

@@ -0,0 +1,52 @@
+# 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.
+#
+
+# Declare namespace for CIMI model
+#
+module CIMI
+  module Model; end
+end
+
+require 'cimi/model/schema'
+require 'cimi/model/base'
+require 'cimi/model/errors'
+require 'cimi/model/cloud_entry_point'
+require 'cimi/model/machine_template'
+require 'cimi/model/machine_image'
+require 'cimi/model/machine_configuration'
+require 'cimi/model/action'
+require 'cimi/model/machine'
+require 'cimi/model/volume'
+require 'cimi/model/machine_admin'
+require 'cimi/model/volume_configuration'
+require 'cimi/model/volume_image'
+require 'cimi/model/volume_template'
+require 'cimi/model/machine_template_collection'
+require 'cimi/model/machine_image_collection'
+require 'cimi/model/machine_configuration_collection'
+require 'cimi/model/machine_collection'
+require 'cimi/model/volume_collection'
+require 'cimi/model/machine_admin_collection'
+require 'cimi/model/volume_configuration_collection'
+require 'cimi/model/volume_image_collection'
+require 'cimi/model/volume_template_collection'
+require 'cimi/model/entity_metadata'
+require 'cimi/model/entity_metadata_collection'
+require 'cimi/model/network'
+require 'cimi/model/network_collection'
+require 'cimi/model/network_configuration'
+require 'cimi/model/network_configuration_collection'
+require 'cimi/model/network_template'