On 10/19/2011 11:22 PM, mtaylor(a)redhat.com wrote:
From: Martyn Taylor<mtaylor(a)redhat.com>
---
src/app/controllers/api/builds_controller.rb | 15 +++++++++++++++
src/app/controllers/api/images_controller.rb | 15 +++++++++++++++
.../controllers/api/provider_images_controller.rb | 18 +++++++++++++++++-
.../controllers/api/target_images_controller.rb | 15 +++++++++++++++
4 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/src/app/controllers/api/builds_controller.rb
b/src/app/controllers/api/builds_controller.rb
index e916450..9e28df8 100644
--- a/src/app/controllers/api/builds_controller.rb
+++ b/src/app/controllers/api/builds_controller.rb
@@ -40,5 +40,20 @@ module Api
render :nothing => true, :status => 404
end
end
+
+ def destroy
+ begin
+ if build = Aeolus::Image::Warehouse::ImageBuild.find(params[:id])
+ if build.delete!
+ render :text => "Build Deleted", :status => 200
+ end
+ else
+ render :text => "Unable to find Build", :status => 404
+ end
+ rescue => e
+ raise e
+ render :text => "Unable to Delete Build", :status => 500
+ end
+ end
end
end
diff --git a/src/app/controllers/api/images_controller.rb
b/src/app/controllers/api/images_controller.rb
index 83fc59c..58467b6 100644
--- a/src/app/controllers/api/images_controller.rb
+++ b/src/app/controllers/api/images_controller.rb
@@ -64,6 +64,21 @@ module Api
end
end
+ def destroy
+ begin
+ if image = Aeolus::Image::Warehouse::Image.find(params[:id])
+ if image.delete!
+ render :text => "Image Deleted", :status => 200
+ end
+ else
+ render :text => "Unable to find Image", :status => 404
+ end
+ rescue => e
+ raise e
+ render :text => "Unable to Delete Image", :status => 500
+ end
+ end
+
private
def process_post(body)
doc = Nokogiri::XML CGI.unescapeHTML(body)
diff --git a/src/app/controllers/api/provider_images_controller.rb
b/src/app/controllers/api/provider_images_controller.rb
index fef7cfa..ce3a1fb 100644
--- a/src/app/controllers/api/provider_images_controller.rb
+++ b/src/app/controllers/api/provider_images_controller.rb
@@ -61,11 +61,27 @@ module Api
end
rescue ActiveResource::BadRequest
render :text => "Parameter Data Incorrect", :status => 400
- rescue
+ rescue => e
+ raise e
render :text => "Internal Server Error", :status => 500
end
end
+ def destroy
+ begin
+ if image = Aeolus::Image::Warehouse::ProviderImage.find(params[:id])
+ if image.delete!
+ render :text => "Provider Image Deleted", :status => 200
+ end
+ else
+ render :text => "Unable to find Provider Image", :status =>
404
+ end
+ rescue => e
+ raise e
+ render :text => "Unable to Delete Provider Image", :status =>
500
+ end
+ end
+
private
def process_post(body)
doc = Nokogiri::XML CGI.unescapeHTML(body)
diff --git a/src/app/controllers/api/target_images_controller.rb
b/src/app/controllers/api/target_images_controller.rb
index 510dedd..b6677e5 100644
--- a/src/app/controllers/api/target_images_controller.rb
+++ b/src/app/controllers/api/target_images_controller.rb
@@ -48,5 +48,20 @@ module Api
end
end
end
+
+ def destroy
+ begin
+ if image = Aeolus::Image::Warehouse::TargetImage.find(params[:id])
+ if image.delete!
+ render :text => "Target Image Deleted", :status => 200
+ end
+ else
+ render :text => "Unable to find Target Image", :status =>
404
+ end
+ rescue => e
+ raise e
+ render :text => "Unable to Delete Target Image", :status =>
500
+ end
+ end
end
end
ACK to the series
--
No trees were killed to send this message, but a large number of
electrons were terribly inconvenienced.