From 24dd007f2c44eb6e0ac135d24b11a3395af30e0c Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Fri, 23 May 2014 17:58:49 +0400
Subject: [PATCH] roll_back moved to commands/server.rb

---
 devops-service/commands/server.rb    | 15 +++++++++++++++
 devops-service/routes/v2.0/server.rb | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/devops-service/commands/server.rb b/devops-service/commands/server.rb
index 925fc7a..ae39936 100644
--- a/devops-service/commands/server.rb
+++ b/devops-service/commands/server.rb
@@ -187,4 +187,19 @@ module ServerCommands
     return info, r
   end
 
+  def roll_back s, provider
+    str = ""
+    unless s.id.nil?
+      str << "Server '#{s.chef_node_name}' with id '#{s.id}' is not created\n"
+      str << delete_from_chef_server(s.chef_node_name).values.join("\n")
+      begin
+        str << provider.delete_server(s.id) unless s.static
+      rescue => e
+        str << e.message
+      end
+      str << "\nRolled back\n"
+    end
+    return str
+  end
+
 end
diff --git a/devops-service/routes/v2.0/server.rb b/devops-service/routes/v2.0/server.rb
index 4e2531e..66c2078 100644
--- a/devops-service/routes/v2.0/server.rb
+++ b/devops-service/routes/v2.0/server.rb
@@ -480,21 +480,6 @@ module Version2_0
       key == "instance" ? BaseRoutes.mongo.server_by_instance_id(id) : BaseRoutes.mongo.server_by_chef_node_name(id)
     end
 
-    def roll_back s, provider
-      str = ""
-      unless s.id.nil?
-        str << "Server '#{s.chef_node_name}' with id '#{s.id}' is not created\n"
-        str << delete_from_chef_server(s.chef_node_name).values.join("\n")
-        begin
-          str << provider.delete_server(s.id) unless s.static
-        rescue => e
-          str << e.message
-        end
-        str << "\nRolled back\n"
-      end
-      return str
-    end
-
     def check_chef_node_name name, provider
       BaseRoutes.mongo.server_by_chef_node_name name
       halt(400, "Server with name '#{name}' already exist")