deltacloud-core 1.0.1 → 1.0.2

data/lib/ec2/query_parser.rb

@@ -31,6 +31,10 @@ module Deltacloud::EC2
       :terminate_instances => { :method => :destroy_instance, :params => { 'InstanceId.1' => :id }},
     }
 
+    def self.mappings
+      MAPPINGS
+    end
+
     attr_reader :action
 
     def initialize(action)
@@ -38,12 +42,13 @@ module Deltacloud::EC2
     end
 
     def deltacloud_method
-      MAPPINGS[action.action][:method]
+      self.class.mappings[action.action][:method]
     end
 
     def deltacloud_method_params
-      MAPPINGS[action.action][:params].inject({}) do |result, p|
-        result[p.last] = action.parameters.delete(p.first)
+      parameters = action.parameters.dup
+      self.class.mappings[action.action][:params].inject({}) do |result, p|
+        result[p.last] = parameters.delete(p.first)
         result.delete_if { |k,v| v.nil? }
       end
     end
@@ -137,7 +142,7 @@ module Deltacloud::EC2
     end
 
     def valid_actions
-      ActionHandler::MAPPINGS.keys
+      ActionHandler::mappings.keys
     end
 
     def valid_action?

data/lib/ec2/server.rb

@@ -29,7 +29,7 @@ module Deltacloud::EC2
     extend Deltacloud::Helpers::Drivers
 
     use Rack::ETag
-    use Rack::CommonLogger
+    use Deltacloud[:ec2].logger
 
     helpers Sinatra::AuthHelper
     helpers Deltacloud::Helpers::Drivers

data/lib/ec2/views/create_key_pair.haml

@@ -0,0 +1,3 @@
+%keyName=object.name
+%keyFingerprint=object.fingerprint
+%keyMaterial=object.pem_rsa_key

data/lib/ec2/views/delete_key_pair.haml

@@ -0,0 +1 @@
+%return true

data/lib/ec2/views/describe_availability_zones.haml

@@ -0,0 +1,6 @@
+%availabilityZoneInfo
+  - object.each do |item|
+    %item
+      %zoneName=item.id
+      %zoneState=item.state
+      %regionName=item.name

data/lib/ec2/views/describe_images.haml

@@ -0,0 +1,10 @@
+%imagesSet
+  - object.each do |item|
+    %item
+      %imageId=item.id
+      %imageState=item.state.downcase
+      %imageOwnerId=item.owner_id
+      %architecture=item.architecture
+      %imageType machine
+      %name=item.name
+      %description=item.description

data/lib/ec2/views/describe_instance_set.haml

@@ -0,0 +1,24 @@
+%instanceSet
+  - object.each do |item|
+    %item
+      %instanceId=item.id
+      %imageId=item.image_id
+      %instanceType=item.instance_profile.name
+      %launchTime=item.launch_time || Time.now.to_s
+      - if item.public_addresses and not item.public_addresses.empty?
+        %ipAddress=item.public_addresses.first.address
+        %dnsName=item.public_addresses.first.address
+      - if item.private_addresses and not item.private_addresses.empty?
+        %privateIpAddress=item.private_addresses.first.address
+        %privateDnsName=item.private_addresses.first.address
+      %architecture=item.instance_profile.architecture || 'i386'
+      - if item.keyname
+        %keyName=item.keyname
+      - if item.state
+        %instanceState
+          %code=instance_state_code(item.state.downcase)
+          %name=item.state.downcase
+      %placement
+        %availabilityZone=item.realm_id
+        %groupName
+        %tenancy default

data/lib/ec2/views/describe_instances.haml

@@ -0,0 +1,9 @@
+%reservationSet
+  %item
+    %reservationId r-11111111
+    %ownerId deltacloud
+    %groupSet
+      %item
+        %groupId sg-11111111
+        %groupName default
+    =render(:describe_instance_set, object)

data/lib/ec2/views/describe_key_pairs.haml

@@ -0,0 +1,5 @@
+%keySet
+  - object.each do |item|
+    %item
+      %keyName=item.name
+      %keyFingerprint=item.fingerprint

data/lib/ec2/views/error.haml

@@ -0,0 +1,4 @@
+%Response
+  %Errors
+    %Code=code
+    %Message=message

data/lib/ec2/views/instance_action.haml

@@ -0,0 +1,9 @@
+%instancesSet
+  %item
+    %instanceId=object.id
+    %currentState
+      %code=instance_state_code(object.state.downcase)
+      %name=object.state.downcase
+    %previousState
+      %code -1
+      %name unknown

data/lib/ec2/views/reboot_instances.haml

@@ -0,0 +1 @@
+=render :instance_action, object

data/lib/ec2/views/run_instances.haml

@@ -0,0 +1,7 @@
+%reservationId r-11111111
+%ownerId deltacloud
+%groupSet
+  %item
+    %groupId sg-11111111
+    %groupName default
+=render :describe_instance_set, [object]

data/lib/ec2/views/start_instances.haml

@@ -0,0 +1 @@
+=render :instance_action, object

data/lib/ec2/views/stop_instances.haml

@@ -0,0 +1 @@
+=render :instance_action, object

data/lib/ec2/views/terminate_instances.haml

@@ -0,0 +1,9 @@
+%instancesSet
+  %item
+    %instanceId=context.params['InstanceId.1']
+    %currentState
+      %code=32
+      %name shutting-down
+    %previousState
+      %code -1
+      %name unknown

data/lib/sinatra.rb

@@ -18,5 +18,4 @@ require_relative 'sinatra/rack_date'
 require_relative 'sinatra/rack_etag'
 require_relative 'sinatra/rack_matrix_params'
 require_relative 'sinatra/rack_driver_select'
-require_relative 'sinatra/accept_media_types'
 require_relative 'sinatra/rack_accept'

data/lib/sinatra/rack_accept.rb

@@ -73,7 +73,7 @@ module Rack
             self[type] = handler
           end
           yield wants
-          if ENV['API_FRONTEND'] == "cimi"
+          if Deltacloud.default_frontend.name == :cimi
             @media_type = (accepting_formats.has_key?(:xml) ? [:xml, accepting_formats[:xml]] : nil)
           end
           @media_type ||= accepting_formats.to_a.sort { |a,b| a[1]<=>b[1] }.reverse.select do |format, priority|

data/lib/sinatra/rack_driver_select.rb

@@ -31,10 +31,10 @@ module Rack
       original_settings = { }
       req = Rack::Request.new(env)
       if req.params['api'] and req.params['api']['driver']
-	env['HTTP_X_DELTACLOUD_DRIVER'] = req.params['api']['driver']
+        env['HTTP_X_DELTACLOUD_DRIVER'] = req.params['api']['driver']
       end
       if req.params['api'] and req.params['api']['provider']
-	env['HTTP_X_DELTACLOUD_PROVIDER'] = req.params['api']['provider']
+        env['HTTP_X_DELTACLOUD_PROVIDER'] = req.params['api']['provider']
       end
       HEADER_TO_ENV_MAP.each do |header, name|
         original_settings[name] = Thread.current[name]

data/lib/sinatra/rack_etag.rb

@@ -68,7 +68,11 @@ module Rack
 
       def digest_body(body)
         parts = []
-        body.each { |part| parts << part }
+        if RUBY_VERSION =~ /^1\.8/
+          body.each { |part, b| parts << part }
+        else
+          body.each { |part| parts << part }
+        end
         string_body = parts.join
         digest = Digest::MD5.hexdigest(string_body) unless string_body.empty?
         [digest, parts]

data/lib/sinatra/rack_logger.rb

@@ -0,0 +1,127 @@
+# 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 'body_proxy'
+
+# This module is based on Rack::CommonLogger[1]
+# Copyright (C) 2007, 2008, 2009, 2010 Christian Neukirchen <purl.org/net/chneukirchen>
+#
+# [1] https://github.com/rack/rack/blob/master/lib/rack/commonlogger.rb
+
+module Rack
+  # Rack::CommonLogger forwards every request to an +app+ given, and
+  # logs a line in the Apache common log format to the +logger+, or
+  # rack.errors by default.
+  class DeltacloudLogger
+
+    def self.log_path(path=nil)
+      @log_file ||= path
+    end
+
+    def self.verbose?
+      @verbose
+    end
+
+    def self.verbose(v=nil)
+      @verbose ||= v
+    end
+
+    def self.setup(path, be_verbose=false)
+      verbose(be_verbose)
+      return self if path.nil?
+      dir = ::File.dirname(path)
+      if ::File.exists?(dir) and ::File.writable?(dir)
+        log_path(path)
+      else
+        warn "Warning: The log directory (#{dir}) is not writeable."
+      end
+      self
+    end
+
+    # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
+    # lilith.local - - [07/Aug/2006 23:58:02] "GET / HTTP/1.1" 500 -
+    #             %{%s - %s [%s] "%s %s%s %s" %d %s\n} %
+    FORMAT = %{%s - %s [%s] "%s %s%s %s" %d %s %0.4f\n}
+
+    VERBOSE_FORMAT = %{%s - %s [%s] "%s %s%s%s %s" %s %s %d %s %0.4f\n}
+
+    def initialize(app, logger=nil)
+      @app = app
+      unless self.class.log_path.nil?
+        @logger = ::Logger.new(self.class.log_path)
+      else
+        @logger = logger
+      end
+    end
+
+    def call(env)
+      began_at = Time.now
+      status, header, body = @app.call(env)
+      header = Utils::HeaderHash.new(header)
+      body = BodyProxy.new(body) do
+        self.class.verbose? ? verbose_log(env, status, header, began_at) : log(env, status, header, began_at)
+      end
+      [status, header, body]
+    end
+
+    private
+
+    def verbose_log(env, status, header, began_at)
+      now = Time.now
+      length = extract_content_length(header)
+      params = env['rack.request.form_hash'].nil? ? '' : ' '+env['rack.request.form_hash'].to_json
+
+      logger = @logger || env['rack.errors']
+      logger << VERBOSE_FORMAT % [
+        env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+        env["REMOTE_USER"] || "-",
+        now.strftime("%d/%b/%Y %H:%M:%S"),
+        env["REQUEST_METHOD"],
+        env["PATH_INFO"],
+        env["QUERY_STRING"].empty? ? '' : "?"+env["QUERY_STRING"],
+        params,
+        env["HTTP_VERSION"],
+        env['HTTP_X_DELTACLOUD_DRIVER'] || ENV['API_DRIVER'] || 'mock',
+        env['HTTP_X_DELTACLOUD_PROVIDER'] || ENV['API_PROVIDER'] || '-',
+        status.to_s[0..3],
+        length,
+        now - began_at ]
+    end
+
+    def log(env, status, header, began_at)
+      now = Time.now
+      length = extract_content_length(header)
+
+      logger = @logger || env['rack.errors']
+      logger << FORMAT % [
+        env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+        env["REMOTE_USER"] || "-",
+        now.strftime("%d/%b/%Y %H:%M:%S"),
+        env["REQUEST_METHOD"],
+        env["PATH_INFO"],
+        env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
+        env["HTTP_VERSION"],
+        status.to_s[0..3],
+        length,
+        now - began_at ]
+    end
+
+    def extract_content_length(headers)
+      value = headers['Content-Length'] or return '-'
+      value.to_s == '0' ? '-' : value
+    end
+  end
+end
+

data/lib/sinatra/rack_matrix_params.rb

@@ -92,7 +92,7 @@ module Rack
       else
         # For other methods it's more complicated
         if env['REQUEST_METHOD']!='POST' and not matrix_params.keys.empty?
-          env['QUERY_STRING'].gsub!(/;([^\/]*)/, '')
+          env['QUERY_STRING'] = env['QUERY_STRING'].gsub(/;([^\/]*)/, '')
           new_params = matrix_params.collect do |component, params|
             params.collect { |k,v| "#{component}[#{k}]=#{CGI::escape(v.to_s)}" }
           end.flatten

data/tests/cimi/collections/cloud_entry_point_test.rb

@@ -0,0 +1,46 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require 'minitest/autorun'
+require_relative './common.rb'
+
+describe CIMI::Collections::CloudEntryPoint do
+
+  before do
+    def app; CIMI::API; end
+    @collection = CIMI::Collections.collection(:cloudEntryPoint)
+  end
+
+  it 'has index operation' do
+    @collection.operation(:index).must_equal Sinatra::Rabbit::CloudentrypointCollection::IndexOperation
+  end
+
+  it 'set the CIMI-Version header' do
+    get root_url
+    headers['X-CIMI-Specification-Version'].wont_be_nil
+    headers['X-CIMI-Specification-Version'].must_equal '1.0.0'
+  end
+
+  it 'advertise CIMI collections in XML format' do
+    get root_url + '/cloudEntryPoint'
+    xml.root.name.must_equal 'CloudEntryPoint'
+    (xml.root/'description').first.text.wont_be_empty
+    (xml.root/'id').first.text.wont_be_empty
+  end
+
+  it 'advertise CIMI collections in JSON format' do
+    get root_url + '/cloudEntryPoint?format=json'
+    json.wont_be_empty
+    json['description'].wont_be_empty
+    json['id'].wont_be_empty
+  end
+
+  it 'allow to force authentication using force_auth parameter in URI' do
+    get root_url + '/cloudEntryPoint?force_auth=1'
+    status.must_equal 401
+    authorize 'mockuser', 'mockpassword'
+    get root_url + '/cloudEntryPoint?force_auth=1'
+    status.must_equal 200
+  end
+
+end

data/tests/cimi/collections/common.rb

@@ -0,0 +1,17 @@
+require_relative File.join('..', '..', '..', 'lib', 'deltacloud_rack.rb')
+require_relative '../../test_helper.rb'
+
+# Setup CIMI::API Sinatra instance
+#
+Deltacloud::configure(:cimi) do |server|
+  server.root_url '/cimi'
+  server.version '1.0.0'
+  server.klass 'CIMI::API'
+  server.default_driver :mock
+  server.logger Rack::DeltacloudLogger.setup(ENV['API_LOG'], ENV['API_VERBOSE'])
+end
+
+Deltacloud[:cimi].require!
+Deltacloud[:cimi].default_frontend!
+
+def formats; [ 'application/xml', 'application/json' ]; end

data/tests/cimi/collections/machine_images_test.rb

@@ -0,0 +1,44 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+require 'minitest/autorun'
+require_relative './common.rb'
+
+describe CIMI::Collections::MachineImages do
+
+  before do
+    def app; CIMI::API; end
+    authorize 'mockuser', 'mockpassword'
+    @collection = CIMI::Collections.collection(:machine_images)
+  end
+
+  it 'has index operation' do
+    @collection.operation(:index).must_equal Sinatra::Rabbit::MachineImagesCollection::IndexOperation
+  end
+
+  it 'has show operation' do
+    @collection.operation(:show).must_equal Sinatra::Rabbit::MachineImagesCollection::ShowOperation
+  end
+
+  it 'returns list of images in various formats with index operation' do
+    formats.each do |format|
+      header 'Accept', format
+      get root_url + '/machine_images'
+      status.must_equal 200
+    end
+  end
+
+  it 'should allow to retrieve the single image' do
+    get root_url '/machine_images/img1'
+    status.must_equal 200
+    xml.root.name.must_equal 'MachineImage'
+  end
+
+  it 'should allow to filter using CIMISelect' do
+    get root_url '/machine_images?CIMISelect=description'
+    status.must_equal 200
+    xml.root.name.must_equal 'MachineImageCollection'
+    (xml/'description').wont_be_empty
+    (xml/'id').must_be_empty
+  end
+
+end