Handle delete requests on transient SR

src/server/runtime.rb

@@ -169,11 +169,15 @@ def delete
             service_id = document['DOCUMENT']['TEMPLATE']['BODY']['SERVICE_ID']
             response = cclient.service_delete(service_id)
             rc = response[0]
+            rb = response[1]
 
-            if rc == 404
-                cclient.logger.warning("Cannot find #{SR} Service")
-            elsif rc != 204
-                rb = response[1]
+            if rc != 204
+                if rc == 404
+                    cclient.logger.warning("Cannot find #{SR} Service")
+                elsif rc == 500 && rb == 'Service cannot be undeployed in state: DEPLOYING'
+                    rc = 423
+                    rb = "#{SR} has not finished deployment"
+                end
                 return [rc, rb]
             end
 

src/server/server.rb

@@ -31,6 +31,7 @@
 DENIED = 'Permission denied'.freeze
 NO_AUTH = 'Failed to authenticate in OpenNebula'.freeze
 SR_NOT_FOUND = "#{SR} not found".freeze
+NO_DELETE = "Failed to delete #{SR}".freeze
 
 # Helper method to return JSON responses
 def json_response(response_code, data)
@@ -232,8 +233,11 @@ def log_response(level, code, data, message)
         when 403
             log_response('error', rc, rb, DENIED)
             halt rc, json_response(rc, rb)
+        when 423
+            log_response('error', rc, rb, NO_DELETE)
+            halt rc, json_response(rc, rb)
         else
-            log_response('error', rc, rb, "Failed to delete #{SR}")
+            log_response('error', rc, rb, NO_DELETE)
             halt 500, json_response(500, rb)
         end
     when 401
@@ -246,7 +250,7 @@ def log_response(level, code, data, message)
         log_response('error', rc, rb, SR_NOT_FOUND)
         halt rc, json_response(rc, rb)
     else
-        log_response('error', rc, rb, "Failed to delete #{SR}")
+        log_response('error', rc, rb, NO_DELETE)
         halt 500, json_response(500, rb)
     end
 end