deltacloud-core 1.1.0 → 1.1.1

data/tests/cimi/db/db_helper.rb

@@ -1,5 +1,7 @@
 # Memory database
 if RUBY_PLATFORM == 'java'
+  require 'jdbc/sqlite3'
+  Jdbc::SQLite3.load_driver
   ENV['DATABASE_LOCATION'] = 'jdbc:sqlite::memory:'
 else
   ENV['DATABASE_LOCATION'] = 'sqlite:/'

data/tests/cimi/db/entity_test.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+require 'minitest/autorun'
+
+require_relative 'db_helper.rb'
+require_relative '../spec_helper.rb'
+require_relative './../collections/common.rb'
+
+describe "Deltacloud::Database::Entity" do
+  Provider = Deltacloud::Database::Provider
+  Entity = Deltacloud::Database::Entity
+  BaseModel = CIMI::Model::Base
+
+  before do
+    ENV['RACK_ENV'] = 'development'
+    @prov = Provider::lookup
+  end
+
+  it 'newly created entities have valid ent_properties' do
+    model = BaseModel.new(:id => "/base/42")
+    ent = Entity.retrieve(model)
+    ent.properties = nil
+    ent.exists?.must_equal false
+    ent.save
+
+    ent = Entity.retrieve(model)
+    ent.exists?.must_equal true
+  end
+end

data/tests/cimi/model/collection_spec.rb

@@ -35,8 +35,8 @@ describe "Collection class" do
 
   before do
     @models = ["m1", "m2"].map { |s| Model.new(:text => s) }
-    @xml = IO::read(File::join(DATA_DIR, "container.xml"))
-    @json = IO::read(File::join(DATA_DIR, "container.json"))
+    @xml = read_data_file("container.xml")
+    @json = read_data_file("container.json")
   end
 
   describe "XML serialization" do

data/tests/cimi/model/credential_spec.rb

@@ -24,8 +24,8 @@ end
 describe "Credential model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "credential.xml"))
-    @json = IO::read(File::join(DATA_DIR, "credential.json"))
+    @xml = read_data_file("credential.xml")
+    @json = read_data_file("credential.json")
   end
 
   it "can be constructed from XML and JSON" do

data/tests/cimi/model/machine_configuration_spec.rb

@@ -20,8 +20,8 @@ require_relative '../spec_helper.rb' if require 'minitest/autorun'
 describe "MachineConfiguration model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "machine_configuration.xml"))
-    @json = IO::read(File::join(DATA_DIR, "machine_configuration.json"))
+    @xml = read_data_file("machine_configuration.xml")
+    @json = read_data_file("machine_configuration.json")
   end
 
   it "can be constructed from XML and JSON" do

data/tests/cimi/model/machine_image_spec.rb

@@ -21,8 +21,8 @@ require_relative '../spec_helper.rb' if require 'minitest/autorun'
 describe "MachineImage model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "machine_image.xml"))
-    @json = IO::read(File::join(DATA_DIR, "machine_image.json"))
+    @xml = read_data_file("machine_image.xml")
+    @json = read_data_file("machine_image.json")
   end
 
   it "can be constructed from XML and JSON" do

data/tests/cimi/model/machine_spec.rb

@@ -21,10 +21,10 @@ require_relative '../spec_helper.rb' if require 'minitest/autorun'
 describe "Machine model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "machine.xml"))
-    @json = IO::read(File::join(DATA_DIR, "machine.json"))
-    @xml_minimal = IO::read(File::join(DATA_DIR, "machine-minimal.xml"))
-    @json_minimal = IO::read(File::join(DATA_DIR, "machine-minimal.json"))
+    @xml = read_data_file("machine.xml")
+    @json = read_data_file("machine.json")
+    @xml_minimal = read_data_file("machine-minimal.xml")
+    @json_minimal = read_data_file("machine-minimal.json")
   end
 
   it "can be constructed from XML and JSON" do

data/tests/cimi/model/machine_template_spec.rb

@@ -21,8 +21,8 @@ require_relative '../spec_helper.rb' if require 'minitest/autorun'
 describe "MachineTemplate model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "machine_template.xml"))
-    @json = IO::read(File::join(DATA_DIR, "machine_template.json"))
+    @xml = read_data_file("machine_template.xml")
+    @json = read_data_file("machine_template.json")
   end
 
   it "can be constructed from XML and JSON" do

data/tests/cimi/model/volume_configuration_spec.rb

@@ -22,8 +22,8 @@ require_relative '../spec_helper.rb' if require 'minitest/autorun'
 describe "Volume Configuration model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "volume_configuration.xml"))
-    @json = IO::read(File::join(DATA_DIR, "volume_configuration.json"))
+    @xml = read_data_file("volume_configuration.xml")
+    @json = read_data_file("volume_configuration.json")
   end
 
   it "can be constructed from XML and JSON" do

data/tests/cimi/model/volume_image_spec.rb

@@ -21,8 +21,8 @@ require_relative '../spec_helper.rb' if require 'minitest/autorun'
 describe "Volume Image model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "volume_image.xml"))
-    @json = IO::read(File::join(DATA_DIR, "volume_image.json"))
+    @xml = read_data_file("volume_image.xml")
+    @json = read_data_file("volume_image.json")
   end
 
   it "can be constructed from XML and JSON" do

data/tests/cimi/model/volume_spec.rb

@@ -21,8 +21,8 @@ require_relative '../spec_helper.rb' if require 'minitest/autorun'
 describe "Volume model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "volume.xml"))
-    @json = IO::read(File::join(DATA_DIR, "volume.json"))
+    @xml = read_data_file("volume.xml")
+    @json = read_data_file("volume.json")
   end
 
   it "can be constructed from XML and JSON" do

data/tests/cimi/model/volume_template_spec.rb

@@ -21,8 +21,8 @@ require_relative '../spec_helper.rb' if require 'minitest/autorun'
 describe "Volume Template model" do
 
   before do
-    @xml = IO::read(File::join(DATA_DIR, "volume_template.xml"))
-    @json = IO::read(File::join(DATA_DIR, "volume_template.json"))
+    @xml = read_data_file("volume_template.xml")
+    @json = read_data_file("volume_template.json")
   end
 
   it "can be constructed from XML and JSON" do

data/tests/cimi/spec_helper.rb

@@ -32,6 +32,10 @@ def parse_xml(xml, opts = {})
   XmlSimple.xml_in(xml, opts)
 end
 
+def read_data_file(name)
+  IO::read(File::join(DATA_DIR, name))
+end
+
 class HashCmp
 
   IGNORED_KEYS = [ "resourceURI" ]

data/tests/deltacloud/collections/instances_collection_test.rb

@@ -69,8 +69,10 @@ describe Deltacloud::Collections::Instances do
     json['instance'].wont_be_empty
     Instance.attributes.each do |attr|
       attr = attr.to_s.gsub(/_id$/,'') if attr.to_s =~ /_id$/
-      next if ['authn_error', 'firewalls', 'keyname', 'username', 'password'].include?(attr.to_s)
+      next if ['launch_time', 'authn_error', 'firewalls', 'keyname', 'username', 'password', 'instance_profile'].include?(attr.to_s)
       json['instance'].keys.must_include attr.to_s
+      json['instance'].keys.must_include 'create_image'
+      json['instance'].keys.must_include 'hardware_profile'
     end
   end
 end

data/tests/deltacloud/launcher_test.rb

@@ -1,5 +1,3 @@
-=begin
-
 # TODO: This test require full access to 'kill' command and also
 # ability to execute the actual launcher.
 #
@@ -39,9 +37,10 @@ def wait_for_port_open(port)
 end
 
 def kill_process(pid)
-  Process.kill('TERM', pid) rescue ''
   # Die!
+  puts "Sending KILL to #{pid}"
   Process.kill('KILL', pid) rescue ''
+  sleep(1)
 end
 
 describe "deltacloudd" do
@@ -104,5 +103,4 @@ describe "deltacloudd" do
     @pids.map { |pid| kill_process(pid) }
   end
 
-end
-=end
+end unless ENV['TRAVIS']

data/tests/drivers/ec2/images_test.rb

@@ -45,4 +45,11 @@ describe 'Ec2Driver Images' do
     @driver.image(:id => 'unknown').must_be_nil
   end
 
+  it 'must advertise the image storage_type' do
+    VCR.insert_cassette 'test_0004_must_allow_to_retrieve_single_image'
+    @driver.image(:id => 'ami-aecd60c7').wont_be_nil
+    @driver.image(:id => 'ami-aecd60c7').root_type.wont_be_nil
+    @driver.image(:id => 'ami-aecd60c7').root_type.must_equal 'persistent'
+  end
+
 end

data/tests/drivers/gogrid/images_test.rb

@@ -5,6 +5,13 @@ require_relative 'common'
 
 describe 'GoGridDriver Images' do
 
+  def credentials
+  {
+    :user => "04825b9fb0826b0b",
+    :password => "gogrid_deltacloud_te"
+  }
+  end
+
   before do
     @driver = Deltacloud::new(:gogrid, credentials)
     VCR.insert_cassette __name__

data/tests/drivers/openstack/instances_test.rb

@@ -8,7 +8,7 @@ describe 'OpenStackDriver Instances' do
   {
     :user => "foo@fakedomain.eu+foo@fakedomain.eu-default-tenant",
     :password => "1234fake56789",
-    :provider => "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/"
+    :provider =>  "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/;az-1.region-a.geo-1"
   }
   end
 
@@ -33,20 +33,20 @@ describe 'OpenStackDriver Instances' do
   end
 
   it 'must allow to filter instances' do
-    instances = @driver.instances :id => '806837'
+    instances = @driver.instances :id => '815215'
     instances.wont_be_empty
     instances.must_be_kind_of Array
     instances.size.must_equal 1
     puts instances.inspect
-    instances.first.id.must_equal '806837'
+    instances.first.id.must_equal '815215'
     @driver.instances(:id => 'unknown').must_be_empty
   end
 
   it 'must allow to retrieve single instance' do
-    instance = @driver.instance :id => '806837'
+    instance = @driver.instance :id => '815215'
     instance.wont_be_nil
-    instance.id.must_equal '806837'
-    instance.name.must_equal 'Server-1355225740-az-2-region-a-geo-1'
+    instance.id.must_equal '815215'
+    instance.name.must_equal 'server2013-02-13 13:06:46 +0200'
     instance.state.wont_be_empty
     instance.owner_id.must_equal 'foo@fakedomain.eu'
     instance.realm_id.wont_be_empty
@@ -56,9 +56,9 @@ describe 'OpenStackDriver Instances' do
   end
 
   it 'must allow to create and destroy an instance' do
-    instance = @driver.create_instance '47940', :hwp_id => '100'
+    instance = @driver.create_instance '78265', :hwp_id => '100', :realm_id => "az-1.region-a.geo-1"
     instance.wont_be_nil
-    instance.image_id.must_equal '47940'
+    instance.image_id.must_equal '78265'
     instance.name.wont_be_empty
     instance.wait_for!(@driver, record_retries('inst_launch')) { |i| i.is_running? }
     puts @driver.destroy_instance(instance.id).inspect

data/tests/drivers/openstack/realms_test.rb

@@ -5,6 +5,15 @@ require_relative 'common.rb'
 
 describe 'OpenStackDriver Realms' do
 
+  def credentials
+  {
+    :user => "foo@fakedomain.eu+foo@fakedomain.eu-default-tenant",
+    :password => "1234fake56789",
+    :provider => "https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/"
+  }
+  end
+
+
   before do
     @driver = Deltacloud::new(:openstack, credentials)
     VCR.insert_cassette __name__
@@ -14,7 +23,7 @@ describe 'OpenStackDriver Realms' do
     VCR.eject_cassette
   end
 
-  it 'must throw error when wrong credentials' do
+  it 'must throw error when GET Realms with wrong credentials' do
     Proc.new do
       @driver.backend.images(OpenStruct.new(:user => 'unknown+wrong', :password => 'wrong'))
     end.must_raise Deltacloud::Exceptions::AuthenticationFailure, 'Authentication Failure'
@@ -25,20 +34,11 @@ describe 'OpenStackDriver Realms' do
     @driver.realms.first.must_be_kind_of Realm
   end
 
-  it 'must allow to filter realms' do
-    realms = @driver.realms :id => 'default'
-    realms.wont_be_empty
-    realms.must_be_kind_of Array
-    realms.size.must_equal 1
-    realms.first.id.must_equal 'default'
-    @driver.realms(:id => 'unknown').must_be_empty
-  end
-
   it 'must allow to retrieve single realm' do
-    realm = @driver.realm :id => 'default'
+    realm_id = @driver.realms.first.id
+    realm = @driver.realm :id => realm_id
     realm.wont_be_nil
-    realm.id.must_equal 'default'
-    realm.limit.wont_be_empty
+    realm.id.must_equal realm_id
     realm.state.must_equal 'AVAILABLE'
     @driver.realm(:id => 'unknown').must_be_nil
   end

data/views/errors/403.xml.haml

@@ -1,6 +1,7 @@
 %error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
   %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
-  %backtrace=cdata(@error.backtrace.join("\n"))
+  - if @error.respond_to?(:backtrace) and !@error.backtrace.nil?
+    %backtrace=cdata(@error.backtrace.join("\n"))
   - if params
     %request
       - params.each do |k, v|

data/views/images/show.html.haml

@@ -21,11 +21,14 @@
       %li{ :'data-role' => 'list-divider'} Creation Time
       %li
         %p{ :'data-role' => 'fieldcontain'}=@image.creation_time
+    %li{ :'data-role' => 'list-divider'} Root Device Type
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@image.root_type
     %li{ :'data-role' => 'list-divider'} Architecture
     %li
       %p{ :'data-role' => 'fieldcontain'}=@image.architecture
     - if @image.hardware_profiles
-      %li{ :'data-role' => 'list-divider'} Hardware Profiles
+      %li{ :'data-role' => 'list-divider'} Compatible Hardware Profiles
       %li
         %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
           - @image.hardware_profiles.each do |hwp|

data/views/images/show.xml.haml

@@ -13,6 +13,7 @@
     %hardware_profiles
       - @image.hardware_profiles.each do |profile|
         %hardware_profile{ :href => hardware_profile_url(profile.id), :id => profile.id, :rel => :hardware_profile }
+  %root_type=@image.root_type
   %actions
     %link{ :rel => 'create_instance', :method => :post, :href => "#{instances_url};image_id=#{@image.id}"}
     - if driver.respond_to? :destroy_image

data/views/instances/new.html.haml

@@ -2,7 +2,7 @@
 =subheader "#{@image.id}"
 
 .hidden_content
-  - @hardware_profiles.each do |profile|
+  - @image.hardware_profiles.each do |profile|
     %div{ :'data-role' => :fieldcontain, :id => "hwp_properties_#{profile.name}", :class => 'property_block'}
       - profile.properties.reject { |prop| prop.fixed? }.each do |prop|
         %label{ :for => "#{prop.param}_#{profile.name}", :class => 'ui-input-text' }=prop.name

data/views/instances/show.html.haml

@@ -12,6 +12,9 @@
     %li{ :'data-role' => 'list-divider'} State
     %li
       %p{ :'data-role' => 'fieldcontain'}=@instance.state
+    %li{ :'data-role' => 'list-divider'} Launch Time
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@instance.launch_time
     %li{ :'data-role' => 'list-divider'} Image
     %li
       %a{ :href => image_url(@instance.image_id), :'data-ajax' => 'false' }=@instance.image_id

data/views/realms/index.html.haml

@@ -10,4 +10,6 @@
           %img{ :class => 'ui-link-thumb', :src => '/images/realm.png'}
           %h3= realm.name
           %p=[realm.id, realm.limit].join(', ')
+          -if realm.resource_types
+            %p=realm.resource_types.join(",")
           %span{ :class => 'ui-li-count'}=realm.state

data/views/realms/show.html.haml

@@ -15,3 +15,7 @@
     %li{ :'data-role' => 'list-divider'} Limit
     %li
       %p{ :'data-role' => 'fieldcontain'}=@realm.limit
+    - if @realm.resource_types
+      %li{ :'data-role' => 'list-divider'} Resource Types
+      %li
+        %p{ :'data-role' => 'fieldcontain'}=@realm.resource_types

data/views/realms/show.xml.haml

@@ -9,3 +9,6 @@
     %limit<
       =cdata do
         =@realm.limit
+  - @realm.resource_types.each do |r|
+    %resource_type<
+      =r

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deltacloud-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,13 +108,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
 - !ruby/object:Gem::Dependency
   name: aws
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: waz-storage
   requirement: !ruby/object:Gem::Requirement
@@ -354,7 +354,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -362,7 +362,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -410,7 +410,7 @@ files:
 - Rakefile
 - deltacloud-core.gemspec
 - config.ru
-- config/drivers/aruba.yaml
+- config/drivers/arubacloud.yaml
 - config/drivers/azure.yaml
 - config/drivers/ec2.yaml
 - config/drivers/rackspace.yaml
@@ -454,8 +454,10 @@ files:
 - lib/cimi/server.rb
 - lib/cimi/dependencies.rb
 - lib/cimi/models.rb
+- lib/cimi/helpers/select_helper.rb
 - lib/cimi/helpers/cimi_helper.rb
 - lib/cimi/helpers/database_helper.rb
+- lib/cimi/helpers/filter_helper.rb
 - lib/cimi/models/volume_image.rb
 - lib/cimi/models/network_port_configuration.rb
 - lib/cimi/models/network.rb
@@ -468,6 +470,7 @@ files:
 - lib/cimi/models/machine_template.rb
 - lib/cimi/models/network_port.rb
 - lib/cimi/models/forwarding_group_template.rb
+- lib/cimi/models/resource.rb
 - lib/cimi/models/machine.rb
 - lib/cimi/models/volume_configuration.rb
 - lib/cimi/models/cloud_entry_point.rb
@@ -589,6 +592,7 @@ files:
 - lib/deltacloud/drivers/mock/mock_driver.rb
 - lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
 - lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
+- lib/deltacloud/drivers/arubacloud/arubacloud_driver.rb
 - lib/deltacloud/drivers/ec2/aws_vpc_monkey_patch.rb
 - lib/deltacloud/drivers/ec2/ec2_driver.rb
 - lib/deltacloud/drivers/rackspace/rackspace_driver.rb
@@ -605,7 +609,6 @@ files:
 - lib/deltacloud/drivers/cimi_features.rb
 - lib/deltacloud/drivers/exceptions.rb
 - lib/deltacloud/drivers/terremark/terremark_driver.rb
-- lib/deltacloud/drivers/aruba/aruba_driver.rb
 - lib/sinatra.rb
 - lib/db/volume_template.rb
 - lib/db/machine_template.rb
@@ -671,6 +674,7 @@ files:
 - tests/cimi/collections/machines_test.rb
 - tests/cimi/collections/machine_images_test.rb
 - tests/cimi/collections/url_helper_test.rb
+- tests/cimi/db/entity_test.rb
 - tests/cimi/db/schema_test.rb
 - tests/cimi/db/database_helper_test.rb
 - tests/cimi/db/db_helper.rb
@@ -945,7 +949,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2467979139256162930
+      hash: -2269388389884938239
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -959,6 +963,7 @@ test_files:
 - tests/cimi/collections/machines_test.rb
 - tests/cimi/collections/machine_images_test.rb
 - tests/cimi/collections/url_helper_test.rb
+- tests/cimi/db/entity_test.rb
 - tests/cimi/db/schema_test.rb
 - tests/cimi/db/database_helper_test.rb
 - tests/helpers/rack/rack_etag_test.rb