deltacloud-core 1.0.3 → 1.0.4

data/LICENSE

@@ -319,3 +319,26 @@ For the lib/sinatra/url_for.rb component:
   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/deltacloud/core_ext/ordered_hash.rb component:
+
+  Copyright (c) 2005-2011 David Heinemeier Hansson
+
+  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

@@ -20,3 +20,6 @@ This product includes icons created by David Vignon licensed under LGPL
 
 This product includes software developed by Christian Neukirchen
 (https://github.com/rack/rack)
+
+This product includes software developed by the Ruby On Rails project
+(https://github.com/rails)

data/Rakefile

@@ -86,36 +86,48 @@ namespace :mock do
 end
 
 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)" % [
+[:cimi, :deltacloud].each do |frontend|
+  namespace frontend do
+    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')
+      f_class = (frontend == :cimi) ? CIMI : Deltacloud
+      f_class.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 %-35s (%s)" % [
             o.http_method.to_s.upcase,
             o.operation_name,
             o.full_path,
-            o.description[0..100]
+            Sinatra::Rabbit.generate_url_helper_for(c, o)[1]
           ]
         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 %-35s (%s)" % [
+                o.http_method.to_s.upcase,
+                o.operation_name,
+                o.full_path,
+                o.description[0..100]
+              ]
+            end
+          end
+        end
+        puts
       end
     end
-    puts
   end
 end
 
+desc 'List Deltacloud routes'
+task :routes do
+  Rake::Task['deltacloud:routes'].invoke
+end
+
 DRIVERS = [:mock, :ec2, :rhevm, :google, :gogrid, :openstack]
 
 desc 'Run all tests'

data/bin/deltacloudd

@@ -240,7 +240,7 @@ else
     command = argv_opts.join(" ")
     Dir::chdir($top_srcdir)
     rerun = Rerun::Runner.new(command,
-      :dir => File::join($top_srcdir, "lib", "deltacloud"))
+      :dir => File::join($top_srcdir, "lib"))
     rerun.start
     rerun.join
   else

data/config.ru

@@ -26,65 +26,58 @@ Deltacloud::configure do |server|
   server.root_url '/api'
   server.version Deltacloud::API_VERSION
   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 Deltacloud::API_VERSION
   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 '/ec2'
   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 = {}
 
+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
 #
-if ENV['API_FRONTEND'].split(',').size > 1
-
-  ENV['API_FRONTEND'].split(',').each do |frontend|
-    Deltacloud[frontend.to_sym].require!
-    routes.merge!({
-      Deltacloud[frontend].root_url => Deltacloud[frontend].klass
-    })
+frontends.each do |frontend|
+  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
 
-else
-  Deltacloud[ENV['API_FRONTEND'].to_sym].require!
-  Deltacloud[ENV['API_FRONTEND'].to_sym].default_frontend!
-  class IndexEntrypoint < Sinatra::Base
-    get "/" do
-      redirect Deltacloud.default_frontend.root_url, 301
-    end
-  end
-  routes['/'] = IndexEntrypoint.new
-  routes[Deltacloud.default_frontend.root_url] = Deltacloud.default_frontend.klass
+def static_dir_for(name)
+  Rack::Directory.new( File.join(File.dirname(__FILE__), "public", name))
 end
 
+# Mount static assets directories and index entrypoint
+#
+routes.merge!({
+  '/' => Deltacloud::IndexApp,
+  '/stylesheets' =>  static_dir_for('stylesheets'),
+  '/javascripts' =>  static_dir_for('javascripts'),
+  '/images' =>  static_dir_for('images')
+})
 
 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/deltacloud-core.gemspec

@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
   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.10')
+  s.add_dependency('sinatra-rabbit', '>= 1.0.11')
   s.add_dependency('crack')
   s.add_dependency('rack', '>= 1.0.0')
   s.add_dependency('rack-accept')

data/lib/cimi/collections.rb

@@ -14,6 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+require_relative './collections/base'
+
 module CIMI
 
   def self.collection_names
@@ -35,8 +37,9 @@ module CIMI
     end
 
     Dir[File.join(File::dirname(__FILE__), "collections", "*.rb")].each do |collection|
-      require collection
       base_collection_name = File.basename(collection).gsub('.rb', '')
+      next if base_collection_name == 'base'
+      require_relative collection
       cimi_module_class = CIMI::Collections.const_get(base_collection_name.camelize)
       cimi_modules << cimi_module_class
       unless cimi_module_class.collections.nil?

data/lib/cimi/collections/address_templates.rb

@@ -24,7 +24,7 @@ module CIMI::Collections
         description 'List all AddressTemplates in the AddressTemplateCollection'
         param :CIMISelect, :string, :optional
         control do
-          address_templates = AddressTemplateCollection.default(self).filter_by(params[:CIMISelect])
+          address_templates = AddressTemplate.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml {address_templates.to_xml}
             format.json {address_templates.to_json}
@@ -32,7 +32,7 @@ module CIMI::Collections
         end
       end
 
-      operation :show, :with_capability => :address_template do
+      operation :show, :with_capability => :address_templates do
         description 'Show a specific AddressTemplate'
         control do
           address_template = CIMI::Model::AddressTemplate.find(params[:id], self)

data/lib/cimi/collections/addresses.rb

@@ -26,7 +26,7 @@ module CIMI::Collections
         description 'List all Addresses in the AddressCollection'
         param :CIMISelect, :string, :optional
         control do
-          addresses = AddressCollection.default(self).filter_by(params[:CIMISelect])
+          addresses = Address.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
             format.xml {addresses.to_xml}
             format.json {addresses.to_json}

data/lib/cimi/collections/base.rb

@@ -0,0 +1,64 @@
+# 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_relative '../models'
+
+module CIMI::Collections
+  class Base < Sinatra::Base
+
+    include Sinatra::Rabbit
+    include Sinatra::Rabbit::Features
+    include CIMI::Model
+
+    helpers Deltacloud::Helpers::Drivers
+    helpers Sinatra::AuthHelper
+    helpers Sinatra::Rabbit::URLHelper
+    helpers Deltacloud::Helpers::Application
+    helpers CIMI::Helper
+
+    register Rack::RespondTo
+
+    enable :method_override
+    disable :show_exceptions
+    disable :dump_errors
+
+    set :config, Deltacloud[:cimi]
+    set :root_url, config.root_url
+    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 :documentation_class, CIMI
+
+    error do
+      report_error
+    end
+
+    error Deltacloud::ExceptionHandler::ValidationFailure do
+      report_error
+    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

data/lib/cimi/collections/{machine_admins.rb → credentials.rb}

@@ -14,21 +14,21 @@
 # under the License.
 
 module CIMI::Collections
-  class MachineAdmins < Base
+  class Credentials < Base
 
     set :capability, lambda { |m| driver.respond_to? m }
 
-    collection :machine_admins do
+    collection :credentials do
       description 'Machine Admin entity'
 
       operation :index, :with_capability => :keys do
         description "List all machine admins"
         param :CIMISelect,  :string,  :optional
         control do
-          machine_admins = MachineAdminCollection.default(self).filter_by(params[:CIMISelect])
+          credentials = Credential.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
-            format.xml { machine_admins.to_xml }
-            format.json { machine_admins.to_json }
+            format.xml { credentials.to_xml }
+            format.json { credentials.to_json }
           end
         end
       end
@@ -36,10 +36,10 @@ module CIMI::Collections
       operation :show, :with_capability => :key do
         description "Show specific machine admin"
         control do
-          machine_admin = MachineAdmin.find(params[:id], self)
+          credential = Credential.find(params[:id], self)
           respond_to do |format|
-            format.xml { machine_admin.to_xml }
-            format.json { machine_admin.to_json }
+            format.xml { credential.to_xml }
+            format.json { credential.to_json }
           end
         end
       end
@@ -48,9 +48,9 @@ module CIMI::Collections
         description "Show specific machine admin"
         control do
           if request.content_type.end_with?("+json")
-            new_admin = MachineAdmin.create_from_json(request.body.read, self)
+            new_admin = Credential.create_from_json(request.body.read, self)
           else
-            new_admin = MachineAdmin.create_from_xml(request.body.read, self)
+            new_admin = Credential.create_from_xml(request.body.read, self)
           end
           status 201 # Created
           respond_to do |format|
@@ -61,9 +61,9 @@ module CIMI::Collections
       end
 
       operation :delete, :with_capability => :destroy_key do
-        description "Delete specified MachineAdmin entity"
+        description "Delete specified Credential entity"
         control do
-          MachineAdmin.delete!(params[:id], self)
+          Credential.delete!(params[:id], self)
           no_content_with_status(200)
         end
       end

data/lib/cimi/collections/{vsp_templates.rb → forwarding_group_templates.rb}

@@ -12,39 +12,35 @@
 # 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 VspTemplates < Base
+  class ForwardingGroupTemplates < Base
 
     set :capability, lambda { |m| driver.respond_to? m }
 
-    collection :vsp_templates do
-
-      description 'The VSP Template is a set of Configuration values for realizing a VSP. A VSP Template may be used to create multiple VSPs'
+    collection :forwarding_group_templates do
 
-      operation :index, :with_capability => :vsp_templates do
-        description 'List all VSPTemplates in the VSPTemplateCollection'
+      operation :index, :with_capability => :forwarding_groups do
+        description 'List all ForwardingGroupTemplates in the ForwardingGroupTemplateCollection'
         param :CIMISelect, :string, :optional
         control do
-          vsp_templates = VSPTemplateCollection.default(self).filter_by(params[:CIMISelect])
+          forwarding_group_templates = ForwardingGroupTemplate.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
-            format.xml {vsp_templates.to_xml}
-            format.json {vsp_templates.to_json}
+            format.xml {forwarding_group_templates.to_xml}
+            format.json {forwarding_group_templates.to_json}
           end
         end
       end
 
-      operation :show, :with_capability => :vsp_template do
-        description 'Show a specific VSPTemplate'
+      operation :show, :with_capability => :forwarding_groups do
+        description 'Show a specific ForwardingGroupTemplate'
         control do
-          vsp_template = VSPTemplate.find(params[:id], self)
+          forwarding_group_template = ForwardingGroupTemplate.find(params[:id], self)
           respond_to do |format|
-            format.xml {vsp_template.to_xml}
-            format.json {vsp_template.to_json}
+            format.xml {forwarding_group_template.to_xml}
+            format.json {forwarding_group_template.to_json}
           end
         end
       end
-
     end
 
   end

data/lib/cimi/collections/{vsp_configurations.rb → forwarding_groups.rb}

@@ -12,33 +12,32 @@
 # 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 VspConfigurations < Base
+  class ForwardingGroups < Base
 
     set :capability, lambda { |m| driver.respond_to? m }
 
-    collection :vsp_configurations do
+    collection :forwarding_groups do
 
-      operation :index, :with_capability => :vsp_configurations do
-        description 'List all VSPConfigurations in the VSPConfigurationCollection'
+      operation :index, :with_capability => :forwarding_groups do
+        description 'List all ForwardingGroups in the ForwardingGroupsCollection'
         param :CIMISelect, :string, :optional
         control do
-          vsp_configs = VSPConfigurationCollection.default(self).filter_by(params[:CIMISelect])
+          forwarding_groups = ForwardingGroup.list(self).filter_by(params[:CIMISelect])
           respond_to do |format|
-            format.xml {vsp_configs.to_xml}
-            format.json {vsp_configs.to_json}
+            format.xml {forwarding_groups.to_xml}
+            format.json {forwarding_groups.to_json}
           end
         end
       end
 
-      operation :show, :with_capability => :vsp_configuration do
-        description 'Show a specific VSPConfiguration'
+      operation :show, :with_capability => :forwarding_groups do
+        description 'Show a specific ForwardingGroup'
         control do
-          vsp_config = VSPConfiguration.find(params[:id], self)
+          forwarding_group = ForwardingGroup.find(params[:id], self)
           respond_to do |format|
-            format.xml {vsp_config.to_xml}
-            format.json {vsp_config.to_json}
+            format.xml {forwarding_group.to_xml}
+            format.json {forwarding_group.to_json}
           end
         end
       end