[deltacloud-devel] [PATCH aggregator 3/4] 'upload_template' method renamed to 'upload'

[Jan Provazník]

From: Jan Provaznik

---
 src/app/controllers/builds_controller.rb |    2 +-
 src/app/models/template.rb               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/controllers/builds_controller.rb b/src/app/controllers/builds_controller.rb
index 6122eee..7cf0ad6 100644
--- a/src/app/controllers/builds_controller.rb
+++ b/src/app/controllers/builds_controller.rb
@@ -38,7 +38,7 @@ class BuildsController < ApplicationController
       return
     end

-    @tpl.upload_template unless @tpl.uploaded
+    @tpl.upload unless @tpl.uploaded
     errors = {}
     warnings = []
     params[:targets].each do |target|
diff --git a/src/app/models/template.rb b/src/app/models/template.rb
index 0a83773..e8fd94f 100644
--- a/src/app/models/template.rb
+++ b/src/app/models/template.rb
@@ -32,7 +32,7 @@ class Template < ActiveRecord::Base
     @xml ||= ImageDescriptorXML.new(self[:xml].to_s)
   end

-  def upload_template
+  def upload
     self.uri = File.join(WAREHOUSE_CONFIG['baseurl'], "#{uuid}")
     response = Typhoeus::Request.put(self.uri, :body => xml.to_xml, :timeout => 30000)
     if response.code == 200