tim 0.1.2 → 0.2.0

data/app/validators/template_validator.rb

@@ -4,12 +4,16 @@ class TemplateValidator < ActiveModel::Validator
   @@template_rng = File.join(Tim::Engine.root, "config/schemas", "tdl.rng")
 
   def validate(record)
-    rng = Nokogiri::XML::RelaxNG(File.read(@@template_rng))
-    xml = Nokogiri::XML(record.xml) { |config| config.strict }
+    begin
+      rng = Nokogiri::XML::RelaxNG(File.read(@@template_rng))
+      xml = Nokogiri::XML(record.xml) { |config| config.strict }
 
-    rng.validate(xml).each do |error|
-      record.errors.add :xml, error.message
-    end
+      rng.validate(xml).each do |error|
+        record.errors.add :xml, error.message
+      end
+     rescue Nokogiri::XML::SyntaxError => e
+       record.errors.add :xml, "Syntax error on line #{e.line} at column #{e.column}: #{e.message}"
+     end
   end
 
 end

data/app/views/tim/base_images/_base_image.xml.haml

@@ -4,6 +4,7 @@
   %description= base_image.description
   - if base_image.template
     = render :partial => 'tim/templates/template_minimal', :locals => {:template => base_image.template}
+  %import= base_image.import
   %image_versions
     - base_image.image_versions.each do |image_version|
       = render :partial => 'tim/image_versions/image_version_minimal', :locals => {:image_version => image_version}

data/app/views/tim/target_images/_target_image.xml.haml

@@ -1,6 +1,7 @@
 !!! XML
 %target_image{:id => target_image.id, :href => target_image_url(target_image.id) }
   %target= target_image.target
+  %build_method= target_image.build_method
   %status= target_image.status
   %status_detail= target_image.status_detail
   %progress= target_image.progress

data/db/migrate/20121115151914_add_import_to_tim_base_images.rb

@@ -0,0 +1,5 @@
+class AddImportToTimBaseImages < ActiveRecord::Migration
+  def change
+    add_column :tim_base_images, :import, :boolean, :default => false
+  end
+end

data/db/migrate/20121210131423_add_build_method_to_target_image.rb

@@ -0,0 +1,5 @@
+class AddBuildMethodToTargetImage < ActiveRecord::Migration
+  def change
+    add_column :tim_target_images, :build_method, :string, :default => "BARE_METAL"
+  end
+end

data/db/migrate/20121216131814_rename_provider_account_id_attribute.rb

@@ -0,0 +1,13 @@
+class RenameProviderAccountIdAttribute < ActiveRecord::Migration
+  def up
+    change_table :tim_provider_images do |t|
+      t.rename :provider_account_id, :factory_provider_account_id
+    end
+  end
+
+  def down
+    change_table :tim_provider_images do |t|
+      t.rename :factory_provider_account_id, :provider_account_id
+    end
+  end
+end

data/db/migrate/20121216134538_add_factory_base_image_id_to_image_versions.rb

@@ -0,0 +1,5 @@
+class AddFactoryBaseImageIdToImageVersions < ActiveRecord::Migration
+  def change
+    add_column :tim_image_versions, :factory_base_image_id, :string
+  end
+end

data/lib/image_factory/model/base_image.rb

@@ -0,0 +1,6 @@
+module Tim
+  module ImageFactory
+    class BaseImage < Base
+    end
+  end
+end

data/lib/tim/engine.rb

@@ -5,5 +5,17 @@ module Tim
       g.test_framework :rspec, :view_specs => false
       g.template_engine :haml
     end
+
+    # Load Host Decorator Classes
+    config.to_prepare do |c|
+      # Load everything under patches, exceptions and decorators dir
+      [
+        Dir[Rails.root.join('app', 'decorators', '**', '*_decorator.rb')],
+        Dir[Tim::Engine.root.join('app', 'patches', '**', '*.rb')],
+        Dir[Tim::Engine.root.join('app', 'exceptions', '**', '*.rb')]
+      ].flatten.each do |f|
+        Rails.application.config.cache_classes ? require(f) : load(f)
+      end
+    end
   end
 end

data/lib/tim/version.rb

@@ -1,3 +1,3 @@
 module Tim
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/controllers/base_images_controller_spec.rb

@@ -14,7 +14,10 @@ module Tim
 
         context "Success" do
           it "should return a new base image as xml" do
-            post :create, { :base_image => { :name => "Name", :description => "Description"}}
+            template = FactoryGirl.build(:template)
+            post :create, { :base_image => { :name => "Name",
+                                             :description => "Description",
+                                             :template_attributes => {:xml => template.xml }}}
             response.code.should == "201"
 
             body = Hash.from_xml(response.body)
@@ -30,11 +33,24 @@ module Tim
 
             body = Hash.from_xml(response.body)
             body.keys.should  == ["base_image"]
-            body["base_image"].keys.should =~ ["template", "id", "href", "name", "description", "image_versions"]
+            body["base_image"].keys.should =~ ["template", "id", "href", "name", "description", "image_versions", "import"]
             body["base_image"]["template"].keys.should =~ ["id", "href"]
           end
         end
 
+          it "should return a new base image with an existing template" do
+            template = FactoryGirl.create(:template)
+            post :create, { :base_image => { :name => "Name",
+                                             :description => "Description",
+                                             :template => {:id =>  template.id}}}
+            response.code.should == "201"
+
+            body = Hash.from_xml(response.body)
+            body.keys.should  == ["base_image"]
+            body["base_image"].keys.should =~ ["template", "id", "href", "name", "description", "image_versions", "import"]
+            body["base_image"]["template"].keys.should =~ ["id", "href"]
+          end
+
         context "failure" do
           it "should return a unprocessable entity error when the client sends invalid content" do
             post :create, { :invalid_image => FactoryGirl.build(:base_image).attributes }
@@ -46,14 +62,14 @@ module Tim
       describe "Show Base Image" do
         context "Success" do
           it "should return an existing base image as XML" do
-            base_image = FactoryGirl.create(:base_image)
+            base_image = FactoryGirl.create(:base_image, :import => true)
             get :show, :id => base_image.id
 
             response.code.should == "200"
 
             body = Hash.from_xml(response.body)
             body.keys.should  == ["base_image"]
-            body["base_image"].keys.should =~ ["id", "href", "name", "description", "image_versions"]
+            body["base_image"].keys.should =~ ["id", "href", "name", "description", "image_versions", "import"]
           end
 
           it "should return an existing base image as XML with template" do
@@ -64,7 +80,7 @@ module Tim
 
             body = Hash.from_xml(response.body)
             body.keys.should  == ["base_image"]
-            body["base_image"].keys.should =~ ["template", "id", "href", "name", "description", "image_versions"]
+            body["base_image"].keys.should =~ ["template", "id", "href", "name", "description", "image_versions", "import"]
             body["base_image"]["template"].keys.should =~ ["id", "href"]
           end
 
@@ -80,7 +96,7 @@ module Tim
 
             body = Hash.from_xml(response.body)
             body.keys.should  == ["base_image"]
-            body["base_image"].keys.should =~ ["image_versions", "template", "id", "href", "name", "description"]
+            body["base_image"].keys.should =~ ["image_versions", "template", "id", "href", "name", "description", "import"]
             body["base_image"]["image_versions"]["image_version"].size.should == 2
           end
         end
@@ -97,7 +113,7 @@ module Tim
         context "Success" do
           it "should return a list of existing base images as XML" do
             3.times do
-              FactoryGirl.create(:base_image)
+              FactoryGirl.create(:base_image_with_template)
             end
 
             get :index
@@ -113,7 +129,7 @@ module Tim
       describe "List Delete Image" do
         context "Success" do
           it "should return a no content code when deleting an image" do
-            base_image = FactoryGirl.create(:base_image)
+            base_image = FactoryGirl.create(:base_image_with_template)
             delete :destroy, :id => base_image.id
             response.code.should == "204"
           end

data/spec/controllers/image_versions_controller_spec.rb

@@ -15,7 +15,8 @@ module Tim
 
         context "Success" do
            it "should return a new image version as xml" do
-            post :create, { :image_version => {}}
+           image_version = FactoryGirl.build(:image_version_with_full_tree)
+            post :create, { :image_version => image_version.attributes }
             response.code.should == "201"
 
             body = Hash.from_xml(response.body)
@@ -23,7 +24,19 @@ module Tim
           end
 
           it "should return a new image version with base image as xml" do
-            post :create, { :image_version => {:base_image => {:name => "Name"}}}
+            image_version = FactoryGirl.build(:image_version_with_full_tree)
+            post :create, { :image_version => image_version.attributes }
+            response.code.should == "201"
+
+            body = Hash.from_xml(response.body)
+            body.keys.should  == ["image_version"]
+            body["image_version"].keys.should =~ ["base_image", "id", "href", "target_images"]
+            body["image_version"]["base_image"].keys.should =~ ["id", "href"]
+          end
+
+          it "should return a new image version with existing base image" do
+            base_image = FactoryGirl.create(:base_image_with_template)
+            post :create, { :image_version => {:base_image => {:id => base_image.id}}}
             response.code.should == "201"
 
             body = Hash.from_xml(response.body)
@@ -44,7 +57,7 @@ module Tim
       describe "Show Image Version" do
         context "Success" do
           it "should return an existing image version as XML" do
-            image_version = FactoryGirl.create(:image_version_with_base_image)
+            image_version = FactoryGirl.create(:image_version_with_full_tree)
             get :show, :id => image_version.id
 
             response.code.should == "200"
@@ -79,7 +92,7 @@ module Tim
         context "Success" do
           it "should return a list of existing base images as XML" do
             3.times do
-              FactoryGirl.create(:image_version_with_base_image)
+              FactoryGirl.create(:image_version_with_full_tree)
             end
 
             get :index
@@ -96,7 +109,7 @@ module Tim
       describe "Delete Image Version" do
         context "Success" do
           it "should return a no content code when deleting an image version" do
-            image_version = FactoryGirl.create(:image_version)
+            image_version = FactoryGirl.create(:image_version_with_full_tree)
             delete :destroy, :id => image_version.id
             response.code.should == "204"
 
@@ -117,7 +130,7 @@ module Tim
         context "Success" do
            it "should return an updated image version as xml" do
             image_version = FactoryGirl.create(:image_version_with_full_tree)
-            image_version.base_image = FactoryGirl.create(:base_image)
+            image_version.base_image = FactoryGirl.create(:base_image_with_template)
             put :update, :id => image_version.id, :image_version => image_version.attributes
             response.code.should == "200"
 
@@ -130,7 +143,7 @@ module Tim
 
         context "failure" do
           it "should return a unprocessable entity error when the client sends invalid content" do
-            image_version = FactoryGirl.create(:image_version)
+            image_version = FactoryGirl.create(:image_version_with_full_tree)
             post :update, :id => image_version.id, :invalid_image => image_version.attributes
             response.code.should == "422"
           end

data/spec/controllers/provider_images_controller_spec.rb

@@ -10,6 +10,7 @@ module Tim
         TargetImage.any_instance.stub(:template).and_return(FactoryGirl.build(:template))
         ProviderImage.any_instance.stub(:create_factory_provider_image).and_return(true)
         TargetImage.any_instance.stub(:create_factory_target_image).and_return(true)
+        TargetImage.any_instance.stub(:imported?).and_return(false)
         @status_detail = mock(:status)
         @status_detail.stub(:activity).and_return("Building")
         ImageFactory::TargetImage.stub(:create).and_return(FactoryGirl.build(:image_factory_target_image, :status_detail => @status_detail))
@@ -33,11 +34,23 @@ module Tim
               "snapshot", "status_detail", "progress", "href", "id","target_image", "status"]
             body["provider_image"]["target_image"]["id"].should == provider_image.target_image .id.to_s
           end
+
+          it "should return a new provider image awith existing target image" do
+            target_image = FactoryGirl.create(:target_image_with_full_tree)
+            post :create, { :provider_image => { :target_image => { :id => target_image.id }}}
+            response.code.should == "201"
+
+            body = Hash.from_xml(response.body)
+            body.keys.should  == ["provider_image"]
+            body["provider_image"].keys.should  =~ ["external_image_id", "provider",
+              "snapshot", "status_detail", "progress", "href", "id","target_image", "status"]
+            body["provider_image"]["target_image"]["id"].should == target_image .id.to_s
+          end
         end
 
         context "failure" do
           it "should return a unprocessable entity error when the client sends invalid content" do
-            post :create, { :invalid_image => FactoryGirl.build(:provider_image).attributes }
+            post :create, { :invalid_image => FactoryGirl.build(:provider_image_with_full_tree).attributes }
             response.code.should == "422"
           end
         end
@@ -71,7 +84,7 @@ module Tim
         context "Success" do
           it "should return a list of existing provider images as XML" do
             3.times do
-              FactoryGirl.create(:provider_image)
+              FactoryGirl.create(:provider_image_with_full_tree)
             end
 
             get :index
@@ -87,7 +100,7 @@ module Tim
       describe "Delete Provider Image" do
         context "Success" do
           it "should return a no content code when deleting a provider image" do
-            provider_image = FactoryGirl.create(:provider_image)
+            provider_image = FactoryGirl.create(:provider_image_with_full_tree)
             delete :destroy, :id => provider_image.id
             response.code.should == "204"
 
@@ -108,7 +121,7 @@ module Tim
         context "Success" do
            it "should return an updated provider image as xml" do
             provider_image = FactoryGirl.create(:provider_image_with_full_tree)
-            provider_image.target_image  = FactoryGirl.create(:target_image )
+            provider_image.target_image  = FactoryGirl.create(:target_image_with_full_tree )
             put :update, :id => provider_image.id, :provider_image => provider_image.attributes
             response.code.should == "200"
 
@@ -121,13 +134,13 @@ module Tim
 
         context "failure" do
           it "should return a unprocessable entity error when the client sends invalid content" do
-            provider_image = FactoryGirl.create(:provider_image)
+            provider_image = FactoryGirl.create(:provider_image_with_full_tree)
             post :update, :id => provider_image.id, :invalid_image => provider_image.attributes
             response.code.should == "422"
           end
 
           it "should return a not found code when updating a Provider image that does not exist" do
-            delete :update, :id => -1, :provider_image => FactoryGirl.create(:provider_image).attributes
+            delete :update, :id => -1, :provider_image => FactoryGirl.create(:provider_image_with_full_tree).attributes
             response.code.should == "404"
           end
         end

data/spec/controllers/target_images_controller_spec.rb

@@ -9,6 +9,7 @@ module Tim
         send_and_accept_xml
         TargetImage.any_instance.stub(:template).and_return(FactoryGirl.build(:template))
         TargetImage.any_instance.stub(:create_factory_target_image).and_return(true)
+        TargetImage.any_instance.stub(:imported?).and_return(false)
         @status_detail = mock(:status)
         @status_detail.stub(:activity).and_return("Building")
         TargetImagesController.any_instance.stub(:template_exists?).and_return false
@@ -28,14 +29,27 @@ module Tim
 
             body = Hash.from_xml(response.body)
             body.keys.should  == ["target_image"]
-            body["target_image"].keys.should  =~ ["target", "status", "status_detail", "progress", "href", "id", "provider_images", "image_version"]
+            body["target_image"].keys.should  =~ ["target", "status", "status_detail", "progress", "href", "id",
+                                                  "provider_images", "image_version", "build_method"]
             body["target_image"]["image_version"]["id"].should == target_image.image_version.id.to_s
           end
+
+          it "should create a new target image for imported images" do
+            image_version = FactoryGirl.create(:image_version_import)
+            post :create, { :target_image => {:image_version => {:id => image_version.id}, :target => "mock"}}
+            response.code.should == "201"
+
+            body = Hash.from_xml(response.body)
+            body.keys.should  == ["target_image"]
+            body["target_image"].keys.should  =~ ["target", "status", "status_detail", "progress", "href", "id",
+                                                  "provider_images", "image_version", "build_method"]
+            body["target_image"]["image_version"]["id"].should == image_version.id.to_s
+          end
         end
 
         context "failure" do
           it "should return a unprocessable entity error when the client sends invalid content" do
-            post :create, { :invalid_image => FactoryGirl.build(:target_image).attributes }
+            post :create, { :invalid_image => FactoryGirl.build(:target_image_with_full_tree).attributes }
             response.code.should == "422"
           end
         end
@@ -52,7 +66,7 @@ module Tim
             body = Hash.from_xml(response.body)
             body.keys.should  == ["target_image"]
             body["target_image"].keys.should =~ ["id", "href", "image_version", 
-              "provider_images", "target", "status", "status_detail", "progress"]
+              "provider_images", "target", "status", "status_detail", "progress", "build_method"]
           end
         end
 
@@ -68,7 +82,7 @@ module Tim
         context "Success" do
           it "should return a list of existing target images as XML" do
             3.times do
-              FactoryGirl.create(:target_image)
+              FactoryGirl.create(:target_image_with_full_tree)
             end
 
             get :index
@@ -84,7 +98,7 @@ module Tim
       describe "Delete Target Image" do
         context "Success" do
           it "should return a no content code when deleting a target image" do
-            target_image = FactoryGirl.create(:target_image)
+            target_image = FactoryGirl.create(:target_image_with_full_tree)
             delete :destroy, :id => target_image.id
             response.code.should == "204"
 
@@ -105,7 +119,7 @@ module Tim
         context "Success" do
            it "should return an updated target image as xml" do
             target_image = FactoryGirl.create(:target_image_with_full_tree)
-            target_image.image_version = FactoryGirl.create(:image_version)
+            target_image.image_version = FactoryGirl.create(:image_version_with_full_tree)
             put :update, :id => target_image.id, :target_image => target_image.attributes
             response.code.should == "200"
 
@@ -118,13 +132,13 @@ module Tim
 
         context "failure" do
           it "should return a unprocessable entity error when the client sends invalid content" do
-            target_image = FactoryGirl.create(:target_image)
+            target_image = FactoryGirl.create(:target_image_with_full_tree)
             put :update, :id => target_image.id, :invalid_image => target_image.attributes
             response.code.should == "422"
           end
 
           it "should return a not found code when updating a target image that does not exist" do
-            delete :update, :id => -1, :target_image => FactoryGirl.build(:target_image).attributes
+            delete :update, :id => -1, :target_image => FactoryGirl.build(:target_image_with_full_tree).attributes
             response.code.should == "404"
           end
         end

data/spec/factories/tim/base_image.rb

@@ -7,4 +7,8 @@ FactoryGirl.define do
   factory :base_image_with_template, :parent => :base_image do
     association :template, :factory => :template
   end
-end
+
+  factory :base_image_import, :parent => :base_image do
+    import true
+  end
+end

data/spec/factories/tim/image_factory/target_image.rb

@@ -3,5 +3,6 @@ FactoryGirl.define do
     status "NEW"
     id '4cc3b024-5fe7-4b0b-934b-c5d463b990b0'
     percent_complete '0'
+    base_image_id '2cc3b024-5fe7-4b0b-934b-c5d463b990b0'
   end
 end