deltacloud-core 0.5.0 → 1.0.0

data/NOTICE

@@ -1,5 +1,5 @@
 Apache Deltacloud
-Copyright 2010, 2011 The Apache Software Foundation
+Copyright 2010-2012 The Apache Software Foundation
 
 This product includes software developed at The Apache Software Foundation
 (http://www.apache.org/).

data/Rakefile

@@ -71,30 +71,10 @@ begin
 rescue LoadError
 end
 
-namespace :test do
-  %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')
-      t.options = "-v -v"
-      t.verbose = true
-      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 openstack google).each do |driver|
+  %w(mock rackspace rhevm openstack google fgcp).each do |driver|
    Rake::Task["test:#{driver}"].reenable
    Rake::Task["test:#{driver}"].invoke
   end
@@ -193,3 +173,65 @@ 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`
+  end
+end
+
+namespace :rabbit do
+  load File.join(File.dirname(__FILE__), 'config.ru')
+
+  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
+        end
+      end
+      puts
+    end
+  end
+
+end
+
+namespace :test do
+
+  %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
+    }
+  end
+end

data/bin/deltacloudd

@@ -37,7 +37,8 @@ end
 DEFAULT_CONFIG = "~/.deltacloud/config"
 
 options = {
-  :env => 'development'
+  :env => 'development',
+  :logdir => "/var/log/deltacloud-core"
 }
 optparse = OptionParser.new do |opts|
 
@@ -60,8 +61,8 @@ 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'
+  opts.on('-f', '--frontends FRONTENDS', 'Enable different frontends (cimi, ec2, deltacloud)') do |frontend|
+    ENV['API_FRONTEND'] = frontend
   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)
@@ -86,6 +87,9 @@ BANNER
   opts.on(  nil, '--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|
+    options[:logdir] = opt
+  end
   opts.on( '-h', '--help', '') { options[:help] = true }
 
   opts.separator <<EOS
@@ -124,9 +128,9 @@ end
 if options[:drivers]
   $:.unshift File.join($top_srcdir, 'lib')
   server_dir = ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud'
-  load File.join($top_srcdir, 'lib', server_dir, 'server.rb')
+  load File.join($top_srcdir, 'lib', server_dir, 'api.rb')
   puts "Available drivers:\n\n"
-  puts "* " + driver_config.keys.map{ |d| d.to_s }.join("\n* ")
+  puts Deltacloud.drivers.keys.join("\n")
   puts
   exit(0)
 end
@@ -219,7 +223,7 @@ 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("/var/log/deltacloud-core", "#{ENV['API_DRIVER']}.log")]
+    argv_opts << [ "--log", File.join(options[:logdir], "#{ENV['API_DRIVER']}.log")]
   end
   argv_opts.flatten!
 

data/config.ru

@@ -14,14 +14,70 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-require 'rubygems'
+# The default URL prefix (where to mount Deltacloud API)
 
-$top_srcdir ||= File::expand_path(File.dirname(__FILE__))
+# The default driver is 'mock'
+ENV['API_DRIVER'] ||= 'mock'
+ENV['API_FRONTEND'] ||= 'deltacloud'
 
-$:.unshift File.join($top_srcdir, 'lib')
+load File.join(File.dirname(__FILE__), 'lib', 'deltacloud_rack.rb')
 
-server_dir = ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud'
+Deltacloud::configure do |server|
+  server.root_url '/api'
+  server.version '1.0.0'
+  server.klass 'Deltacloud::API'
+end
 
-load File.join($top_srcdir, 'lib', server_dir, 'server.rb')
+Deltacloud::configure(:cimi) do |server|
+  server.root_url '/cimi'
+  server.version '1.0.0'
+  server.klass 'CIMI::API'
+end
 
-run Sinatra::Application
+Deltacloud::configure(:ec2) do |server|
+  server.root_url '/'
+  server.version '2012-04-01'
+  server.klass 'Deltacloud::EC2::API'
+end
+
+routes = {}
+
+# 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
+#
+if ENV['API_FRONTEND'].split(',').size > 1
+
+  ENV['API_FRONTEND'].split(',').each do |frontend|
+    Deltacloud.require_frontend!(frontend)
+    routes.merge!({
+      Deltacloud[frontend].root_url => Deltacloud[frontend].klass
+    })
+  end
+
+else
+  Deltacloud.require_frontend!(ENV['API_FRONTEND'])
+  class IndexEntrypoint < Sinatra::Base
+    get "/" do
+      redirect Deltacloud[ENV['API_FRONTEND']].root_url, 301
+    end
+  end
+  routes['/'] = IndexEntrypoint.new
+  routes[Deltacloud[ENV['API_FRONTEND']].root_url] = Deltacloud[ENV['API_FRONTEND']].klass
+end
+
+
+run Rack::Builder.new {
+  use Rack::MatrixParams
+  use Rack::DriverSelect
+
+  routes.merge!({
+    "/stylesheets" =>  Rack::Directory.new( File.join(File.dirname(__FILE__), "public", "stylesheets") ),
+    "/javascripts" =>  Rack::Directory.new( File.join(File.dirname(__FILE__), "public", "javascripts") )
+  })
+
+  run Rack::URLMap.new(routes)
+
+} if respond_to? :run

data/config/drivers/ec2.yaml

@@ -25,4 +25,12 @@
       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
+    mon:
+      us-west-1: monitoring.us-west-1.amazonaws.com
+      us-west-2: monitoring.us-west-2.amazonaws.com
+      ap-southeast-1: monitoring.ap-southeast-1.amazonaws.com
+      ap-northeast-1: monitoring.ap-northeast-1.amazonaws.com
+      eu-west-1: monitoring.eu-west-1.amazonaws.com
+      us-east-1: monitoring.us-east-1.amazonaws.com
+      sa-east-1: monitoring.sa-east-1.amazonaws.com
   :name: EC2

data/config/drivers/fgcp.yaml

@@ -0,0 +1,13 @@
+---
+:fgcp:
+  :name: FGCP
+  :username: Username
+  :password: Secret Key Password of User Certificate
+  :entrypoints:
+    default:
+      jp: 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

data/deltacloud-core.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     which implements the REST interface.
   EOF
 
-  s.version = '0.5.0'
+  s.version = '1.0.0'
   s.date = Time.now
   s.summary = %q{Deltacloud REST API}
   s.files = FileList[
@@ -64,10 +64,12 @@ Gem::Specification.new do |s|
   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('crack')
   s.add_dependency('rack', '>= 1.0.0')
   s.add_dependency('rack-accept')
   s.add_dependency('json', '>= 1.1.9')
@@ -76,6 +78,9 @@ Gem::Specification.new do |s|
   s.add_dependency('nokogiri', '>= 1.4.3')
 
 # dependencies for various cloud providers:
+# RHEV-M
+  s.add_dependency('rbovirt', '>=0.0.6')
+
 # Amazon EC2 S3
   s.add_dependency('aws', '>=2.5.4')
 # Microsoft Azure
@@ -95,4 +100,7 @@ Gem::Specification.new do |s|
 # Condor Cloud
   s.add_dependency('uuidtools', '>= 2.1.1')
 
+# Openstack Compute and Object-Storage
+  s.add_dependency('openstack')
+
 end

data/lib/cimi/collections.rb

@@ -0,0 +1,58 @@
+#
+# 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
+
+  def self.collection_names
+    @collections.map { |c| c.collection_name }
+  end
+
+  def self.collections
+    @collections ||= []
+  end
+
+  module Collections
+
+    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|
+      require collection
+      base_collection_name = File.basename(collection).gsub('.rb', '')
+      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
+
+    def self.included(klass)
+      klass.class_eval do
+        CIMI::Collections.cimi_modules.each { |c| use c }
+      end
+    end
+
+  end
+end

data/lib/cimi/collections/address_templates.rb

@@ -0,0 +1,49 @@
+# 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 AddressTemplates < Base
+
+    check_capability :for => lambda { |m| driver.respond_to? m }
+
+    collection :address_templates do
+
+      operation :index do
+        description 'List all AddressTemplates in the AddressTemplateCollection'
+        param :CIMISelect, :string, :optional
+        control do
+          address_templates = AddressTemplateCollection.default(self).filter_by(params[:CIMISelect])
+          respond_to do |format|
+            format.xml {address_templates.to_xml}
+            format.json {address_templates.to_json}
+          end
+        end
+      end
+
+      operation :show do
+        description 'Show a specific AddressTemplate'
+        control do
+          address_template = CIMI::Model::AddressTemplate.find(params[:id], self)
+          respond_to do |format|
+            format.xml {address_template.to_xml}
+            format.json {address_template.to_json}
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/cimi/collections/addresses.rb

@@ -0,0 +1,74 @@
+# 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 Addresses < Base
+
+    check_capability :for => lambda { |m| driver.respond_to? m }
+    collection :addresses do
+
+      description 'An Address represents an IP address, and its associated metdata, for a particular Network.'
+
+      operation :index do
+        description 'List all Addresses in the AddressCollection'
+        param :CIMISelect, :string, :optional
+        control do
+          addresses = AddressCollection.default(self).filter_by(params[:CIMISelect])
+          respond_to do |format|
+            format.xml {addresses.to_xml}
+            format.json {addresses.to_json}
+          end
+        end
+      end
+
+      operation :show do
+        description 'Show a specific Address'
+        control do
+          address = CIMI::Model::Address.find(params[:id], self)
+          respond_to do |format|
+            format.xml {address.to_xml}
+            format.json {address.to_json}
+          end
+        end
+      end
+
+      operation :create do
+        description "Create a new Address"
+        control do
+          if request.content_type.end_with?("json")
+            address = CIMI::Model::Address.create(request.body.read, self, :json)
+          else
+            address = CIMI::Model::Address.create(request.body.read, self, :xml)
+          end
+          respond_to do |format|
+            format.xml { address.to_xml }
+            format.json { address.to_json }
+          end
+        end
+      end
+
+      operation :destroy do
+        description "Delete a specified Address"
+        param :id, :string, :required
+        control do
+          CIMI::Model::Address.delete!(params[:id], self)
+          no_content_with_status(200)
+        end
+      end
+
+    end
+
+  end
+end