From 298455505375505239bf72075ad03c9dbf8c3f21 Mon Sep 17 00:00:00 2001
From: Anton Chuchkalov <anton.chuchkalov@novartis.com>
Date: Thu, 17 Mar 2016 16:52:04 +0200
Subject: [PATCH] CID-427: return all server fields

---
 devops-service/app/api2/handlers/server.rb | 4 ++--
 devops-service/app/api2/parsers/server.rb  | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/devops-service/app/api2/handlers/server.rb b/devops-service/app/api2/handlers/server.rb
index 2ac05e5..069c524 100644
--- a/devops-service/app/api2/handlers/server.rb
+++ b/devops-service/app/api2/handlers/server.rb
@@ -27,8 +27,8 @@ module Devops
         #scheduler = Rufus::Scheduler.new
 
         def servers
-          fields, reserved = parser.servers
-          Devops::Db.connector.servers(nil, nil, nil, reserved, fields).map {|s| s.to_hash}
+          reserved = parser.servers
+          Devops::Db.connector.servers(nil, nil, nil, reserved).map {|s| s.to_hash}
         end
 
         def chef_servers
diff --git a/devops-service/app/api2/parsers/server.rb b/devops-service/app/api2/parsers/server.rb
index c6e9c1a..6675554 100644
--- a/devops-service/app/api2/parsers/server.rb
+++ b/devops-service/app/api2/parsers/server.rb
@@ -6,13 +6,7 @@ module Devops
       class ServerParser < RequestParser
 
         def servers
-          fields = []
-          if @params.key?("fields") and @params["fields"].is_a?(Array)
-            Devops::Model::Server.fields.each do |k|
-              fields.push k if @params["fields"].include?(k)
-            end
-          end
-          return fields, (@params.key?("reserved") ? true : nil)
+          (@params.key?("reserved") ? true : nil)
         end
 
         def server