deltacloud-core 0.3.0 → 0.4.0

data/config/drivers/azure.yaml

@@ -0,0 +1,3 @@
+---
+:azure:
+  :name: Azure

data/config/drivers/condor.yaml

@@ -0,0 +1,3 @@
+---
+:condor:
+  :name: Condor

data/config/{drivers.yaml → drivers/ec2.yaml}

@@ -1,46 +1,17 @@
---- 
-:gogrid: 
-  :name: Gogrid
-:mock: 
-  :name: Mock
-:rhevm: 
-  :name: RHEVM
+---
+:ec2:
   :entrypoints:
-    default:
-      default: "https://rhev-m.localhost:8443/rhevm-api-powershell"
-:rimuhosting: 
-  :name: RimuHosting
-:opennebula: 
-  :class: OpennebulaDriver
-  :name: Opennebula
-:sbc: 
-  :name: SBC
-:terremark: 
-  :name: Terremark
-:rackspace: 
-  :name: Rackspace
-:azure: 
-  :name: Azure
-:eucalyptus:
-  :name: Eucalyptus
-  :username: Access Key ID
-  :password: Secret Access Key
-  :entrypoints:
-    default:
-      default: "ec2=EUCALYPTUS_IP[:PORT];s3=WALRUS_IP[:PORT]"
-:ec2: 
-  :entrypoints: 
-    s3: 
+    s3:
       us-west-1: s3-us-west-1.amazonaws.com
       ap-southeast-1: s3-ap-southeast-1.amazonaws.com
       eu-west-1: s3-eu-west-1.amazonaws.com
       us-east-1: s3.amazonaws.com
-    elb: 
+    elb:
       us-west-1: elasticloadbalancing.us-west-1.amazonaws.com
       ap-southeast-1: elasticloadbalancing.ap-southeast-1.amazonaws.com
       eu-west-1: elasticloadbalancing.eu-west-1.amazonaws.com
       us-east-1: elasticloadbalancing.us-east-1.amazonaws.com
-    ec2: 
+    ec2:
       us-west-1: ec2.us-west-1.amazonaws.com
       ap-southeast-1: ec2.ap-southeast-1.amazonaws.com
       eu-west-1: ec2.eu-west-1.amazonaws.com

data/config/drivers/eucalyptus.yaml

@@ -0,0 +1,8 @@
+---
+:eucalyptus:
+  :name: Eucalyptus
+  :username: Access Key ID
+  :password: Secret Access Key
+  :entrypoints:
+    default:
+      default: "ec2=EUCALYPTUS_IP[:PORT];s3=WALRUS_IP[:PORT]"

data/config/drivers/gogrid.yaml

@@ -0,0 +1,3 @@
+---
+:gogrid:
+  :name: Gogrid

data/config/drivers/mock.yaml

@@ -0,0 +1,3 @@
+---
+:mock:
+  :name: Mock

data/config/drivers/opennebula.yaml

@@ -0,0 +1,4 @@
+---
+:opennebula:
+  :class: OpennebulaDriver
+  :name: Opennebula

data/config/drivers/rackspace.yaml

@@ -0,0 +1,3 @@
+---
+:rackspace:
+  :name: Rackspace

data/config/drivers/rhevm.yaml

@@ -0,0 +1,3 @@
+---
+:rhevm:
+  :name: RHEVM

data/config/drivers/rimuhosting.yaml

@@ -0,0 +1,3 @@
+---
+:rimuhosting:
+  :name: RimuHosting

data/config/drivers/sbc.yaml

@@ -0,0 +1,2 @@
+:sbc:
+  :name: SBC

data/config/drivers/terremark.yaml

@@ -0,0 +1,3 @@
+---
+:terremark:
+  :name: Terremark

data/config/drivers/vsphere.yaml

@@ -0,0 +1,8 @@
+---
+:vsphere:
+  :name: VSphere
+  :username: Login Name
+  :password: Password
+  :entrypoints:
+    default:
+      default: "https://vsphere.provider.com/sdk"

data/deltacloud-core.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     which implements the REST interface.
   EOF
 
-  s.version = '0.3.0'
+  s.version = '0.4.0'
   s.date = Time.now
   s.summary = %q{Deltacloud REST API}
   s.files = FileList[
@@ -38,9 +38,13 @@ Gem::Specification.new do |s|
     'config.ru',
     '*.rb',
     'log',
-    'config/drivers.yaml',
+    'config/drivers/*.yaml',
+    'config/*.yaml',
+    'config/*.xml',
     'tmp',
     'support/fedora/**',
+    'support/condor/bash/**',
+    'support/condor/config/**',
     'lib/**/*.rb',
     'lib/**/*.yml',
     'tests/**/*.rb',
@@ -49,6 +53,8 @@ Gem::Specification.new do |s|
     'public/favicon.ico',
     'public/images/*.png',
     'public/javascripts/*.js',
+    'public/stylesheets/*.css',
+    'public/stylesheets/images/*.png',
     'public/stylesheets/compiled/*.css',
     'bin/deltacloudd'
   ].to_a
@@ -62,12 +68,14 @@ Gem::Specification.new do |s|
   s.add_dependency('rake', '>= 0.8.7')
   s.add_dependency('haml', '>= 2.2.17')
   s.add_dependency('sinatra', '>= 0.9.4')
-  s.add_dependency('rack', '>= 1.0.0', '<=1.1.0')
-  s.add_dependency('rack-accept', '~> 0.4.3')
+  s.add_dependency('rack', '>= 1.0.0')
+  s.add_dependency('rack-accept')
   s.add_dependency('json', '>= 1.1.9')
   s.add_dependency('net-ssh', '>= 2.0.0')
+  s.add_dependency('thin', '>= 1.2.5')
+  s.add_dependency('nokogiri', ">= 1.4.3")
   s.add_development_dependency('compass', '>= 0.8.17')
-  s.add_development_dependency('nokogiri', '>= 1.4.1', '< 1.4.4')
+  s.add_development_dependency('nokogiri', '>= 1.4.1')
   s.add_development_dependency('rack-test', '>= 0.5.3')
   s.add_development_dependency('cucumber', '>= 0.6.3')
   s.add_development_dependency('rcov', '>= 0.9.8')

data/deltacloud.rb

@@ -23,19 +23,21 @@ 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 'deltacloud/validation'
-require 'deltacloud/helpers'
 require 'deltacloud/runner'

data/lib/deltacloud/backend_capability.rb

@@ -18,7 +18,7 @@ module Deltacloud::BackendCapability
 
   class Failure < StandardError
     attr_reader :capability
-    
+
     def initialize(capability, msg='')
       super(msg)
       @capability = capability
@@ -26,7 +26,7 @@ module Deltacloud::BackendCapability
   end
 
   attr_reader :capability
-  
+
   def with_capability(capability)
     @capability = capability
   end

data/lib/deltacloud/base_driver/base_driver.rb

@@ -14,33 +14,18 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+require 'lib/deltacloud/base_driver/exceptions'
+
 module Deltacloud
 
-  class AuthException < Exception
-  end
+  class BaseDriver
 
-  class BackendError < StandardError
-    attr_reader :code, :cause, :details
-    def initialize(code, cause, message, details)
-      super(message)
-      @code = code
-      @cause = cause
-      @details = details
-    end
-  end
+    include ExceptionHandler
 
-  class BackendFeatureUnsupported < StandardError
-    attr_reader :code, :cause, :details
-    def initialize(code, cause, message, details)
-      super(message)
-      @code = code
-      @cause = cause
-      @details = details
+    def self.exceptions(&block)
+      ExceptionHandler::exceptions(&block)
     end
-  end
 
-  class BaseDriver
-    
     def self.define_hardware_profile(name,&block)
       @hardware_profiles ||= []
       hw_profile = @hardware_profiles.find{|e| e.name == name}
@@ -151,7 +136,7 @@ module Deltacloud
     # def storage_volumes(credentials, ops)
     #
     # def storage_snapshots(credentials, ops)
-    # 
+    #
     # def buckets(credentials, opts = nil)
     # def create_bucket(credentials, name, opts=nil)
     # def delete_bucket(credentials, name, opts=nil)
@@ -164,7 +149,12 @@ module Deltacloud
     # def keys(credentials, opts)
     # def create_key(credentials, opts)
     # def destroy_key(credentials, opts)
-    
+    #
+    # def firewalls(credentials, opts)
+    # def create_firewall(credentials, opts)
+    # def delete_firewall(credentials, opts)
+    # def create_firewall_rule(credentials, opts)
+    # def delete_firewall_rule(credentials, opts)
     def realm(credentials, opts)
       realms = realms(credentials, opts).first if has_capability?(:realms)
     end
@@ -189,7 +179,7 @@ module Deltacloud
       #list of objects within bucket
       buckets(credentials, opts).first if has_capability?(:buckets)
     end
-    
+
     def blob(credentials, opts = {})
       blobs(credentials, opts).first if has_capability?(:blobs)
     end
@@ -198,9 +188,13 @@ module Deltacloud
       keys(credentials, opts).first if has_capability?(:keys)
     end
 
+    def firewall(credentials, opts={})
+      firewalls(credentials, opts).first if has_capability?(:firewalls)
+    end
+
     MEMBER_SHOW_METHODS =
-      [ :realm, :image, :instance, :storage_volume, :bucket, :blob, :key ]
-    
+      [ :realm, :image, :instance, :storage_volume, :bucket, :blob, :key, :firewall ]
+
     def has_capability?(capability)
       if MEMBER_SHOW_METHODS.include?(capability.to_sym)
         has_capability?(capability.to_s.pluralize)
@@ -208,8 +202,7 @@ module Deltacloud
         respond_to?(capability)
       end
     end
-    
- 
+
     def filter_on(collection, attribute, opts)
       return collection if opts.nil?
       return collection if opts[attribute].nil?
@@ -233,30 +226,8 @@ module Deltacloud
       { :error => [], :auth => [], :glob => [] }
     end
 
-    def safely(&block)
-      begin
-        block.call
-      rescue => e
-        catched_exceptions_list[:auth].each do |ex|
-          if e.class == ex or e.class.name =~ ex or e.message =~ ex
-            raise Deltacloud::AuthException.new
-          end
-        end
-        catched_exceptions_list[:error].each do |ex|
-          if e.class == ex or e.class.name =~ ex or e.message =~ ex
-            raise Deltacloud::BackendError.new(502, e.class.to_s, e.message, e.backtrace) if e.class.name =~ ex
-          end
-        end
-        catched_exceptions_list[:glob].each do |ex|
-          if e.class == ex or e.class.name =~ ex or e.message =~ ex
-            raise Deltacloud::BackendError.new(500, e.class.to_s, e.message, e.backtrace)
-          end
-        end
-        $stderr.puts "# UNCAUGHT EXCEPTION # -> '#{e.class}' - '#{e.message}'"
-        $stderr.puts "# #{e.backtrace.join("\n")}"
-        $stderr.puts "##############"
-        raise Deltacloud::BackendError.new(500, e.class.to_s, e.message, e.backtrace)
-      end
+    def api_provider
+      Thread.current[:provider] || ENV['API_PROVIDER']
     end
 
   end

data/lib/deltacloud/base_driver/exceptions.rb

@@ -0,0 +1,168 @@
+# 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 Deltacloud
+  module ExceptionHandler
+
+    class DeltacloudException < StandardError
+
+      attr_accessor :code, :name, :message, :backtrace, :request
+
+      def initialize(code, name, message, backtrace, request=nil)
+        @code, @name, @message = code, name, message
+        @backtrace = backtrace
+        @request = request
+        self
+      end
+
+    end
+
+    class AuthenticationFailure < DeltacloudException
+      def initialize(e, message=nil)
+        message ||= e.message
+        super(401, e.class.name, message, e.backtrace)
+      end
+    end
+
+    class UnknownMediaTypeError < DeltacloudException
+      def initialize(e, message=nil)
+        message ||= e.message
+        super(406, e.class.name, message, e.backtrace)
+      end
+    end
+
+    class MethodNotAllowed < DeltacloudException
+      def initialize(e, message=nil)
+        message ||= e.message
+        super(405, e.class.name, message, e.backtrace)
+      end
+    end
+
+    class ValidationFailure < DeltacloudException
+      def initialize(e, message=nil)
+        message ||= e.message
+        super(400, e.class.name, message, e.backtrace)
+      end
+    end
+
+    class BackendError < DeltacloudException
+      def initialize(e, message=nil)
+        message ||= e.message
+        super(500, e.class.name, message, e.backtrace, message)
+      end
+    end
+
+    class ProviderError < DeltacloudException
+      def initialize(e, message)
+        message ||= e.message
+        super(502, e.class.name, message, e.backtrace)
+      end
+    end
+
+    class ObjectNotFound < DeltacloudException
+      def initialize(e, message)
+        message ||= e.message
+        super(404, e.class.name, message, e.backtrace)
+      end
+    end
+
+    class ExceptionDef
+      attr_accessor :status
+      attr_accessor :message
+      attr_reader   :conditions
+      attr_reader   :handler
+
+      def initialize(conditions, &block)
+        @conditions = conditions
+        instance_eval(&block) if block_given?
+      end
+
+      def status(code)
+        self.status = code
+      end
+
+      def message(message)
+        self.message = message
+      end
+
+      def exception(handler)
+        self.handler = handler
+      end
+
+      # Condition can be class or regexp
+      #
+      def match?(e)
+        @conditions.each do |c|
+          return true if c.class == Class && e.class == c
+          return true if c.class == Regexp && (e.class.name =~ c or e.message =~ c)
+        end
+        return false
+      end
+
+      def handler(e)
+        return @handler if @handler
+        case @status
+          when 401 then Deltacloud::ExceptionHandler::AuthenticationFailure.new(e, @message)
+          when 404 then Deltacloud::ExceptionHandler::ObjectNotFound.new(e, @message)
+          when 406 then Deltacloud::ExceptionHandler::UnknownMediaTypeError.new(e, @message)
+          when 405 then Deltacloud::ExceptionHandler::MethodNotAllowed.new(e, @message)
+          when 400 then Deltacloud::ExceptionHandler::ValidationFailure.new(e, @message)
+          when 500 then Deltacloud::ExceptionHandler::BackendError.new(e, @message)
+          when 502 then Deltacloud::ExceptionHandler::ProviderError.new(e, @message)
+        end
+      end
+
+    end
+
+    class Exceptions
+      attr_reader :exception_definitions
+
+      def initialize(&block)
+        @exception_definitions = []
+        instance_eval(&block) if block_given?
+        self
+      end
+
+      def on(*conditions, &block)
+        @exception_definitions << ExceptionDef::new(conditions, &block) if block_given?
+      end
+    end
+
+    def self.exceptions(&block)
+      @definitions = Exceptions.new(&block).exception_definitions if block_given?
+      @definitions
+    end
+
+    def safely(&block)
+      begin
+        block.call
+      rescue
+        report_method = $stderr.respond_to?(:err) ? :err : :puts
+        Deltacloud::ExceptionHandler::exceptions.each do |exdef|
+          if exdef.match?($!)
+            $stderr.send(report_method, "#{[$!.class.to_s, $!.message].join(':')}\n#{$!.backtrace.join("\n")}")
+            new_exception = exdef.handler($!)
+            raise exdef.handler($!) if new_exception
+          end
+        end
+        $stderr.send(report_method, "[NO HANDLED] #{[$!.class.to_s, $!.message].join(': ')}\n#{$!.backtrace.join("\n")}")
+        raise Deltacloud::ExceptionHandler::BackendError.new($!, "Unhandled exception or status code (#{$!.message})")
+      end
+    end
+
+  end
+
+end