deltacloud-core 0.3.0 → 0.4.0

data/LICENSE

@@ -174,3 +174,148 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+DELTACLOUD SERVER SUBCOMPONENTS
+
+The Deltacloud Server includes a number of subcomponents with separate
+copyrights and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+For the jQuery and jQuery mobile components in
+public/javascripts/jquery.*.js:
+
+  /*!
+   * jQuery JavaScript Library v1.6.2
+   * http://jquery.com/
+   *
+   * Copyright 2011, John Resig
+   * Dual licensed under the MIT or GPL Version 2 licenses.
+   * http://jquery.org/license
+   *
+   * Includes Sizzle.js
+   * http://sizzlejs.com/
+   * Copyright 2011, The Dojo Foundation
+   * Released under the MIT, BSD, and GPL Licenses.
+   *
+   * Date: Thu Jun 30 14:16:56 2011 -0400
+   */
+
+Deltacloud uses jQuery and jQuery mobile under the MIT license.
+
+For the lib/sinatra/accept_media_types.rb component:
+
+  # Copyright (C) 2009 Martin Aumont (mynyml)
+  #
+  # Permission is hereby granted, free of charge, to any person obtaining a
+  # copy of this software and associated documentation files (the
+  # "Software"), to deal in the Software without restriction, including
+  # without limitation the rights to use, copy, modify, merge, publish,
+  # distribute, sublicense, and/or sell copies of the Software, and to permit
+  # persons to whom the Software is furnished to do so, subject to the
+  # following conditions:
+  #
+  # The above copyright notice and this permission notice shall be included
+  # in all copies or substantial portions of the Software.
+  #
+  # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+  # NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  # DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+  # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+  # USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the lib/sinatra/body_proxy.rb and lib/sinatra/rack_syslog.rb components:
+
+  Copyright (c) 2007, 2008, 2009, 2010 Christian Neukirchen
+  <purl.org/net/chneukirchen>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the lib/sinatra/rack_accept.rb component:
+
+  (The MIT License)
+
+  Copyright (c) 2009-2010 Chris Hoffman
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the
+  'Software'), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to permit
+  persons to whom the Software is furnished to do so, subject to the
+  following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+  USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the lib/sinatra/rack_date.rb, lib/sinatra/rack_etag.rb, and
+lib/sinatra/rack_runtime.rb components:
+
+  Copyright (c) 2008 The Committers
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For the lib/sinatra/url_for.rb component:
+
+  Copyright (C) 2009 Eric Kidd
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to permit
+  persons to whom the Software is furnished to do so, subject to the
+  following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+  USE OR OTHER DEALINGS IN THE SOFTWARE.

data/NOTICE

@@ -1,5 +1,5 @@
 Apache Deltacloud
-Copyright 2010 The Apache Software Foundation
+Copyright 2010, 2011 The Apache Software Foundation
 
 This product includes software developed at The Apache Software Foundation
 (http://www.apache.org/).
@@ -11,3 +11,12 @@ This product includes software developed by IBM Corporation
 
 This product includes software developed by the OpenNebula Project
 (http://opennebula.org/)
+
+This product includes software developed by the jQuery Project
+(http://jquerymobile.com/)
+
+This product includes icons created by David Vignon licensed under LGPL
+(http://www.icon-king.com/)
+
+This product includes software developed by Christian Neukirchen
+(https://github.com/rack/rack)

data/Rakefile

@@ -19,7 +19,7 @@
 
 require 'rake'
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 begin
   require 'ci/reporter/rake/test_unit'
@@ -86,6 +86,54 @@ rescue LoadError
 end
 
 spec = Gem::Specification.load('deltacloud-core.gemspec')
-Rake::GemPackageTask.new(spec) do |pkg|
+
+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)
+  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)
+    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)
+    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
+    end
+
+  end
+end

data/bin/deltacloudd

@@ -1,7 +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 'optparse'
+require 'yaml'
 
 # See if we can require +name+ and return +true+ if the library is there,
 # +false+ otherwise. Note that, as a side effect, the library will be
@@ -15,6 +32,7 @@ def library_present?(name)
   end
 end
 
+DEFAULT_CONFIG = "~/.deltacloud/config"
 options = {
   :env => 'development'
 }
@@ -39,8 +57,42 @@ BANNER
   opts.on( '-P', '--provider PROVIDER', 'Use PROVIDER (default is set in the driver)') do |provider|
     ENV['API_PROVIDER'] = provider
   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
   opts.on( '-e', '--env ENV', 'Environment (default: "development")') { |env| options[:env] = env }
+  opts.on( '-d', '--daemon', 'Run daemonized in the background, logging to SYSLOG (default: "disabled")') do
+    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( '-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 }
+  opts.on( '-C', '--ssl-cert CERT', 'SSL certificate file to use') { |cert| options[:ssl_cert] = cert }
+  opts.on( '-t', '--timeout TIMEOUT', 'Timeout for single request (default: 60)') do |timeout|
+    ENV["API_TIMEOUT"] = timeout
+  end
   opts.on( '-h', '--help', '') { options[:help] = true }
+
+  opts.separator <<EOS
+
+Config file:
+
+  Server configuration can be specified in a YAML file; the file must
+  contain a hash, where the keys are driver names; each driver entry is
+  also a hash. Possible keys are
+    :provider - the provider to use for this driver
+    :user     - the user name for this driver
+    :password - the password for this driver
+
+  Note that specifying :user and :password turns off authentication on the
+  server, and any request is forwarded to the backend cloud with the
+  specified credentials.
+
+  Note, for SSL you need to have API_SSL_KEY and API_SSL_CERT environment
+  variables set.
+EOS
 end
 
 optparse.parse!
@@ -50,19 +102,61 @@ if options[:help]
  exit(0)
 end
 
-unless ENV["API_DRIVER"]
+unless options[:drivers] or ENV["API_DRIVER"]
   puts "You need to specify a driver to use (-i <driver>)"
+  puts "To list all available drivers try: deltacloudd --drivers"
   exit(1)
 end
 
+if options[:drivers]
+  require 'server.rb'
+  puts "Available drivers:\n\n"
+  puts "* " + driver_config.keys.map{ |d| d.to_s }.join("\n* ")
+  puts
+  exit(0)
+end
+
+
+if options[:ssl]
+  unless options[:ssl_key]
+    puts "You need to set SSL key using '-k /path/to/keyfile.key'"
+    exit(1)
+  end
+  unless options[:ssl_cert]
+    puts "You need to set SSL certificate using '-C /path/to/certificate.crt'"
+    exit(1)
+  end
+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]
+  end
+end
+
 ENV["API_HOST"] = "localhost" unless ENV["API_HOST"]
 ENV["API_PORT"] = "3001" unless ENV["API_PORT"]
 
-msg = "Starting Deltacloud API :: #{ENV["API_DRIVER"]} "
-msg << ":: #{ENV['API_PROVIDER']} " if ENV['API_PROVIDER']
-msg << ":: http://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/api"
-puts msg
-puts
+unless options[:daemon]
+  msg = "Starting Deltacloud API :: #{ENV["API_DRIVER"]} "
+  msg << ":: #{ENV['API_PROVIDER']} " if ENV['API_PROVIDER']
+  if options[:ssl]
+    msg << ":: https://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/api"
+  else
+    msg << ":: http://#{ENV["API_HOST"]}:#{ENV["API_PORT"]}/api"
+  end
+  puts msg
+  puts
+end
+
+if ENV['API_USER'] && ENV['API_PASSWORD']
+  puts "Warning: API_USER and API_PASSWORD set in environment"
+  puts "         anybody can access this server with your credentials"
+  puts
+end
 
 dirname="#{File.dirname(__FILE__)}/.."
 
@@ -105,9 +199,17 @@ else
   argv_opts << ['--rackup', 'config.ru' ]
   argv_opts << ['--chdir', dirname ]
   argv_opts << ['-e', options[:env] ]
-  argv_opts << ['--timeout', '60']
-  argv_opts << ['--threaded', '-D', '--stats', '/stats']
+  argv_opts << ['--timeout', ENV["API_TIMEOUT"] || '60']
+  argv_opts << ['--threaded', '-D' ]
+  if options[:ssl]
+    argv_opts << [ '--ssl', '--ssl-key-file', options[:ssl_key], '--ssl-cert-file', options[:ssl_cert]]
+  end
 
+  if options[:daemon]
+    options[:env] = "production"
+    argv_opts << [ "--daemonize", "--user", options[:user] || 'nobody', "--tag", "deltacloud-#{ENV['API_DRIVER']}"]
+    argv << [ "--pid", options[:pid]] if options[:pid]
+  end
   argv_opts.flatten!
 
   if have_rerun && options[:env] == "development"
@@ -119,11 +221,6 @@ else
     rerun.join
   else
     thin = Thin::Runner.new(argv_opts)
-
-    begin
-      thin.run!
-    rescue Exception => e
-      puts "ERROR: #{e.message}"
-    end
+    thin.run!
   end
 end

data/config/addresses.xml

@@ -0,0 +1,14 @@
+<addresses>
+  <address mac="00:1A:4A:22:20:01">172.31.0.101</address>
+  <address mac="00:1A:4A:22:20:02">172.31.0.102</address>
+  <address mac="00:1A:4A:22:20:03">172.31.0.103</address>
+  <address mac="00:1A:4A:22:20:04">172.31.0.104</address>
+  <address mac="00:1A:4A:22:20:05">172.31.0.105</address>
+  <address mac="00:1A:4A:22:20:06">172.31.0.106</address>
+  <address mac="00:1A:4A:22:20:07">172.31.0.107</address>
+  <address mac="00:1A:4A:22:20:08">172.31.0.108</address>
+  <address mac="00:1A:4A:22:20:09">172.31.0.109</address>
+  <address mac="00:1A:4A:22:20:10">172.31.0.110</address>
+  <address mac="00:1A:4A:22:20:11">172.31.0.111</address>
+  <address mac="00:1A:4A:22:20:12">172.31.0.112</address>
+</addresses>

data/config/condor.yaml

@@ -0,0 +1,30 @@
+---
+
+# The network bridge used for VMs.
+:default_bridge: br0
+:username: condor
+:password: deltacloud
+
+# The location of your images.  These would be regular KVM formatted images.
+# Note that this variable also exists in the condor cloud configuration in
+# /usr/libexec/condor/cloud_functions.  This directory must also be shared
+# accross all nodes so that they all have access to the images.
+#
+# *** If you change this check /usr/libexec/condor/cloud_functions ***
+:image_storage: /var/lib/condor-cloud/shared_images
+
+# There are currently 2 ways to configure the IP addresses of instances,
+# one is to use the ip server agent in each image, the other is a simple
+# mapping between MAC and IP.  The latter is the default.
+#
+# For the simple mac/ip mapping, see config/addresses.xml for the mapping list.
+# You must then configure your DHCPD server to hand out those addresses
+# for the given macs.
+:default_ip_agent: DefaultIPAgent
+
+#:default_ip_agent: ConfServerIPAgent
+#:ip_agent_address: '10.34.32.181:4444'
+#:ip_agent_version: '0.0.1'
+
+:vnc_listen_port: '5900'
+:vnc_listen_ip: '0.0.0.0'