From 36edfc957a6939398e85ac7e78e515a4cfeb1caa Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Thu, 2 Jul 2015 17:36:41 +0200
Subject: [PATCH] feature #3748: Fix status codes for oneflow

---
 src/flow/oneflow-server.rb     | 9 ++++++---
 src/sunstone/routes/oneflow.rb | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/flow/oneflow-server.rb b/src/flow/oneflow-server.rb
index 5c983932f7..659d24ee4c 100644
--- a/src/flow/oneflow-server.rb
+++ b/src/flow/oneflow-server.rb
@@ -282,7 +282,7 @@ put '/service/:id/role/:name' do
         error CloudServer::HTTP_ERROR_CODE[rc.errno], rc.message
     end
 
-    status 200
+    status 204
 end
 
 post '/service/:id/role/:role_name/action' do
@@ -464,6 +464,7 @@ post '/service_template/:id/action' do
 
         service.info
 
+        status 201
         body service.to_json
     when 'chown'
         if opts && opts['owner_id']
@@ -472,6 +473,7 @@ post '/service_template/:id/action' do
             args << (opts['group_id'].to_i || -1)
 
             service_template.chown(*args)
+            status 204
         else
             OpenNebula::Error.new("Action #{action['perform']}: " <<
                     "You have to specify a UID")
@@ -479,6 +481,7 @@ post '/service_template/:id/action' do
     when 'chgrp'
         if opts && opts['group_id']
             service_template.chown(-1, opts['group_id'].to_i)
+            status 204
         else
             OpenNebula::Error.new("Action #{action['perform']}: " <<
                     "You have to specify a GID")
@@ -486,6 +489,7 @@ post '/service_template/:id/action' do
     when 'chmod'
         if opts && opts['octet']
             service_template.chmod_octet(opts['octet'])
+            status 204
         else
             OpenNebula::Error.new("Action #{action['perform']}: " <<
                     "You have to specify an OCTET")
@@ -494,6 +498,7 @@ post '/service_template/:id/action' do
         if opts && opts['template_json']
             begin
                 rc = service_template.update(opts['template_json'])
+                status 204
             rescue Validator::ParseException, JSON::ParserError
                 OpenNebula::Error.new($!.message)
             end
@@ -507,7 +512,5 @@ post '/service_template/:id/action' do
 
     if OpenNebula.is_error?(rc)
         error CloudServer::HTTP_ERROR_CODE[rc.errno], rc.message
-    else
-        status 201
     end
 end
diff --git a/src/sunstone/routes/oneflow.rb b/src/sunstone/routes/oneflow.rb
index f5cc708eb2..4fd4395a35 100644
--- a/src/sunstone/routes/oneflow.rb
+++ b/src/sunstone/routes/oneflow.rb
@@ -39,6 +39,7 @@ helpers do
             error resp.code.to_i, error.to_json
         else
             body resp.body.to_s
+            status resp.code.to_i
         end
     end
 end