tim 0.1.2 → 0.2.0

data/Gemfile

@@ -0,0 +1,17 @@
+source :rubygems
+
+# Declare your gem's dependencies in tim.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# jquery-rails is used by the dummy application
+#gem "jquery-rails"
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use debugger
+# gem 'debugger'

data/README.rdoc

@@ -26,18 +26,162 @@ cd test/dummy; rails s
 
 == API Reference
 
+=== Templates
+
+==== Create Template
+
+Request
+
+  curl -X POST --header "Accept: application/xml" --header "Content-Type: application/xml" --data "
+  <template>
+     <name>mock</name>
+     <os>
+       <name>RHEL-6</name>
+       <version>1</version>
+       <arch>x86_64</arch>
+       <install type=\"iso\">
+         <iso>http://mockhost/RHELMock1-x86_64-DVD.iso</iso>
+       </install>
+       <rootpw>password</rootpw>
+    </os>
+    <description>Mock Template</description>
+  </template>
+  " http://localhost:3000/tim/templates
+ 
+Response
+
+  Code: 201
+
+  Body:
+
+  <template href='http://localhost:3000/tim/templates/34' id='34'>
+    <name>mock</name><os>
+        <name>RHEL-6</name>
+        <version>1</version>
+        <arch>x86_64</arch>
+        <install type="iso">
+          <iso>http://mockhost/RHELMock1-x86_64-DVD.iso</iso>
+        </install>
+        <rootpw>password</rootpw>
+      </os><description>Mock Template</description>
+    <base_images>
+    </base_images>
+    <custom_content>custom</custom_content>
+  </template>
+
+
+=== Show Template
+
+Request
+
+  curl --header "Accept:application/xml" http://localhost:3000/tim/templates/34
+
+Response
+
+  Code: 200
+
+  Body:
+
+  <template href='http://localhost:3000/tim/templates/34' id='34'>
+    <name>mock</name><os>
+        <name>RHEL-6</name>
+        <version>1</version>
+        <arch>x86_64</arch>
+        <install type="iso">
+          <iso>http://mockhost/RHELMock1-x86_64-DVD.iso</iso>
+        </install>
+        <rootpw>password</rootpw>
+      </os><description>Mock Template</description>
+    <base_images>
+    </base_images>
+    <custom_content>custom</custom_content>
+  </template>
+
+=== List Templates
+
+Request
+
+  curl --header "Accept:application/xml" http://localhost:3000/tim/templates
+
+Response
+
+  Code: 200
+
+  Body:
+
+  <templates>
+    <template href='http://localhost:3000/tim/templates/33' id='33'></template>
+    <template href='http://localhost:3000/tim/templates/35' id='35'></template>
+    <template href='http://localhost:3000/tim/templates/36' id='36'></template>
+  </templates>
+
+=== Update Template - Not Allowed
+
+=== Delete Template
+
+Request
+
+  curl -X DELETE --header "Accept: application/xml" http://localhost:3000/tim/templates/34
+
+Response
+
+  Code: 204
+
+  Body:
+
 === Base Images
 
-==== Create Base Image
+==== Create Base Image with Template
+
+===== with Existing Template
 
 Request
 
-  curl -X POST --header "Accept: application/xml" --header \
-  "Content-Type: application/xml" http://localhost:3000/tim/base_images --data \
-  "<base_image>
+  curl -X POST --header "Accept: application/xml" --header "Content-Type: application/xml" --data "
+  <base_image>
+    <name>MyFirstBaseImage</name>
+    <description>This is my very first base image</description>
+    <template href='http://localhost:3000/tim/templates/3' id='3'></template>
+  </base_image>
+  " http://localhost:3000/tim/base_images
+
+Response
+
+  Code: 201
+
+  Body:
+
+  <base_image href='http://localhost:3000/tim/base_images/15' id='15'>
+    <name>MyFirstBaseImage</name>
+    <description>This is my very first base image</description>
+    <template href='http://localhost:3000/tim/templates/36' id='36'></template>
+    <image_versions>
+    </image_versions>
+  </base_image>
+
+===== with New Template
+
+Request
+
+  curl -X POST --header "Accept: application/xml" --header "Content-Type: application/xml" --data "
+  <base_image>
     <name>MyFirstBaseImage</name>
     <description>This is my very first base image</description>
-  </base_image>"
+    <template>
+      <name>mock</name>
+      <os>
+        <name>RHEL-6</name>
+        <version>1</version>
+        <arch>x86_64</arch>
+        <install type=\"iso\">
+          <iso>http://mockhost/RHELMock1-x86_64-DVD.iso</iso>
+        </install>
+        <rootpw>password</rootpw>
+      </os>
+      <description>Mock Template</description>
+    </template>
+  </base_image>
+  " http://localhost:3000/tim/base_images
 
 Response
 
@@ -45,10 +189,88 @@ Response
 
   Body:
 
-  <base_image href='http://localhost:3000/tim/base_images/1' id='1'>
+  <base_image href='http://localhost:3000/tim/base_images/15' id='15'>
     <name>MyFirstBaseImage</name>
     <description>This is my very first base image</description>
+    <template href='http://localhost:3000/tim/templates/36' id='36'></template>
+    <image_versions>
+    </image_versions>
+  </base_image>
+
+
+==== Create Base Image with Template, a single Image Version with a Single Target Image
+
+Request
+
+  curl -X POST --header "Accept: application/xml" --header "Content-Type: application/xml" --data "
+  <base_image>
+    <name>MyFirstBaseImage</name>
+    <description>ThisIsABaseImage</description>
+    <template>
+      <name>mock</name>
+      <os>
+        <name>RHEL-6</name>
+        <version>1</version>
+        <arch>x86_64</arch>
+        <install type=\"iso\">
+          <iso>http://mockhost/RHELMock1-x86_64-DVD.iso</iso>
+        </install>
+        <rootpw>password</rootpw>
+      </os>
+      <description>Mock Template</description>
+    </template>
+    <image_versions type='array'>
+     <image_version>
+        <target_images type='array'>
+          <target_image>
+            <target>MockSphere</target>
+          </target_image>
+        </target_images>
+      </image_version>
+    </image_versions>
+  </base_image>
+  " http://localhost:3000/tim/base_images
+
+Response
+
+  Code: 201
+
+  Body:
+
+  <base_image href='http://localhost:3000/tim/base_images/16' id='16'>
+    <name>MyFirstBaseImage</name>
+    <description>ThisIsABaseImage</description>
+    <template href='http://localhost:3000/tim/templates/37' id='37'></template>
+    <image_versions>
+      <image_version href='http://localhost:3000/tim/image_versions/12' id='12'></image_version>
+    </image_versions>
+  </base_image>
+
+==== Import Image
+
+  curl -X POST --header "Accept: application/xml" --header "Content-Type: application/xml" --data "
+  <base_image>
+    <name>MyFirstBaseImage</name>
+    <description>This is my very first base image</description>
+    <template href='http://localhost:3000/tim/templates/3' id='3'></template>
+    <import>true</import>
+    <image_versions type='array'>
+      <image_version>
+        <target_images type='array'>
+          <target_image>
+            <target>ec2</target>
+            <provider_images type='array'>
+              <provider_image>
+                <provider>Amazon EC2</provider>
+                <external_image_id>ami-123456</external_image_id>
+              </provider_image>
+            </provider_images>
+          </target_image>
+        </target_images>
+      </image_version>
+    </image_versions>
   </base_image>
+  " http://localhost:3000/tim/base_images
 
 ==== Show Base Image
 
@@ -66,6 +288,7 @@ Response
     <name>MyFirstBaseImage</name>
     <description>This is my very first base image</description>
     <image_versions>
+      <image_version href='http://localhost:3000/tim/image_versions/1' id='1'></image_version>
     </image_versions>
   </base_image>
 
@@ -91,7 +314,7 @@ Response
 
 Request
 
-  curl -X DELETE--header "Accept: application/xml" http://localhost:3000/tim/base_images/1
+  curl -X DELETE --header "Accept: application/xml" http://localhost:3000/tim/base_images/1
 
 Response
 
@@ -108,7 +331,7 @@ Request
   curl -X POST --header "Accept: application/xml" --header \
   "Content-Type: application/xml" http://localhost:3000/tim/image_versions --data \
   "<image_version>
-    <base_image id='1'></base_image>
+    <base_image id='3'></base_image>
   </image_version>"
 
 Response

data/app/controllers/tim/application_controller.rb

@@ -1,10 +1,8 @@
 module Tim
   class ApplicationController < ::ApplicationController
-    protect_from_forgery
-
     respond_to :html, :xml
 
-    self.responder = CustomResponder
+    append_before_filter :set_default_respond_options
 
     # FIXME Remove filter once support for custom XML with nested resources is
     # supported by rails.
@@ -15,5 +13,10 @@ module Tim
     def render_not_found
       render :nothing => true, :status => :not_found
     end
+
+    private
+    def set_default_respond_options
+      @respond_options = { :responder => CustomResponder } unless defined? @respond_options
+    end
   end
 end

data/app/controllers/tim/base_images_controller.rb

@@ -2,26 +2,27 @@ require 'nokogiri'
 
 module Tim
   class BaseImagesController < Tim::ApplicationController
-    append_before_filter :set_template_xml, :only => [:create, :update]
+    prepend_before_filter ResourceLinkFilter.new({ :base_image => :template }),
+                :only => [:create]
 
     def index
       @base_images = Tim::BaseImage.all unless defined? @base_images
-      respond_with @base_images
+      respond_with(@base_images, @respond_options)
     end
 
     def show
       @base_image = Tim::BaseImage.find(params[:id]) unless defined? @base_image
-      respond_with @base_image
+      respond_with(@base_image, @respond_options)
     end
 
     def new
-      @base_image = Tim::BaseImage.new
-      respond_with @base_image
+      @base_image = Tim::BaseImage.new unless defined? @base_image
+      respond_with(@base_image, @respond_options)
     end
 
     def edit
       @base_image = Tim::BaseImage.find(params[:id]) unless defined? @base_image
-      respond_with @base_image
+      respond_with(@base_image, @respond_options)
     end
 
     def create
@@ -29,7 +30,7 @@ module Tim
       if @base_image.save
         flash[:notice] = "Successfully created Base Image"
       end
-      respond_with @base_image
+      respond_with(@base_image, @respond_options)
     end
 
     def update
@@ -37,22 +38,13 @@ module Tim
       if @base_image.update_attributes(params[:base_image])
         flash[:notice] = "Successfully updated Base Image"
       end
-      respond_with @base_image
+      respond_with(@base_image, @respond_options)
     end
 
     def destroy
       @base_image = Tim::BaseImage.find(params[:id]) unless defined? @base_image
       @base_image.destroy
-      respond_with(@base_image)
-    end
-
-    private
-    # Handles the cases when the template xml is supplied within request
-    def set_template_xml
-      doc = ::Nokogiri::XML request.body.read
-      if !doc.xpath("//base_image/template").empty?
-        params[:base_image][:template] = { :xml => doc.xpath("//base_image/template").children.to_s}
-      end
+      respond_with(@base_image, @respond_options)
     end
 
   end

data/app/controllers/tim/image_versions_controller.rb

@@ -1,25 +1,26 @@
 module Tim
   class ImageVersionsController < Tim::ApplicationController
+    prepend_before_filter ResourceLinkFilter.new({ :image_version => :base_image }),
+                :only => [:create]
 
     def index
       @image_versions = Tim::ImageVersion.all unless defined? @image_versions
-      respond_with @image_versions
+      respond_with(@image_versions, @respond_options)
     end
 
     def show
       @image_version = Tim::ImageVersion.find(params[:id]) unless defined? @image_version
-      respond_with @image_version
+      respond_with(@image_version, @respond_options)
     end
 
     def new
       @image_version = Tim::ImageVersion.new unless defined? @image_version
-      @image_version = Tim::ImageVersion.new
-      respond_with @image_version
+      respond_with(@image_version, @respond_options)
     end
 
     def edit
       @image_version = Tim::ImageVersion.find(params[:id]) unless defined? @image_version
-      respond_with @image_version
+      respond_with(@image_version, @respond_options)
     end
 
     def create
@@ -27,7 +28,7 @@ module Tim
       if @image_version.save
         flash[:notice] = 'Image version was successfully created.'
       end
-      respond_with @image_version
+      respond_with(@image_version, @respond_options)
     end
 
     def update
@@ -35,14 +36,14 @@ module Tim
       if @image_version.update_attributes(params[:image_version])
         flash[:notice] = 'Image version was successfully updated.'
       end
-      respond_with @image_version
+      respond_with(@image_version, @respond_options)
     end
 
     def destroy
       @image_version = Tim::ImageVersion.find(params[:id]) unless defined? @image_version
       @image_version.destroy
-      respond_with @image_version
+      respond_with(@image_version, @respond_options)
     end
 
   end
-end
+end

data/app/controllers/tim/provider_images_controller.rb

@@ -2,34 +2,36 @@ module Tim
   class ProviderImagesController < Tim::ApplicationController
     respond_to :json, :only => :update
 
+    prepend_before_filter ResourceLinkFilter.new({ :provider_image => :target_image }),
+                :only => [:create]
     before_filter :factory_keys, :only => :update
 
     def index
       @provider_images = Tim::ProviderImage.all unless defined? @provider_images
-      respond_with @provider_images
+      respond_with(@provider_images, @respond_options)
     end
 
     def show
       @provider_image = Tim::ProviderImage.find(params[:id]) unless defined? @provider_image
-      respond_with @provider_image
+      respond_with(@provider_image, @respond_options)
     end
 
     def new
       @provider_image = Tim::ProviderImage.new
-      respond_with @provider_image
+      respond_with(@provider_image, @respond_options)
     end
 
     def edit
       @provider_image = Tim::ProviderImage.find(params[:id]) unless defined? @provider_image
-      respond_with @provider_image
+      respond_with(@provider_image, @respond_options)
     end
 
     def create
       @provider_image = ProviderImage.new(params[:provider_image]) unless defined? @provider_image
       if @provider_image.save
-        flash[:notice] = 'Image version was successfully created.'
+        flash[:notice] = 'Provider image was successfully created.'
       end
-      respond_with @provider_image
+      respond_with(@provider_image, @respond_options)
     end
 
     def update
@@ -37,13 +39,13 @@ module Tim
       if @provider_image.update_attributes(params[:provider_image])
         flash[:notice] = 'Provider image was successfully updated.'
       end
-      respond_with @provider_image
+      respond_with(@provider_image, @respond_options)
     end
 
     def destroy
       @provider_image = Tim::ProviderImage.find(params[:id]) unless defined? @provider_image
       @provider_image.destroy
-      respond_with @provider_image
+      respond_with(@provider_image, @respond_options)
     end
 
     private
@@ -52,8 +54,9 @@ module Tim
       if params[:provider_image][:percent_complete] && params[:provider_image][:status_detail][:activity]
         params[:provider_image] = { :progress => params[:provider_image][:percent_complete],
                                     :status_detail => params[:provider_image][:status_detail][:activity],
-                                    :status => params[:provider_image][:status] }
+                                    :status => params[:provider_image][:status],
+                                    :external_image_id => params[:provider_image][:identifier_on_provider] }
       end
     end
   end
-end
+end