tim 0.1.2 → 0.2.0

data/app/controllers/tim/target_images_controller.rb

@@ -2,26 +2,28 @@ module Tim
   class TargetImagesController < Tim::ApplicationController
     respond_to :json, :only => :update
 
+    prepend_before_filter ResourceLinkFilter.new({ :target_image => :image_version }),
+                :only => [:create]
     before_filter :factory_keys, :only => :update
 
     def index
       @target_images = Tim::TargetImage.all unless defined? @target_images
-      respond_with @target_images
+      respond_with(@target_images, @respond_options)
     end
 
     def show
       @target_image = Tim::TargetImage.find(params[:id]) unless defined? @target_image
-      respond_with @target_image
+      respond_with(@target_image, @respond_options)
     end
 
     def new
       @target_image = Tim::TargetImage.new unless defined? @target_image
-      respond_with @target_image
+      respond_with(@target_image, @respond_options)
     end
 
     def edit
       @target_image = Tim::TargetImage.find(params[:id]) unless defined? @target_image
-      respond_with @target_image
+      respond_with(@target_image, @respond_options)
     end
 
     def create
@@ -29,7 +31,7 @@ module Tim
       if @target_image.save
         flash[:notice] = 'Image version was successfully created.'
       end
-      respond_with @target_image
+      respond_with(@target_image, @respond_options)
     end
 
     def update
@@ -37,7 +39,7 @@ module Tim
       if @target_image.update_attributes(params[:target_image])
         flash[:notice] = 'Target image was successfully updated.'
       end
-      respond_with @target_image
+      respond_with(@target_image, @respond_options)
     end
 
     # DELETE /target_images/1
@@ -45,7 +47,7 @@ module Tim
     def destroy
       @target_image = Tim::TargetImage.find(params[:id]) unless defined? @target_image
       @target_image.destroy
-      respond_with @target_image
+      respond_with(@target_image, @respond_options)
     end
 
     # TODO Add factory permission check

data/app/controllers/tim/templates_controller.rb

@@ -3,22 +3,22 @@ module Tim
 
     def index
       @templates = Tim::Template.all unless defined? @templates
-      respond_with @templates
+      respond_with(@templates, @respond_options)
     end
 
     def show
       @template = Tim::Template.find(params[:id]) unless defined? @template
-      respond_with @template
+      respond_with(@template, @respond_options)
     end
 
     def new
       @template = Tim::Template.new unless defined? @template
-      respond_with @template
+      respond_with(@template, @respond_options)
     end
 
     def edit
       @template = Tim::Template.find(params[:id])
-      respond_with @template
+      respond_with(@template, @respond_options)
     end
 
     def create
@@ -26,7 +26,7 @@ module Tim
       if @template.save
         flash[:notice] = 'Template was successfully created.'
       end
-      respond_with @template
+      respond_with(@template, @respond_options)
     end
 
     def update
@@ -34,13 +34,13 @@ module Tim
       if @template.update_attributes(params[:template])
         flash[:notice] = 'Template was successfully updated.'
       end
-      respond_with @template
+      respond_with(@template, @respond_options)
     end
 
     def destroy
       @template = Tim::Template.find(params[:id]) unless defined? @template
       @template.destroy
-      respond_with @template
+      respond_with(@template, @respond_options)
     end
 
   end

data/app/exceptions/tim/exceptions.rb

@@ -0,0 +1,6 @@
+module Tim
+  module Error
+    class ImagefactoryConnectionRefused < ::StandardError
+    end
+  end
+end

data/app/filters/tim/resource_link_filter.rb

@@ -0,0 +1,56 @@
+# Before filter for controllers that handle REST API requests. Conductor uses
+# linking to resources like <pool id='1'/> (resulting in :pool => { :id => 1 }
+# in request params hash) but ActiveRecord expects linking to resources like
+# <pool_id>1</pool_id> (resluting in :pool_id => 1 in request params hash).
+#
+# This before filter operates on request params hash to rewrite it from our
+# format to ActiveRecord-friendly format.
+#
+# The constructor of the filter accepts specification of what should be
+# transformed. E.g.:
+#
+# before_filter ResourceLinkFilter.new({ :catalog => :pool }),
+# :only => [:create, :update]
+#
+# would transform { :catalog => { :pool => { :id => 1 }}}
+# into { :catalog => { :pool_id => 1 }}
+#
+# See the specs in spec/util/resource_link_filter_spec.rb for more examples.
+#
+
+# NOTE This filter was taken from the aeolus conductor project: https://github.com/aeolusproject/conductor/
+
+class Tim::ResourceLinkFilter
+  def initialize(resource_links)
+    @resource_links = resource_links
+  end
+
+  def before(controller)
+    return unless controller.request.format == :xml
+
+    transform_resource_links_recursively(controller.params, @resource_links)
+  end
+
+
+  private
+
+  def transform_resource_links_recursively(subparams, sublinks)
+    return if subparams == nil
+
+    case sublinks
+    when Symbol # then transform the link (last level of recursion)
+      return if subparams[sublinks] == nil || subparams[sublinks][:id] == nil
+
+      subparams[:"#{sublinks}_id"] = subparams[sublinks][:id]
+      subparams.delete(sublinks)
+    when Array # then process each item
+      sublinks.each do |item|
+        transform_resource_links_recursively(subparams, item)
+      end
+    when Hash # then descend into each entry
+      sublinks.each_key do |key|
+        transform_resource_links_recursively(subparams[key], sublinks[key])
+      end
+    end
+  end
+end

data/app/models/tim/base_image.rb

@@ -1,13 +1,17 @@
 module Tim
   class BaseImage < Tim::Base
-    has_many :image_versions
-    belongs_to :template
+    has_many :image_versions, :inverse_of => :base_image
+    belongs_to :template, :inverse_of => :base_images
+
     belongs_to :user, :class_name => Tim.user_class
 
     accepts_nested_attributes_for :template
     accepts_nested_attributes_for :image_versions
 
-    attr_accessible :template, :name, :description
+    validates_presence_of :name
+    validates_presence_of :template, :unless => :import
+
+    attr_accessible :template, :name, :description, :import
     attr_accessible :template_attributes
     attr_accessible :image_versions_attributes, :as => :admin
     attr_protected :id

data/app/models/tim/image_version.rb

@@ -1,11 +1,13 @@
 module Tim
   class ImageVersion < Tim::Base
-    belongs_to :base_image
-    has_many :target_images
+    belongs_to :base_image, :inverse_of => :image_versions
+    has_many :target_images, :inverse_of => :image_version
 
     accepts_nested_attributes_for :base_image
     accepts_nested_attributes_for :target_images
 
+    validates_presence_of :base_image
+
     attr_accessible :base_image_attributes
     attr_accessible :target_images_versions_attributes
     attr_protected :id

data/app/models/tim/provider_image.rb

@@ -1,37 +1,63 @@
 module Tim
   class ProviderImage < Tim::Base
-    belongs_to :target_image
+    belongs_to :target_image, :inverse_of => :provider_images
     belongs_to :provider_account, :class_name => Tim.provider_account_class
 
     accepts_nested_attributes_for :target_image
 
     attr_accessible :target_image_attributes
+    attr_accessible :external_image_id, :if => :imported?
     attr_accessible :status, :status_detail, :progress #, :as => :image_factory
     attr_accessible :provider
     attr_writer :credentials
     attr_protected :id
 
-    after_create :create_factory_provider_image
+    validates_presence_of :target_image
+    validates_presence_of :external_image_id, :if => :imported?
+
+    after_create :create_factory_provider_image, :unless => :imported?
+    after_create :create_import, :if => :imported?
+
+    def imported?
+      target_image.imported?
+    end
 
     private
+    def factory_provider_credentials
+      @credentials
+    end
+
+    def factory_provider
+      self.provider
+    end
+
     def create_factory_provider_image
       begin
-        provider_image = ImageFactory::ProviderImage.new(:target_image_id => self.target_image.factory_id,
-                                                         :provider => self.provider,
-                                                         :credentials => @credentials,
+        provider_image = ImageFactory::ProviderImage.new(:credentials => factory_provider_credentials,
                                                           # TODO Remove this when upgrading to 3.2
                                                           # target conflicts with rails 3.0.10
                                                           # ActiveRecord::Associations::Association#target
                                                           :target => target_image.target,
                                                           :parameters => "")
+        provider_image.provider = factory_provider
         # TODO There is a bug in ARes 3.0.10 that will add map name twice when setting in mass assign.  So we set
         # parameters separately.
         # Setting parameters at mass assign results in json => {"target_image":"parameters":{"parameters":{"..."}}}"
         # This should be tested and removed if fixed in 3.2
         provider_image.parameters = { :callbacks => ["#{ImageFactory::ProviderImage.callback_url}/#{self.id}"] }
+        if target_image.snapshot?
+          provider_image.parameters[:snapshot] = true
+          provider_image.template = self.target_image.template.xml
+        else
+          provider_image.target_image_id = self.target_image.factory_id
+        end
+
         provider_image.save!
         populate_factory_fields(provider_image)
         self.save
+      rescue Errno::ECONNREFUSED
+        raise Tim::Error::ImagefactoryConnectionRefused.new("Unable to connect"\
+         " to Imagefactory server @ #{Tim::ImageFactory::Base.site}")
       rescue => e
         # TODO Add proper error handling
         raise e
@@ -45,7 +71,17 @@ module Tim
       self.progress = factory_provider_image.percent_complete
       self.provider = factory_provider_image.provider
       self.external_image_id = factory_provider_image.identifier_on_provider
-      self.provider_account_id = factory_provider_image.provider_account_identifier
+      self.factory_provider_account_id = factory_provider_image.provider_account_identifier
+    end
+
+    # TODO At the moment this method simply sets fields to import defaults.
+    # We should investigate whether we can check the image exists and if the
+    # user can access it.  Deltacloud?
+    def create_import
+      self.status = "COMPLETE"
+      self.progress = "COMPLETE"
+      self.status_detail = "Imported Image"
+      self.save
     end
   end
 end

data/app/models/tim/target_image.rb

@@ -1,12 +1,15 @@
 module Tim
   class TargetImage < Tim::Base
-    belongs_to :image_version
+    belongs_to :image_version, :inverse_of => :target_images
+    has_many :provider_images, :inverse_of => :target_image
+
     belongs_to :provider_type, :class_name => Tim.provider_type_class
-    has_many :provider_images
 
     accepts_nested_attributes_for :image_version
     accepts_nested_attributes_for :provider_images
 
+    validates_presence_of :image_version, :target
+
     attr_accessible :image_version_attributes
     attr_accessible :provider_images_attributes
     attr_accessible :status, :status_detail, :progress #, :as => :image_factory
@@ -14,25 +17,42 @@ module Tim
 
     attr_protected :id
 
-    after_create :create_factory_target_image
+    after_create :create_factory_target_image, :if => :create_factory_target_image?
+    after_create :set_import_snapshot_status, :if => lambda { |t| t.imported? || t.snapshot? }
 
     def template
       image_version.base_image.template
     end
 
+    def imported?
+      image_version.base_image.import
+    end
+
+    def snapshot?
+      build_method == "SNAPSHOT"
+    end
+
     private
     def create_factory_target_image
       begin
-        target_image = ImageFactory::TargetImage.new(:template => template.xml,
-                                                        :target => target,
-                                                        :parameters => nil)
-                                                        # A bug in ARes adds parameters twice to the resulting json
-                                                        # when a map is provided in mass assign
+        target_image = ImageFactory::TargetImage.new(:target => target,
+                                                     :parameters => nil)
+        # A bug in ARes adds parameters twice to the resulting json when a map
+        # is provided in mass assign
         target_image.parameters =  { :callbacks => ["#{ImageFactory::TargetImage.callback_url}/#{self.id}"] }
+
+        if image_version.factory_base_image_id
+          target_image.base_image_id = image_version.factory_base_image_id
+        else
+          target_image.template = template.xml
+        end
         target_image.save!
 
         populate_factory_fields(target_image)
         self.save
+      rescue Errno::ECONNREFUSED
+        raise Tim::Error::ImagefactoryConnectionRefused.new("Unable to connect"\
+         " to Imagefactory server @ #{Tim::ImageFactory::Base.site}")
       rescue => e
         # TODO Add proper error handling
         raise e
@@ -44,7 +64,26 @@ module Tim
       self.factory_id = factory_target_image.id
       self.status_detail = factory_target_image.status_detail.activity
       self.progress = factory_target_image.percent_complete
+      unless self.image_version.factory_base_image_id
+        image_version.factory_base_image_id = factory_target_image.base_image_id
+        image_version.save!
+      end
+    end
+
+    def set_import_snapshot_status
+      self.progress = "COMPLETE"
+      self.status = "COMPLETE"
+      if self.imported? 
+        self.status_detail = "Imported Image"
+      elsif self.snapshot?
+        self.status_detail = "Snapshot Image"
+      end
+      self.save
     end
 
+    private 
+    def create_factory_target_image?
+      !imported? && !snapshot?
+    end
   end
-end
+end

data/app/models/tim/template.rb

@@ -5,15 +5,30 @@ module Tim
     include ActiveModel::Validations
     validates_with TemplateValidator
 
-    has_many :base_images
+    has_many :base_images, :inverse_of => :template
 
     attr_accessible :xml
     attr_protected :id
 
+    OS = Struct.new(:name, :version, :arch)
+
     # Used in views to display the xml elements of this template
     def xml_elements
-      ::Nokogiri::XML::Document.parse(xml).xpath("//template/*").to_xml
+      parsed_xml.xpath("//template/*").to_xml
+    end
+
+    def os
+      OS.new(
+        parsed_xml.xpath("//template/os/name").text,
+        parsed_xml.xpath("//template/os/version").text,
+        parsed_xml.xpath("//template/os/arch").text
+      )
     end
 
+    private
+
+    def parsed_xml
+      @parsed_xml ||= ::Nokogiri::XML::Document.parse(xml)
+    end
   end
-end
+end

data/app/patches/rails/active_record/autosave_association.rb

@@ -0,0 +1,29 @@
+# There is a bug in Rails which causes issues when using accepts_nested_attrs
+# and inverse_of on associations:  https://github.com/rails/rails/issues/7809/
+# This code was lifted from the pull request of the bug shown above.  It solves
+# the issue.  Until this is merged into rails we will have to carry the patch
+# ourselves.
+
+module ActiveRecord
+  module AutosaveAssociation
+    extend ActiveSupport::Concern
+
+    # Returns whether or not this record has been changed in any way (including whether
+    # any of its nested autosave associations are likewise changed)
+    def changed_for_autosave?
+      @_changed_for_autosave_called ||= false
+      if @_changed_for_autosave_called
+        # traversing a cyclic graph of objects; stop it
+        result = false
+      else
+        begin
+          @_changed_for_autosave_called = true
+          result = new_record? || changed? || marked_for_destruction? || nested_records_changed_for_autosave?
+        ensure
+          @_changed_for_autosave_called = false
+        end
+      end
+      result
+    end
+  end
+end