deltacloud-core 1.0.2 → 1.0.3

data/tests/helpers/rack/rack_matrix_params_test.rb

@@ -0,0 +1,72 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+require_relative '../../test_helper.rb'
+require_relative './common.rb'
+
+require 'json'
+
+class TestMatrixApp < Sinatra::Base
+  use Rack::MatrixParams
+  get '/' do
+    params.to_json
+  end
+  get '/test' do
+    params.to_json
+  end
+  get '/test/books' do
+    params.to_json
+  end
+end
+
+describe TestMatrixApp do
+
+  before do
+    def app; TestMatrixApp; end
+  end
+
+  it 'should set matrix param for entrypoint' do
+    get '/;test=1'
+    status.must_equal 200
+    json['test'].must_equal '1'
+  end
+
+  it 'should set multiple matrix params for entrypoint' do
+    get '/;test=1;foo=bar'
+    status.must_equal 200
+    json['test'].must_equal '1'
+    json['foo'].must_equal 'bar'
+  end
+
+  it 'should set matrix param for first part of URI' do
+    get '/test;foo=bar'
+    status.must_equal 200
+    json['test']['foo'].must_equal 'bar'
+  end
+
+  it 'should set multiple matrix params for first part of URI' do
+    get '/test;foo=bar;test1=blah'
+    status.must_equal 200
+    json['test']['foo'].must_equal 'bar'
+    json['test']['test1'].must_equal 'blah'
+  end
+
+  it 'should set matrix params for the last part of URI' do
+    get '/test/books;foo=bar'
+    status.must_equal 200
+    json['books']['foo'].must_equal 'bar'
+  end
+
+  it 'should set matrix params for multiple parts of URI' do
+    get '/test;test=1/books;foo=bar'
+    status.must_equal 200
+    json['books']['foo'].must_equal 'bar'
+    json['test']['test'].must_equal '1'
+  end
+
+  it 'should handle matrix params with wrong syntax' do
+    get '/test;;;/books;foo=bar'
+    json['books']['foo'].must_equal 'bar'
+    json['test'].must_be_nil
+  end
+
+end

data/tests/test_helper.rb

@@ -6,6 +6,10 @@ require 'nokogiri'
 require 'pp'
 require 'require_relative' if RUBY_VERSION < '1.9'
 
+require 'singleton'
+
+require_relative '../lib/deltacloud/api.rb'
+
 ENV['RACK_ENV'] = 'test'
 
 if ENV['COVERAGE']
@@ -16,43 +20,14 @@ if ENV['COVERAGE']
   end
 end
 
-require 'time'
-
-# This code was originally copied from:
-# https://github.com/jtrupiano/timecop/issues/8#issuecomment-1396047
-#
-# Since 'timecop' gem has broken 'timezone' support, this small monkey-patching
-# on Time object seems to fix this issue.
-
-class Time
-  module TimeMock
-    attr_accessor :mock_time
-
-    def mock_now
-      @mock_time || Time.original_now
-    end
-
-    def be(a_time)
-      @mock_time = Time.parse(a_time)
-    end
-
-  end
-
-  class << self
-    include TimeMock
-    alias_method :original_now, :now
-    alias_method :now, :mock_now
-  end
-end
-
-# Test helpers
-
-def record_retries(name='')
-  {
-    :before => Proc.new { |r, &block|
-      VCR.use_cassette("#{__name__}-#{name.empty? ? '' : "#{name}-"}#{r}", &block)
-    }
+def record_retries(name='', opts = {})
+  opts[:before] = Proc.new { |r, &block|
+    VCR.use_cassette("#{__name__}-#{name.empty? ? '' : "#{name}-"}#{r}", &block)
   }
+  if VCR.configuration.default_cassette_options[:record] == :none
+    opts[:time_between_retry] = 0
+  end
+  opts
 end
 
 include Rack::Test::Methods
@@ -64,3 +39,36 @@ def xml; Nokogiri::XML(response_body); end
 def json; JSON::parse(response_body); end
 def formats; [ 'application/xml', 'application/json', 'text/html' ]; end
 def root_url(url=''); Deltacloud.default_frontend.root_url + url; end
+
+module Deltacloud
+  module Test
+    class Config
+      include Singleton
+
+      def initialize
+        fname = ENV["CONFIG"] || File::expand_path("~/.deltacloud/config")
+        begin
+          @hash = YAML.load(File::open(fname))
+        rescue Errno::ENOENT
+          @hash = {}
+        end
+      end
+
+      def credentials(driver)
+        driver = driver.to_s
+        if @hash.has_key?(driver)
+          user = @hash[driver]["user"]
+          password = @hash[driver]["password"]
+        else
+          user = "fakeuser"
+          password = "fakepassword"
+        end
+        { :user => user, :password => password }
+      end
+    end
+
+    def self.config
+      Config::instance
+    end
+  end
+end

data/views/hardware_profiles/index.html.haml

@@ -5,7 +5,7 @@
   %ul{ :'data-role' => :listview, :'data-inset' => :true }
     - for profile in order_hardware_profiles(@hardware_profiles)
       %li{ :'data-theme' => 'c'}
-        %a{ :href => hardware_profile_url(profile.name)}
+        %a{ :href => hardware_profile_url(profile.id)}
           %img{ :class => 'ui-link-thumb', :src => '/images/profile.png'}
           %h3= profile.name
           %p

data/views/hardware_profiles/show.html.haml

@@ -1,11 +1,11 @@
 =header "Hardware profiles"
-=subheader @hardware_profile.name
+=subheader @hardware_profile.name || @hardware_profile.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Name
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@hardware_profile.name
+      %p{ :'data-role' => 'fieldcontain'}=@hardware_profile.name || @hardware_profile.id
     - @hardware_profile.each_property do |p|
       %li{ :'data-role' => 'list-divider'} #{p.name.to_s.titlecase}
       %li

data/views/hardware_profiles/show.xml.haml

@@ -1,6 +1,7 @@
 - unless defined?(partial)
   !!! XML
-%hardware_profile{ :href => hardware_profile_url(@hardware_profile.name), :id => @hardware_profile.name }
+%hardware_profile{ :href => hardware_profile_url(@hardware_profile.id), :id => @hardware_profile.id }
+  %id= @hardware_profile.id
   %name<
     = @hardware_profile.name
   - @hardware_profile.each_property do |prop|

data/views/images/show.html.haml

@@ -20,11 +20,12 @@
     %li{ :'data-role' => 'list-divider'} Architecture
     %li
       %p{ :'data-role' => 'fieldcontain'}=@image.architecture
-    %li{ :'data-role' => 'list-divider'} Hardware Profiles
-    %li
-      %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        - @image.hardware_profiles.each do |hwp|
-          %a{ :href => api_url_for("hardware_profiles/#{hwp.name}"), :'data-role' => "button", :'data-ajax' => 'false'} #{hwp.name}
+    - if @image.hardware_profiles
+      %li{ :'data-role' => 'list-divider'} Hardware Profiles
+      %li
+        %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
+          - @image.hardware_profiles.each do |hwp|
+            %a{ :href => api_url_for("hardware_profiles/#{hwp.name}"), :'data-role' => "button", :'data-ajax' => 'false'} #{hwp.name}
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - The Apache Software Foundation
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-15 00:00:00 Z
+date: 2012-09-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -55,12 +55,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        version: 1.3.0
   version_requirements: *id003
   name: sinatra
   prerelease: false
@@ -209,12 +209,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 7
         segments: 
         - 0
         - 0
-        - 6
-        version: 0.0.6
+        - 12
+        version: 0.0.12
   version_requirements: *id013
   name: rbovirt
   prerelease: false
@@ -347,12 +347,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 4
+        version: 1.0.4
   version_requirements: *id022
   name: openstack
   prerelease: false
@@ -373,6 +373,20 @@ dependencies:
   name: savon
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id024 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id024
+  name: rbvmomi
+  prerelease: false
+  type: :runtime
 description: "    The Deltacloud API is built as a service-based REST API.\n    You do not directly link a Deltacloud library into your program to use it.\n    Instead, a client speaks the Deltacloud API over HTTP to a server\n    which implements the REST interface.\n"
 email: dev@deltacloud.apache.org
 executables: 
@@ -440,6 +454,7 @@ files:
 - lib/cimi/models/action.rb
 - lib/cimi/models/network.rb
 - lib/cimi/models/address_template.rb
+- lib/cimi/models/disk_collection.rb
 - lib/cimi/models/machine_collection.rb
 - lib/cimi/models/entity_metadata_collection.rb
 - lib/cimi/models/volume.rb
@@ -447,10 +462,12 @@ files:
 - lib/cimi/models/vsp_collection.rb
 - lib/cimi/models/errors.rb
 - lib/cimi/models/network_collection.rb
+- lib/cimi/models/disk.rb
 - lib/cimi/models/routing_group_collection.rb
 - lib/cimi/models/vsp_template_collection.rb
 - lib/cimi/models/address.rb
 - lib/cimi/models/routing_group_template.rb
+- lib/cimi/models/machine_volume.rb
 - lib/cimi/models/routing_group.rb
 - lib/cimi/models/vsp_configuration.rb
 - lib/cimi/models/volume_image_collection.rb
@@ -472,6 +489,7 @@ files:
 - lib/cimi/models/network_template_collection.rb
 - lib/cimi/models/volume_image.rb
 - lib/cimi/models/machine_image_collection.rb
+- lib/cimi/models/machine_volume_collection.rb
 - lib/cimi/models/machine_configuration_collection.rb
 - lib/cimi/models/address_template_collection.rb
 - lib/cimi/models/volume_template_collection.rb
@@ -529,6 +547,7 @@ files:
 - lib/deltacloud/core_ext/string.rb
 - lib/deltacloud/core_ext/integer.rb
 - lib/deltacloud/core_ext/hash.rb
+- lib/deltacloud/version.rb
 - lib/deltacloud/collections.rb
 - lib/deltacloud/core_ext.rb
 - lib/deltacloud/helpers/auth_helper.rb
@@ -564,6 +583,7 @@ files:
 - lib/deltacloud/drivers/fgcp/fgcp_client.rb
 - lib/deltacloud/drivers/fgcp/fgcp_driver.rb
 - lib/deltacloud/drivers/ec2/ec2_driver.rb
+- lib/deltacloud/drivers/ec2/aws_vpc_monkey_patch.rb
 - lib/deltacloud/drivers/features.rb
 - lib/deltacloud/drivers/terremark/terremark_driver.rb
 - lib/deltacloud/drivers/gogrid/gogrid_client.rb
@@ -621,64 +641,6 @@ files:
 - lib/ec2/views/run_instances.haml
 - lib/ec2/views/instance_action.haml
 - lib/ec2/views/terminate_instances.haml
-- tests/deprecated/cimi/features/support/env.rb
-- tests/deprecated/cimi/features/step_definitions/volumes_steps.rb
-- tests/deprecated/cimi/features/step_definitions/machines_steps.rb
-- tests/deprecated/cimi/features/step_definitions/machine_images_steps.rb
-- tests/deprecated/cimi/features/step_definitions/common_steps.rb
-- tests/deprecated/minitest_common.rb
-- tests/deprecated/core_ext/string.rb
-- tests/deprecated/common.rb
-- tests/deprecated/api/common.rb
-- tests/deprecated/api/library_test.rb
-- tests/deprecated/api/driver_test.rb
-- tests/deprecated/minitest_common_api_test.rb
-- tests/deprecated/rabbit_test.rb
-- tests/deprecated/drivers/google/common.rb
-- tests/deprecated/drivers/google/api_test.rb
-- tests/deprecated/drivers/google/buckets_test.rb
-- tests/deprecated/drivers/rhevm/images_test.rb
-- tests/deprecated/drivers/rhevm/common.rb
-- tests/deprecated/drivers/rhevm/api_test.rb
-- tests/deprecated/drivers/rhevm/hardware_profiles_test.rb
-- tests/deprecated/drivers/rhevm/instances_test.rb
-- tests/deprecated/drivers/rhevm/realms_test.rb
-- tests/deprecated/drivers/openstack/images_test.rb
-- tests/deprecated/drivers/openstack/common.rb
-- tests/deprecated/drivers/openstack/api_test.rb
-- tests/deprecated/drivers/openstack/hardware_profiles_test.rb
-- tests/deprecated/drivers/openstack/instances_test.rb
-- tests/deprecated/drivers/openstack/realms_test.rb
-- tests/deprecated/drivers/rackspace/images_test.rb
-- tests/deprecated/drivers/rackspace/common.rb
-- tests/deprecated/drivers/rackspace/api_test.rb
-- tests/deprecated/drivers/rackspace/hardware_profiles_test.rb
-- tests/deprecated/drivers/rackspace/instances_test.rb
-- tests/deprecated/drivers/rackspace/realms_test.rb
-- tests/deprecated/drivers/rackspace/buckets_test.rb
-- tests/deprecated/drivers/mock/images_test.rb
-- tests/deprecated/drivers/mock/common.rb
-- tests/deprecated/drivers/mock/drivers_test.rb
-- tests/deprecated/drivers/mock/api_test.rb
-- tests/deprecated/drivers/mock/hardware_profiles_test.rb
-- tests/deprecated/drivers/mock/keys_test.rb
-- tests/deprecated/drivers/mock/instances_test.rb
-- tests/deprecated/drivers/mock/storage_volumes_test.rb
-- tests/deprecated/drivers/mock/realms_test.rb
-- tests/deprecated/drivers/mock/storage_snapshots_test.rb
-- tests/deprecated/drivers/mock/buckets_test.rb
-- tests/deprecated/drivers/fgcp/setup.rb
-- tests/deprecated/drivers/fgcp/api_test.rb
-- tests/deprecated/drivers/fgcp/hardware_profiles_test.rb
-- tests/deprecated/drivers/fgcp/realms_test.rb
-- tests/deprecated/drivers/ec2/images_test.rb
-- tests/deprecated/drivers/ec2/common.rb
-- tests/deprecated/drivers/ec2/drivers_test.rb
-- tests/deprecated/drivers/ec2/api_test.rb
-- tests/deprecated/drivers/ec2/hardware_profiles_test.rb
-- tests/deprecated/drivers/ec2/keys_test.rb
-- tests/deprecated/drivers/ec2/instances_test.rb
-- tests/deprecated/drivers/ec2/realms_test.rb
 - tests/cimi/collections/cloud_entry_point_test.rb
 - tests/cimi/collections/machines_test.rb
 - tests/cimi/collections/common.rb
@@ -712,8 +674,15 @@ files:
 - tests/helpers/core_ext/integer_test.rb
 - tests/helpers/core_ext/string_test.rb
 - tests/helpers/core_ext/hash_test.rb
+- tests/helpers/rack/rack_accept_test.rb
+- tests/helpers/rack/common.rb
+- tests/helpers/rack/rack_etag_test.rb
+- tests/helpers/rack/rack_matrix_params_test.rb
+- tests/helpers/rack/rack_date_test.rb
+- tests/helpers/rack/rack_driver_select_test.rb
 - tests/test_helper.rb
 - tests/drivers/models/instance_address_test.rb
+- tests/drivers/models/common.rb
 - tests/drivers/models/blob_test.rb
 - tests/drivers/models/hardware_profile_test.rb
 - tests/drivers/models/metrics_test.rb
@@ -722,14 +691,24 @@ files:
 - tests/drivers/models/instance_profile_test.rb
 - tests/drivers/models/instance_test.rb
 - tests/drivers/models/address_test.rb
+- tests/drivers/google/common.rb
+- tests/drivers/google/buckets_test.rb
 - tests/drivers/rhevm/images_test.rb
 - tests/drivers/rhevm/common.rb
 - tests/drivers/rhevm/realms_test.rb
 - tests/drivers/rhevm/instance_test.rb
 - tests/drivers/rhevm/provider_test.rb
+- tests/drivers/base/common.rb
 - tests/drivers/base/base_driver_test.rb
 - tests/drivers/base/library_test.rb
+- tests/drivers/openstack/images_test.rb
+- tests/drivers/openstack/common.rb
+- tests/drivers/openstack/hardware_profiles_test.rb
+- tests/drivers/openstack/keys_test.rb
+- tests/drivers/openstack/instances_test.rb
+- tests/drivers/openstack/realms_test.rb
 - tests/drivers/mock/images_test.rb
+- tests/drivers/mock/common.rb
 - tests/drivers/mock/keys_test.rb
 - tests/drivers/mock/instances_test.rb
 - tests/drivers/mock/storage_volumes_test.rb
@@ -741,6 +720,11 @@ files:
 - tests/drivers/ec2/realms_test.rb
 - tests/drivers/ec2/instance_test.rb
 - tests/drivers/ec2/storage_snapshots_test.rb
+- tests/drivers/gogrid/images_test.rb
+- tests/drivers/gogrid/common.rb
+- tests/drivers/gogrid/hardware_profiles_test.rb
+- tests/drivers/gogrid/instances_test.rb
+- tests/drivers/gogrid/realms_test.rb
 - tests/ec2/server_test.rb
 - tests/ec2/common.rb
 - tests/ec2/query_parser_test.rb
@@ -929,12 +913,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 53
+      hash: 59
       segments: 
       - 1
       - 8
-      - 1
-      version: 1.8.1
+      - 6
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -952,48 +936,6 @@ signing_key:
 specification_version: 3
 summary: Deltacloud REST API
 test_files: 
-- tests/deprecated/api/library_test.rb
-- tests/deprecated/api/driver_test.rb
-- tests/deprecated/minitest_common_api_test.rb
-- tests/deprecated/rabbit_test.rb
-- tests/deprecated/drivers/google/api_test.rb
-- tests/deprecated/drivers/google/buckets_test.rb
-- tests/deprecated/drivers/rhevm/images_test.rb
-- tests/deprecated/drivers/rhevm/api_test.rb
-- tests/deprecated/drivers/rhevm/hardware_profiles_test.rb
-- tests/deprecated/drivers/rhevm/instances_test.rb
-- tests/deprecated/drivers/rhevm/realms_test.rb
-- tests/deprecated/drivers/openstack/images_test.rb
-- tests/deprecated/drivers/openstack/api_test.rb
-- tests/deprecated/drivers/openstack/hardware_profiles_test.rb
-- tests/deprecated/drivers/openstack/instances_test.rb
-- tests/deprecated/drivers/openstack/realms_test.rb
-- tests/deprecated/drivers/rackspace/images_test.rb
-- tests/deprecated/drivers/rackspace/api_test.rb
-- tests/deprecated/drivers/rackspace/hardware_profiles_test.rb
-- tests/deprecated/drivers/rackspace/instances_test.rb
-- tests/deprecated/drivers/rackspace/realms_test.rb
-- tests/deprecated/drivers/rackspace/buckets_test.rb
-- tests/deprecated/drivers/mock/images_test.rb
-- tests/deprecated/drivers/mock/drivers_test.rb
-- tests/deprecated/drivers/mock/api_test.rb
-- tests/deprecated/drivers/mock/hardware_profiles_test.rb
-- tests/deprecated/drivers/mock/keys_test.rb
-- tests/deprecated/drivers/mock/instances_test.rb
-- tests/deprecated/drivers/mock/storage_volumes_test.rb
-- tests/deprecated/drivers/mock/realms_test.rb
-- tests/deprecated/drivers/mock/storage_snapshots_test.rb
-- tests/deprecated/drivers/mock/buckets_test.rb
-- tests/deprecated/drivers/fgcp/api_test.rb
-- tests/deprecated/drivers/fgcp/hardware_profiles_test.rb
-- tests/deprecated/drivers/fgcp/realms_test.rb
-- tests/deprecated/drivers/ec2/images_test.rb
-- tests/deprecated/drivers/ec2/drivers_test.rb
-- tests/deprecated/drivers/ec2/api_test.rb
-- tests/deprecated/drivers/ec2/hardware_profiles_test.rb
-- tests/deprecated/drivers/ec2/keys_test.rb
-- tests/deprecated/drivers/ec2/instances_test.rb
-- tests/deprecated/drivers/ec2/realms_test.rb
 - tests/cimi/collections/cloud_entry_point_test.rb
 - tests/cimi/collections/machines_test.rb
 - tests/cimi/collections/machine_images_test.rb
@@ -1014,6 +956,11 @@ test_files:
 - tests/helpers/core_ext/integer_test.rb
 - tests/helpers/core_ext/string_test.rb
 - tests/helpers/core_ext/hash_test.rb
+- tests/helpers/rack/rack_accept_test.rb
+- tests/helpers/rack/rack_etag_test.rb
+- tests/helpers/rack/rack_matrix_params_test.rb
+- tests/helpers/rack/rack_date_test.rb
+- tests/helpers/rack/rack_driver_select_test.rb
 - tests/drivers/models/instance_address_test.rb
 - tests/drivers/models/blob_test.rb
 - tests/drivers/models/hardware_profile_test.rb
@@ -1023,12 +970,18 @@ test_files:
 - tests/drivers/models/instance_profile_test.rb
 - tests/drivers/models/instance_test.rb
 - tests/drivers/models/address_test.rb
+- tests/drivers/google/buckets_test.rb
 - tests/drivers/rhevm/images_test.rb
 - tests/drivers/rhevm/realms_test.rb
 - tests/drivers/rhevm/instance_test.rb
 - tests/drivers/rhevm/provider_test.rb
 - tests/drivers/base/base_driver_test.rb
 - tests/drivers/base/library_test.rb
+- tests/drivers/openstack/images_test.rb
+- tests/drivers/openstack/hardware_profiles_test.rb
+- tests/drivers/openstack/keys_test.rb
+- tests/drivers/openstack/instances_test.rb
+- tests/drivers/openstack/realms_test.rb
 - tests/drivers/mock/images_test.rb
 - tests/drivers/mock/keys_test.rb
 - tests/drivers/mock/instances_test.rb
@@ -1040,5 +993,9 @@ test_files:
 - tests/drivers/ec2/realms_test.rb
 - tests/drivers/ec2/instance_test.rb
 - tests/drivers/ec2/storage_snapshots_test.rb
+- tests/drivers/gogrid/images_test.rb
+- tests/drivers/gogrid/hardware_profiles_test.rb
+- tests/drivers/gogrid/instances_test.rb
+- tests/drivers/gogrid/realms_test.rb
 - tests/ec2/server_test.rb
 - tests/ec2/query_parser_test.rb