deltacloud-core 1.0.2 → 1.0.3

data/lib/deltacloud/drivers/google/google_driver.rb

@@ -14,6 +14,7 @@
 # under the License.
 
 require 'fog'
+require_relative '../../helpers/blob_stream_helper.rb'
 
 module Deltacloud
   module Drivers
@@ -195,7 +196,7 @@ class GoogleDriver < Deltacloud::BaseDriver
   def valid_credentials?(credentials)
     begin
       new_client(credentials).get_service && true
-    rescue => e
+    rescue
       return false
     end
     return true

data/lib/deltacloud/drivers/openstack/openstack_driver.rb

@@ -45,8 +45,13 @@ module Deltacloud
           results = []
           safely do
             if opts[:id]
-              flavor = os.flavor(opts[:id])
-              results << convert_from_flavor(flavor)
+              begin
+                flavor = os.flavor(opts[:id])
+                results << convert_from_flavor(flavor)
+              rescue => e
+                raise e unless e.message =~ /The resource could not be found/
+                results = []
+              end
             else
               results = os.flavors.collect do |f|
                 convert_from_flavor(f)
@@ -62,17 +67,20 @@ module Deltacloud
           profiles = hardware_profiles(credentials)
           safely do
             if(opts[:id])
-              img = os.get_image(opts[:id])
-              results << convert_from_image(img, os.connection.authuser)
+              begin
+                img = os.get_image(opts[:id])
+                results << convert_from_image(img, os.connection.authuser)
+              rescue => e
+                raise e unless e.message =~ /Image not found/
+                results = []
+              end
             else
-              results = os.list_images.collect do |img|
-                convert_from_image(img, os.connection.authuser)
+              results = os.list_images.collect do |i|
+                convert_from_image(i, os.connection.authuser)
               end
             end
           end
-          results.each do |img|
-            img.hardware_profiles = profiles
-          end
+          results.each { |img| img.hardware_profiles = profiles }
           filter_on(results, :owner_id, opts)
         end
 
@@ -108,6 +116,7 @@ module Deltacloud
                 end
               end
           end
+          return [] if opts[:id] and opts[:id] != 'default'
           [ Realm.new( { :id=>'default',
                         :name=>'default',
                         :limit => limits,
@@ -119,11 +128,16 @@ module Deltacloud
           insts = []
           safely do
             if opts[:id]
-              server = os.get_server(opts[:id].to_i)
-              insts << convert_from_server(server, os.connection.authuser)
+              begin
+                server = os.get_server(opts[:id])
+                insts << convert_from_server(server, os.connection.authuser)
+              rescue => e
+                raise e unless e.message =~ /The resource could not be found/
+                insts = []
+              end
             else
-              insts = os.list_servers_detail.collect do |server|
-                convert_from_server(server, os.connection.authuser)
+              insts = os.list_servers_detail.collect do |s|
+                convert_from_server(s, os.connection.authuser)
               end
             end
           end
@@ -137,7 +151,7 @@ module Deltacloud
 #opts[:personality]: path1='server_path1'. content1='contents1', path2='server_path2', content2='contents2' etc
           params = {}
           params[:personality] = extract_personality(opts)
-          params[:name] = (opts[:name] && opts[:name].length>0)? opts[:name] : Time.now.to_s
+          params[:name] = (opts[:name] && opts[:name].length>0)? opts[:name] : "server#{Time.now.to_s}"
           params[:imageRef] = image_id
           params[:flavorRef] =  (opts[:hwp_id] && opts[:hwp_id].length>0) ?
                           opts[:hwp_id] : hardware_profiles(credentials).first.name
@@ -157,7 +171,7 @@ module Deltacloud
         def reboot_instance(credentials, instance_id)
           os = new_client(credentials)
           safely do
-            server = os.get_server(instance_id.to_i)
+            server = os.get_server(instance_id)
             server.reboot! # sends a hard reboot (power cycle) - could instead server.reboot("SOFT")
             convert_from_server(server, os.connection.authuser)
           end
@@ -166,7 +180,7 @@ module Deltacloud
         def destroy_instance(credentials, instance_id)
           os = new_client(credentials)
           safely do
-            server = os.get_server(instance_id.to_i)
+            server = os.get_server(instance_id)
             server.delete!
             convert_from_server(server, os.connection.authuser)
           end

data/lib/deltacloud/drivers/rhevm/rhevm_driver.rb

@@ -55,6 +55,7 @@ class RhevmDriver < Deltacloud::BaseDriver
     pending.to( :stopped )        .automatically
     stopped.to( :running )        .on( :start )
     running.to( :stopping )       .on( :stop )
+    stopping.to( :stopped )       .on( :stop )
     stopped.to( :finish )         .on( :destroy )
   end
 

data/lib/deltacloud/drivers/vsphere/vsphere_driver.rb

@@ -15,7 +15,7 @@
 #
 
 require 'rbvmomi'
-require 'deltacloud/drivers/vsphere/vsphere_client'
+require_relative './vsphere_client.rb'
 
 module Deltacloud::Drivers::Vsphere
 
@@ -74,7 +74,6 @@ module Deltacloud::Drivers::Vsphere
     # Images are virtual machines with 'template' flag set to be true.
     # Thus we're getting them using find_vm and list_virtual_machines
     def images(credentials, opts={})
-      cloud = new_client(credentials)
       img_arr = []
       profiles = hardware_profiles(credentials)
       # Skip traversing through all instances in all datacenters when ID
@@ -86,9 +85,8 @@ module Deltacloud::Drivers::Vsphere
           template_vms = list_virtual_machines(credentials).select { |vm| vm[:instance] && vm[:instance].summary.config[:template] }
         end
         img_arr = template_vms.collect do |image_hash|
-          image, realm = image_hash[:instance], image_hash[:datastore]
+          image = image_hash[:instance]
           config = image.summary.config
-          instance_state = convert_state(:instance, image.summary.runtime[:powerState])
           # Preload all properties to save multiple SOAP calls to vSphere
           properties = {
             :name => config[:name],
@@ -115,7 +113,6 @@ module Deltacloud::Drivers::Vsphere
     end
 
     def create_image(credentials, opts={})
-      vsphere = new_client(credentials)
       safely do
         find_vm(credentials, opts[:id])[:instance].MarkAsTemplate
       end
@@ -132,7 +129,7 @@ module Deltacloud::Drivers::Vsphere
         else
           rootFolder = vsphere.serviceInstance.content.rootFolder
           rootFolder.childEntity.grep(RbVmomi::VIM::Datacenter).collect do |dc|
-            dc.datastoreFolder.childEntity.collect { |datastore| convert_realm(datastore) }
+            dc.datastoreFolder.childEntity.collect { |ds| convert_realm(ds) }
           end.flatten
         end
       end
@@ -141,7 +138,6 @@ module Deltacloud::Drivers::Vsphere
     # List all running instances, across all datacenters. DeltaCloud API does
     # not yet support filtering instances by realm.
     def instances(credentials, opts={})
-      cloud = new_client(credentials)
       inst_arr, machine_vms, pending_vms = [], [], []
       safely do
         # Using find_vm is a way faster than listing all virtual machines
@@ -213,12 +209,10 @@ module Deltacloud::Drivers::Vsphere
 
 
     def create_instance(credentials, image_id, opts={})
-      vsphere = new_client(credentials)
       safely do
         if opts[:hwp_cpu]
           raise "Invalid CPU value. Must be in integer format" unless valid_cpu_value?(opts[:hwp_cpu])
         end
-        rootFolder = vsphere.serviceInstance.content.rootFolder
         vm = find_vm(credentials, opts[:image_id])
         raise "ERROR: Could not find the image in given datacenter" unless vm[:instance]
         # New instance need valid resource pool and datastore to be placed.

data/lib/deltacloud/helpers/deltacloud_helper.rb

@@ -55,7 +55,6 @@ module Deltacloud::Helpers
       filter.merge!(:owner_id => params[:owner_id]) if params[:owner_id]
       filter.merge!(:state => params[:state]) if params[:state]
       filter = {} if filter.keys.size.eql?(0)
-      singular = model.to_s.singularize.to_sym
       begin
         @benchmark = Benchmark.measure do
           @elements = driver.send(model.to_sym, credentials, filter)
@@ -179,7 +178,6 @@ module Deltacloud::Helpers
     end
 
     def image_for_state(state)
-      state_img = "stopped" if (state!='RUNNING' or state!='PENDING')
       capture_haml do
         haml_tag :img, :src => "/images/#{state}" % state.downcase, :title => state
       end

data/lib/deltacloud/models/firewall_rule.rb

@@ -20,4 +20,6 @@ class FirewallRule < BaseModel
   attr_accessor :port_to
   attr_accessor :sources
   attr_accessor :direction #ingress egress
+  attr_accessor :rule_action #Accept/Deny - initially added for FGCP
+  attr_accessor :log_rule #log when rule triggered true/false - added for FGCP
 end

data/lib/deltacloud/models/hardware_profile.rb

@@ -15,7 +15,7 @@
 # under the License.
 
 module Deltacloud
-  class HardwareProfile
+  class HardwareProfile < BaseModel
 
     UNITS = {
       :memory => "MB",
@@ -28,6 +28,62 @@ module Deltacloud
       UNITS[name]
     end
 
+    class << self
+      def property(prop)
+        define_method(prop) do |*args|
+          values, opts, *ignored = *args
+          unless values.nil?
+            @properties[prop] = Property.new(prop, values, opts || {})
+          end
+          @properties[prop]
+        end
+      end
+    end
+
+    attr_accessor :name
+
+    property :cpu
+    property :architecture
+    property :memory
+    property :storage
+
+    def initialize(profile_id, &block)
+      @properties   = {}
+      super(:id => profile_id)
+      result = instance_eval(&block) if block_given?
+      @name ||= profile_id
+      result
+    end
+
+    def each_property(&block)
+      @properties.each_value { |prop| yield prop }
+    end
+
+    def properties
+      @properties.values
+    end
+
+    def property(name)
+      @properties[name.to_sym]
+    end
+
+    def default?(prop, v)
+      property(prop) && property(prop).default.to_s == v
+    end
+
+    def include?(prop, v)
+      return false unless p = property(prop)
+      return true if p.kind == :range and (p.first..p.last).include?(v)
+      return true if p.kind == :enum and p.values.include?(v)
+      false
+    end
+
+    def params
+      @properties.values.inject([]) { |m, prop|
+        m << prop.to_param
+      }.compact
+    end
+
     class Property
       attr_reader :name, :kind, :default
       # kind == :range
@@ -82,10 +138,10 @@ module Deltacloud
           # overide fixed values.
           #
           # when :fixed then (v == @default.to_s)
-          when :fixed then true
-          when :range then match_type?(first, v) and (first..last).include?(v)
-          when :enum then match_type?(values.first, v) and values.include?(v)
-          else false
+        when :fixed then true
+        when :range then match_type?(first, v) and (first..last).include?(v)
+        when :enum then match_type?(values.first, v) and values.include?(v)
+        else false
         end
       end
 
@@ -115,59 +171,5 @@ module Deltacloud
         v.to_s
       end
     end
-
-    class << self
-      def property(prop)
-        define_method(prop) do |*args|
-          values, opts, *ignored = *args
-          instvar = :"@#{prop}"
-          unless values.nil?
-            @properties[prop] = Property.new(prop, values, opts || {})
-          end
-          @properties[prop]
-        end
-      end
-    end
-
-    attr_reader :name
-    property :cpu
-    property :architecture
-    property :memory
-    property :storage
-
-    def initialize(name,&block)
-      @properties   = {}
-      @name         = name
-      instance_eval &block if block_given?
-    end
-
-    def each_property(&block)
-      @properties.each_value { |prop| yield prop }
-    end
-
-    def properties
-      @properties.values
-    end
-
-    def property(name)
-      @properties[name.to_sym]
-    end
-
-    def default?(prop, v)
-      property(prop) && property(prop).default.to_s == v
-    end
-
-    def include?(prop, v)
-      return false unless p = property(prop)
-      return true if p.kind == :range and (p.first..p.last).include?(v)
-      return true if p.kind == :enum and p.values.include?(v)
-      false
-    end
-
-    def params
-      @properties.values.inject([]) { |m, prop|
-        m << prop.to_param
-      }.compact
-    end
   end
 end

data/{tests/deprecated/core_ext/string.rb → lib/deltacloud/version.rb}

@@ -1,3 +1,4 @@
+#
 # 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
@@ -12,20 +13,7 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
 # License for the specific language governing permissions and limitations
 # under the License.
-#
-
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..')
-require 'tests/common'
-
-require 'deltacloud/drivers'
-require 'deltacloud/drivers/mock/mock_driver'
-
-module DeltacloudUnitTest
 
-  class StringTest < Test::Unit::TestCase
-    def test_camelize
-      "hello_camel".camelize.should == "helloCamel"
-      "hello_camel_lots_of_humps".camelize.should == "helloCamelLotsOfHumps"
-    end
-  end
+module Deltacloud
+  API_VERSION = '1.0.3' unless defined?(API_VERSION)
 end

data/lib/deltacloud_rack.rb

@@ -17,6 +17,7 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative './deltacloud/core_ext'
 require_relative './sinatra/rack_logger'
+require_relative './deltacloud/version'
 
 module Deltacloud
 

data/lib/ec2/server.rb

@@ -38,12 +38,14 @@ module Deltacloud::EC2
     enable :xhtml
     enable :dump_errors
     enable :show_errors
-    enable :method_override
     disable :show_exceptions
 
-    set :version, Deltacloud[:ec2].version
-    set :root_url, Deltacloud[:ec2].root_url
+    set :config, Deltacloud[:ec2]
+    set :root_url, config.root_url
+    set :root_path, config.root_url
+    set :version, config.version
     set :root, File.join(File.dirname(__FILE__), '..', '..')
+    set :public_folder, root + '/public'
     set :views, File.join(File.dirname(__FILE__), 'views')
 
     error Deltacloud::EC2::QueryParser::InvalidAction do

data/lib/sinatra/rack_accept.rb

@@ -29,7 +29,7 @@ module Rack
           begin
             assumed_layout = args[1] == :layout
             args[1] = "#{args[1]}.#{@media_type}".to_sym if args[1].is_a?(::Symbol)
-            render_without_format *args, &block
+            render_without_format(*args, &block)
           rescue Errno::ENOENT => e
             raise "ERROR: Missing template: #{args[1]}.#{args[0]}" unless assumed_layout
             raise e
@@ -39,65 +39,65 @@ module Rack
       end
     end
 
-      module Helpers
-
-        # This code was inherited from respond_to plugin
-        # http://github.com/cehoffman/sinatra-respond_to
-        #
-        # This method is used to overide the default content_type returned from
-        # rack-accept middleware.
-        def self.included(klass)
-          klass.class_eval do
-            alias :content_type_without_save :content_type
-            def content_type(*args)
-              content_type_without_save *args
-              request.env['rack-accept.formats'] = { args.first.to_sym => 1 }
-              response['Content-Type']
-            end
+    module Helpers
+
+      # This code was inherited from respond_to plugin
+      # http://github.com/cehoffman/sinatra-respond_to
+      #
+      # This method is used to overide the default content_type returned from
+      # rack-accept middleware.
+      def self.included(klass)
+        klass.class_eval do
+          alias :content_type_without_save :content_type
+          def content_type(*args)
+            content_type_without_save(*args)
+            request.env['rack-accept.formats'] = { args.first.to_sym => 1 }
+            response['Content-Type']
           end
         end
+      end
 
-        def accepting_formats
-          request.env['rack-accept.formats']
-        end
+      def accepting_formats
+        request.env['rack-accept.formats']
+      end
 
-        def static_file?(path)
-          public_dir = File.expand_path(settings.public)
-          path = File.expand_path(File.join(public_dir, unescape(path)))
-          path[0, public_dir.length] == public_dir && File.file?(path)
+      def static_file?(path)
+        public_dir = File.expand_path(settings.public)
+        path = File.expand_path(File.join(public_dir, unescape(path)))
+        path[0, public_dir.length] == public_dir && File.file?(path)
+      end
+
+      def respond_to(&block)
+        wants = {}
+        def wants.method_missing(type, *args, &handler)
+          self[type] = handler
         end
+        yield wants
 
-        def respond_to(&block)
-          wants = {}
-          def wants.method_missing(type, *args, &handler)
-            self[type] = handler
-          end
-          yield wants
-          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|
-            wants.keys.include?(format) == true
-          end.first
-          if @media_type and @media_type.kind_of? Symbol
-            @media_type = [ @media_type ]
-          end
-          if @media_type and @media_type[0]
-            @media_type = @media_type[0]
-            if  Rack::MediaType::ACCEPTED_MEDIA_TYPES[@media_type]
-              headers 'Content-Type' => Rack::MediaType::ACCEPTED_MEDIA_TYPES[@media_type][:return]
-            else
-              headers 'Content-Type' => 'application/xml'
-            end
-            wants[@media_type.to_sym].call if wants[@media_type.to_sym]
+        if Deltacloud.default_frontend.name == :cimi
+          @media_type = (accepting_formats.has_key?(:xml) ? [:xml, accepting_formats[:xml]] : nil)
+        end if Deltacloud.respond_to? :default_frontend
+
+        @media_type ||= accepting_formats.to_a.sort { |a,b| a[1]<=>b[1] }.reverse.select do |format, priority|
+          wants.keys.include?(format) == true
+        end.first
+        if @media_type and @media_type.kind_of? Symbol
+          @media_type = [ @media_type ]
+        end
+        if @media_type and @media_type[0]
+          @media_type = @media_type[0]
+          if  Rack::MediaType::ACCEPTED_MEDIA_TYPES[@media_type]
+            headers 'Content-Type' => Rack::MediaType::ACCEPTED_MEDIA_TYPES[@media_type][:return]
           else
-            headers 'Content-Type' => nil
-            status 406
+            headers 'Content-Type' => 'application/xml'
           end
+          wants[@media_type.to_sym].call if wants[@media_type.to_sym]
+        else
+          headers 'Content-Type' => nil
+          status 406
         end
-
+      end
     end
-
   end
 
   class MediaType < Sinatra::Base
@@ -119,7 +119,7 @@ module Rack
       accept, index = env['rack-accept.request'], {}
 
       # Skip everything when 'format' parameter is set in URL
-      if env['rack.request.query_hash']["format"]
+      if env['rack.request.query_hash'] and env['rack.request.query_hash']["format"]
          media_type = case env['rack.request.query_hash']["format"]
             when 'html' then :html
             when 'xml' then :xml
@@ -135,8 +135,8 @@ module Rack
         sorted_media_types << 'application/xml' if sorted_media_types.empty?
         # Choose the right format with the media type according to the priority
         ACCEPTED_MEDIA_TYPES.each do |format, definition|
-          definition[:match].each do |media_type|
-            break if index[format] = sorted_media_types.index(media_type)
+          definition[:match].each do |mt|
+            break if index[format] = sorted_media_types.index(mt)
           end
         end
         # Reject formats with no/nil priority