deltacloud-core 1.1.1 → 1.1.2

data/tests/cimi/db/database_helper_test.rb

@@ -13,21 +13,13 @@ end
 describe Deltacloud::Helpers::Database do
   include Deltacloud::DatabaseTestHelper
 
-  Provider = Deltacloud::Database::Provider
-  Entity = Deltacloud::Database::Entity
-  BaseModel = CIMI::Model::Base
-
   before do
-    ENV['RACK_ENV'] = 'development'
-    @db = DatabaseHelper.new
-    @prov = Provider::lookup
-  end
+    @provider = Deltacloud::Database::Provider
+    @entity = Deltacloud::Database::Entity
+    @baseModel = CIMI::Model::Base
 
-  it 'report if application is running under test environment' do
-    ENV['RACK_ENV'] = 'test'
-    @db.test_environment?.must_equal true
-    ENV['RACK_ENV'] = 'development'
-    @db.test_environment?.must_equal false
+    @db = DatabaseHelper.new
+    @prov = @provider::lookup
   end
 
   it 'report if given entity is provided by database' do
@@ -40,7 +32,7 @@ describe Deltacloud::Helpers::Database do
   end
 
   it 'create provider when it does not exists' do
-    @prov.must_be_kind_of Deltacloud::Database::Provider
+    @prov.must_be_kind_of @provider
     @prov.driver.must_equal 'mock'
     @prov.url.must_equal @db.current_provider
     @prov.must_respond_to :entities
@@ -57,17 +49,17 @@ describe Deltacloud::Helpers::Database do
       :name => 'testMachine1',
       :description => 'testMachine1 description',
       :ent_properties => JSON::dump(:key => 'value'),
-      :be_kind => BaseModel.name,
+      :be_kind => @baseModel.name,
       :be_id => 'inst1'
     )
 
-    check_entity_base_attrs new_entity, Entity, @prov
+    check_entity_base_attrs new_entity, @entity, @prov
 
-    result = Entity.retrieve(BaseModel.new(:id => 'inst1'))
+    result = @entity.retrieve(@baseModel.new(:id => 'inst1'))
     result.must_equal new_entity
 
     new_entity.destroy
-    result = Entity.retrieve(BaseModel.new(:id => 'inst1'))
+    result = @entity.retrieve(@baseModel.new(:id => 'inst1'))
     result.exists?.must_equal false
   end
 
@@ -78,13 +70,13 @@ describe Deltacloud::Helpers::Database do
       :name => 'testMachine1',
       :description => 'testMachine1 description',
       :ent_properties => JSON::dump(:key => 'value'),
-      :be_kind => BaseModel.name,
+      :be_kind => @baseModel.name,
       :be_id => 'base1'
     )
 
-    check_entity_base_attrs new_entity, Entity, @prov
+    check_entity_base_attrs new_entity, @entity, @prov
 
-    result = Entity::retrieve(BaseModel.new(:id => 'base1'))
+    result = @entity::retrieve(@baseModel.new(:id => 'base1'))
     result.name.must_equal new_entity.name
     result.description.must_equal new_entity.description
     result.properties.must_equal new_entity.properties
@@ -99,15 +91,15 @@ describe Deltacloud::Helpers::Database do
       :name => 'testMachine1',
       :description => 'testMachine1 description',
       :ent_properties => JSON::dump(:key => 'value'),
-      :be_kind => BaseModel.name,
+      :be_kind => @baseModel.name,
       :be_id => 'base1'
     )
 
-    check_entity_base_attrs new_entity, Entity, @prov
+    check_entity_base_attrs new_entity, @entity, @prov
 
-    base = BaseModel.new(:id => 'base1')
+    base = @baseModel.new(:id => 'base1')
     base.destroy
-    entity = Entity.retrieve(base)
+    entity = @entity.retrieve(base)
     entity.wont_be_nil
     entity.exists?.must_equal false
   end

data/tests/cimi/db/db_helper.rb

@@ -1,15 +1,4 @@
-# Memory database
-if RUBY_PLATFORM == 'java'
-  require 'jdbc/sqlite3'
-  Jdbc::SQLite3.load_driver
-  ENV['DATABASE_LOCATION'] = 'jdbc:sqlite::memory:'
-else
-  ENV['DATABASE_LOCATION'] = 'sqlite:/'
-end
-
-ENV['RACK_ENV'] = 'development'
-
-require_relative '../../../lib/db'
+require_relative '../../test_helper'
 
 module Deltacloud
   module DatabaseTestHelper

data/tests/cimi/db/entity_test.rb

@@ -7,23 +7,22 @@ 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
+    @provider = Deltacloud::Database::Provider
+    @entity = Deltacloud::Database::Entity
+    @baseModel = CIMI::Model::Base
+    @prov = @provider::lookup
   end
 
   it 'newly created entities have valid ent_properties' do
-    model = BaseModel.new(:id => "/base/42")
-    ent = Entity.retrieve(model)
+    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 = @entity.retrieve(model)
     ent.exists?.must_equal true
   end
 end

data/tests/cimi/model/machine_create_spec.rb

@@ -0,0 +1,44 @@
+# 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 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative '../spec_helper.rb' if require 'minitest/autorun'
+
+describe "MachineCreate model" do
+
+  before do
+    @xml = read_data_file("machine_create_by_value.xml")
+  end
+
+  it "can be constructed from XML with template by value" do
+    mc = CIMI::Model::MachineCreate.from_xml(@xml)
+    mc.name.must_equal "xml_machine_by_value"
+    mt = mc.machine_template
+    mt.wont_be_nil
+    mt.href.must_be_nil
+    mt.machine_config.href.wont_be_nil
+  end
+
+  it "can be built in code" do
+    mc = CIMI::Model::MachineCreate.new(:name => "from_code")
+    mc.machine_template.href = "/mts/1"
+    mc.machine_template.machine_config.cpu = 42
+    json = JSON::parse(mc.to_json)
+    json["machineTemplate"]["href"].must_equal "/mts/1"
+    json["machineTemplate"]["machineConfig"]["cpu"].must_equal 42
+  end
+end

data/tests/cimi/model/machine_template_spec.rb

@@ -29,4 +29,33 @@ describe "MachineTemplate model" do
     should_properly_serialize_model CIMI::Model::MachineTemplate, @xml, @json
   end
 
+  describe "can have an embedded machineConfig" do
+    MACHINE_CONFIG_ID = "http://cimi.example.org/machine_configs/1"
+
+    it "in XML" do
+      mt = CIMI::Model::MachineTemplate.from_xml(@xml)
+      mt.name.must_equal "My First Template"
+      mt.machine_config.href.must_equal MACHINE_CONFIG_ID
+      mt.machine_config.id.must_be_nil
+      mt.machine_config.cpu = 7
+
+      mc = parse_xml(mt.to_xml)["MachineTemplate"].first["machineConfig"].first
+      mc.wont_be_nil
+      mc["href"].must_equal MACHINE_CONFIG_ID
+      mc["cpu"].first["content"].must_equal "7"
+    end
+
+    it "in JSON" do
+      mt = CIMI::Model::MachineTemplate.from_json(@json)
+      mt.name.must_equal "My First Template"
+      mt.machine_config.href.must_equal MACHINE_CONFIG_ID
+      mt.machine_config.id.must_be_nil
+      mt.machine_config.cpu = 7
+
+      mc = JSON::parse(mt.to_json)["machineConfig"]
+      mc.wont_be_nil
+      mc["href"].must_equal MACHINE_CONFIG_ID
+      mc["cpu"].must_equal 7
+    end
+  end
 end

data/tests/cimi/model/resource_spec.rb

@@ -0,0 +1,40 @@
+# 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 'rubygems'
+require 'require_relative' if RUBY_VERSION < '1.9'
+
+require_relative '../spec_helper.rb' if require 'minitest/autorun'
+
+describe "Resource" do
+
+  class ReqResource < CIMI::Model::Resource
+    scalar :req, :required => true
+  end
+
+  describe "required attributes" do
+    it "should require a value" do
+      obj = ReqResource.from_json({}.to_json)
+      assert_raises CIMI::Model::ValidationError do
+        obj.validate!(:json)
+      end
+    end
+
+    it "should validate numbers" do
+      obj = ReqResource.from_json({"req" => 42}.to_json)
+      obj.validate!(:json).must_be_nil
+    end
+  end
+end

data/tests/cimi/model/schema_spec.rb

@@ -232,6 +232,43 @@ describe "Schema" do
       @schema.to_xml(obj).must_equal sample_xml
     end
 
+    describe "of references" do
+      class RefTarget < CIMI::Model::Base
+        text :name
+      end
+
+      class RefArray < CIMI::Model::Base
+        array :things, :ref => RefTarget
+      end
+
+      before do
+        @json = { "things" =>
+          [ { "name" => "first", "href" => "/things/1" },
+            { "name" => "second", "href" => "/things/2" },
+            { "href" => "/things/3" } ]}.to_json
+      end
+
+      it "should convert from JSON" do
+        model = RefArray.from_json(@json)
+        check_model(model)
+      end
+
+      it "should convert from XML" do
+        xml = RefArray.from_json(@json).to_xml
+        model = RefArray.from_xml(xml)
+        check_model(model)
+      end
+
+      def check_model(model)
+        model.things.size.must_equal 3
+        model.things.first.must_respond_to :name
+        model.things.first.href.must_equal "/things/1"
+        model.things.first.name.must_equal "first"
+        model.things.last.name.must_be_nil
+        model.things.last.href.must_equal "/things/3"
+      end
+    end
+
     def check_structs(obj)
       obj.wont_be_nil
       obj[:structs].size.must_equal 2

data/tests/cimi/spec_helper.rb

@@ -21,7 +21,10 @@ require 'xmlsimple'
 require 'json/pure'
 require 'require_relative' if RUBY_VERSION < '1.9'
 
+ENV['API_FRONTEND'] = 'cimi'
+
 require_relative '../../lib/deltacloud/core_ext.rb'
+require_relative '../../lib/initialize'
 require_relative '../../lib/cimi/models.rb'
 
 DATA_DIR = File::join(File::expand_path(File::dirname(__FILE__)), 'data')

data/tests/deltacloud/collections/buckets_collection_test.rb

@@ -12,7 +12,7 @@ describe Deltacloud::Collections::Buckets do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::BucketsCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::BucketsCollection::IndexOperation
   end
 
   it 'provides URL to specify new bucket' do

data/tests/deltacloud/collections/drivers_collection_test.rb

@@ -11,11 +11,11 @@ describe Deltacloud::Collections::Drivers do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::DriversCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::DriversCollection::IndexOperation
   end
 
   it 'has show operation' do
-    @collection.operation(:show).must_equal Sinatra::Rabbit::DriversCollection::ShowOperation
+    @collection.operation(:show).must_equal Deltacloud::Rabbit::DriversCollection::ShowOperation
   end
 
   it 'returns list of drivers in various formats with index operation' do

data/tests/deltacloud/collections/hardware_profiles_collection_test.rb

@@ -12,11 +12,11 @@ describe Deltacloud::Collections::HardwareProfiles do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::HardwareProfilesCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::HardwareProfilesCollection::IndexOperation
   end
 
   it 'has show operation' do
-    @collection.operation(:show).must_equal Sinatra::Rabbit::HardwareProfilesCollection::ShowOperation
+    @collection.operation(:show).must_equal Deltacloud::Rabbit::HardwareProfilesCollection::ShowOperation
   end
 
   it 'returns list of hardware profiles in various formats with index operation' do

data/tests/deltacloud/collections/images_collection_test.rb

@@ -12,11 +12,11 @@ describe Deltacloud::Collections::Images do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::ImagesCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::ImagesCollection::IndexOperation
   end
 
   it 'has show operation' do
-    @collection.operation(:show).must_equal Sinatra::Rabbit::ImagesCollection::ShowOperation
+    @collection.operation(:show).must_equal Deltacloud::Rabbit::ImagesCollection::ShowOperation
   end
 
   it 'returns list of images in various formats with index operation' do

data/tests/deltacloud/collections/instance_states_collection_test.rb

@@ -12,7 +12,7 @@ describe Deltacloud::Collections::InstanceStates do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::InstanceStatesCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::InstanceStatesCollection::IndexOperation
   end
 
   it 'returns list of states for current driver in various formats with index operation' do

data/tests/deltacloud/collections/instances_collection_test.rb

@@ -12,7 +12,7 @@ describe Deltacloud::Collections::Instances do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::InstancesCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::InstancesCollection::IndexOperation
   end
 
   it 'provides URL to specify new instance' do
@@ -45,13 +45,16 @@ describe Deltacloud::Collections::Instances do
     delete root_url + '/instances/' + instance_id
     status.must_equal 405
     # You can't remove RUNNING instance
-    (xml/'error/message').first.text.strip.must_equal 'Requested method not allowed'
+    (xml/'error/message').first.text.strip.must_equal 'Method Not Allowed'
     post root_url + '/instances/' + instance_id + '/reboot'
     status.must_equal 202
+    (xml/'instance/state').first.text.strip.must_equal 'RUNNING'
     post root_url + '/instances/' + instance_id + '/stop'
     status.must_equal 202
+    (xml/'instance/state').first.text.strip.must_equal 'STOPPED'
     post root_url + '/instances/' + instance_id + '/start'
     status.must_equal 202
+    (xml/'instance/state').first.text.strip.must_equal 'RUNNING'
     post root_url + '/instances/' + instance_id + '/stop'
     status.must_equal 202
     (xml/'instance/state').first.text.strip.must_equal 'STOPPED'
@@ -67,7 +70,7 @@ describe Deltacloud::Collections::Instances do
     get root_url + "/instances/inst1"
     status.must_equal 200
     json['instance'].wont_be_empty
-    Instance.attributes.each do |attr|
+    Deltacloud::Instance.attributes.each do |attr|
       attr = attr.to_s.gsub(/_id$/,'') if attr.to_s =~ /_id$/
       next if ['launch_time', 'authn_error', 'firewalls', 'keyname', 'username', 'password', 'instance_profile'].include?(attr.to_s)
       json['instance'].keys.must_include attr.to_s

data/tests/deltacloud/collections/keys_collection_test.rb

@@ -12,11 +12,11 @@ describe Deltacloud::Collections::Keys do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::KeysCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::KeysCollection::IndexOperation
   end
 
   it 'has show operation' do
-    @collection.operation(:show).must_equal Sinatra::Rabbit::KeysCollection::ShowOperation
+    @collection.operation(:show).must_equal Deltacloud::Rabbit::KeysCollection::ShowOperation
   end
 
   it 'returns list of keys in various formats with index operation' do

data/tests/deltacloud/collections/realms_collection_test.rb

@@ -12,11 +12,11 @@ describe Deltacloud::Collections::Realms do
   end
 
   it 'has index operation' do
-    @collection.operation(:index).must_equal Sinatra::Rabbit::RealmsCollection::IndexOperation
+    @collection.operation(:index).must_equal Deltacloud::Rabbit::RealmsCollection::IndexOperation
   end
 
   it 'has show operation' do
-    @collection.operation(:show).must_equal Sinatra::Rabbit::RealmsCollection::ShowOperation
+    @collection.operation(:show).must_equal Deltacloud::Rabbit::RealmsCollection::ShowOperation
   end
 
   it 'returns list of realms in various formats with index operation' do