[PATCH 2/2] DTACLOUD-379 using Marios's 409 solution.

[jv...@redhat.com]

From: Joe VLcek <jv...@redhat.com>

---
 server/lib/deltacloud/collections/base.rb          |  4 ++
 server/lib/deltacloud/helpers/deltacloud_helper.rb |  1 +
 server/views/errors/409.html.haml                  | 47 ++++++++++++++++++++++
 server/views/errors/409.xml.haml                   | 11 +++++
 4 files changed, 63 insertions(+)
 create mode 100644 server/views/errors/409.html.haml
 create mode 100644 server/views/errors/409.xml.haml

diff --git a/server/lib/deltacloud/collections/base.rb b/server/lib/deltacloud/collections/base.rb
index 21a7e98..bc01eff 100644
--- a/server/lib/deltacloud/collections/base.rb
+++ b/server/lib/deltacloud/collections/base.rb
@@ -43,6 +43,10 @@ module Deltacloud::Collections
       report_error
     end
 
+    error Deltacloud::Exceptions::Conflict do
+      report_error
+    end
+
     error Deltacloud::Exceptions::ValidationFailure do
       report_error
     end
diff --git a/server/lib/deltacloud/helpers/deltacloud_helper.rb b/server/lib/deltacloud/helpers/deltacloud_helper.rb
index 34519c0..bc4cdfc 100644
--- a/server/lib/deltacloud/helpers/deltacloud_helper.rb
+++ b/server/lib/deltacloud/helpers/deltacloud_helper.rb
@@ -245,6 +245,7 @@ module Deltacloud::Helpers
       when 404; { :message => "Not Found" }
       when 405; { :message => "Method Not Allowed" }
       when 406; { :message => "Not Acceptable" }
+      when 409; { :message => "Resource Conflict" }
       when 500; { :message => "Internal Server Error" }
       when 502; { :message => "Backend Server Error" }
       when 504; { :message => "Gateway Timeout" }
diff --git a/server/views/errors/409.html.haml b/server/views/errors/409.html.haml
new file mode 100644
index 0000000..fb9daca
--- /dev/null
+++ b/server/views/errors/409.html.haml
@@ -0,0 +1,47 @@
+%div{ :'data-role' => :content, :'data-theme' => 'b'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+    %li{ :'data-role' => 'list-divider'} Server message
+    %li
+      %h3= h [@error.class.name, @error.message].join(' - ')
+    %li{ :'data-role' => 'list-divider'} Original request URI
+    %li
+      %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
+        %span=request.env['REQUEST_URI']
+        %span{ :class => 'ui-li-count'} Retry
+    %li{ :'data-role' => 'list-divider'} Error details
+    %li
+      - if @error.class.method_defined? :details
+        %p= h @error.details
+      - else
+        %em No details
+    %li{ :'data-role' => 'list-divider'} Backtrace
+    %li
+      %em No details
+
+  - if @error.backtrace
+    %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+      %h3 Backtrace
+      %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+        %li
+          %pre= h @error.backtrace.join("\n")
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Parameters
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - if params.keys.empty?
+        %li{ :'data-role' => 'list-divider'} No parameters
+      - params.each do |key, value|
+        - next if value.inspect.to_s == '#'
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect
+
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Request details
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - request.env.each do |key, value|
+        - next if value.inspect.to_s == '#'
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}= h value.inspect
diff --git a/server/views/errors/409.xml.haml b/server/views/errors/409.xml.haml
new file mode 100644
index 0000000..de05bf8
--- /dev/null
+++ b/server/views/errors/409.xml.haml
@@ -0,0 +1,11 @@
+- unless defined?(partial)
+  !!! XML
+%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
+  %kind backend_error
+  %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
+    %code=response.status
+  %message< #{cdata @error.message}
+  - if params
+    %request
+      - params.each do |k, v|
+        %param{ :name => k}=v
-- 
1.7.11.7