From: Martyn Taylor <mtaylor(a)redhat.com>
---
.../controllers/api/provider_images_controller.rb | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/app/controllers/api/provider_images_controller.rb
b/src/app/controllers/api/provider_images_controller.rb
index ce3a1fb..1c0e358 100644
--- a/src/app/controllers/api/provider_images_controller.rb
+++ b/src/app/controllers/api/provider_images_controller.rb
@@ -85,16 +85,17 @@ module Api
private
def process_post(body)
doc = Nokogiri::XML CGI.unescapeHTML(body)
- if !doc.xpath("/image/provider_name").empty? &&
!doc.xpath("/image/provider_account").empty? &&
- !doc.xpath("/image/image_id").empty? &&
!doc.xpath("/image/build_id").empty? &&
- !doc.xpath("/image/target_image_id").empty?
- if provider_account =
ProviderAccount.find_by_label(doc.xpath("/image/provider_account").text)
+ puts Nokogiri::XML CGI.unescapeHTML(body)
+ if !doc.xpath("/provider_image/provider_name").empty? &&
!doc.xpath("/provider_image/provider_account").empty? &&
+ !doc.xpath("/provider_image/image_id").empty? &&
!doc.xpath("/provider_image/build_id").empty? &&
+ !doc.xpath("/provider_image/target_image_id").empty?
+ if provider_account =
ProviderAccount.find_by_label(doc.xpath("/provider_image/provider_account").text)
#TODO check user permission on this provider account
- { :type => :push, :params => { :provider =>
doc.xpath("/image/provider_name").text,
+ { :type => :push, :params => { :provider =>
doc.xpath("/provider_image/provider_name").text,
:credentials =>
provider_account.to_xml(:with_credentials => true),
- :image_id =>
doc.xpath("/image/image_id").text,
- :build_id =>
doc.xpath("/image/build_id").text,
- :target_image_id =>
doc.xpath("/image/target_image_id").text } }
+ :image_id =>
doc.xpath("/provider_image/image_id").text,
+ :build_id =>
doc.xpath("/provider_image/build_id").text,
+ :target_image_id =>
doc.xpath("/provider_image/target_image_id").text } }
end
else
{ :type => :failed }
--
1.7.6.4