From c3f89ff4d49062cd241df9e03d0d2a77df1cf31c Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Mon, 27 Jul 2015 15:56:30 +0300
Subject: [PATCH] some fixes

---
 devops-service/commands/deploy_env.rb                     | 1 -
 .../db/mongo/models/deploy_env/deploy_env_base.rb         | 1 -
 .../db/mongo/models/deploy_env/deploy_env_ec2.rb          | 7 +++++++
 .../db/mongo/models/deploy_env/deploy_env_multi.rb        | 1 -
 .../db/mongo/models/deploy_env/deploy_env_openstack.rb    | 8 ++++++++
 .../db/mongo/models/deploy_env/deploy_env_static.rb       | 3 +++
 devops-service/db/mongo/models/project.rb                 | 3 +--
 devops-service/db/validators/deploy_env/run_list.rb       | 6 ++++--
 8 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/devops-service/commands/deploy_env.rb b/devops-service/commands/deploy_env.rb
index 3f1d9ad..411db1c 100644
--- a/devops-service/commands/deploy_env.rb
+++ b/devops-service/commands/deploy_env.rb
@@ -1,4 +1,3 @@
-require "db/exceptions/invalid_record"
 require "commands/image"
 
 module DeployEnvCommands
diff --git a/devops-service/db/mongo/models/deploy_env/deploy_env_base.rb b/devops-service/db/mongo/models/deploy_env/deploy_env_base.rb
index fa6355d..7a88483 100644
--- a/devops-service/db/mongo/models/deploy_env/deploy_env_base.rb
+++ b/devops-service/db/mongo/models/deploy_env/deploy_env_base.rb
@@ -1,5 +1,4 @@
 require "db/mongo/models/mongo_model"
-require "db/exceptions/invalid_record"
 require "providers/provider_factory"
 require "commands/deploy_env"
 
diff --git a/devops-service/db/mongo/models/deploy_env/deploy_env_ec2.rb b/devops-service/db/mongo/models/deploy_env/deploy_env_ec2.rb
index b0f9092..50b12cb 100644
--- a/devops-service/db/mongo/models/deploy_env/deploy_env_ec2.rb
+++ b/devops-service/db/mongo/models/deploy_env/deploy_env_ec2.rb
@@ -1,4 +1,11 @@
 require "db/mongo/models/deploy_env/deploy_env_base"
+require "db/validators/deploy_env/run_list"
+require "db/validators/deploy_env/expiration"
+require "db/validators/deploy_env/users"
+require "db/validators/deploy_env/flavor"
+require "db/validators/deploy_env/image"
+require "db/validators/deploy_env/subnet_belongs_to_provider"
+require "db/validators/deploy_env/groups"
 
 module Devops
   module Model
diff --git a/devops-service/db/mongo/models/deploy_env/deploy_env_multi.rb b/devops-service/db/mongo/models/deploy_env/deploy_env_multi.rb
index 9fc5522..a0cca3e 100644
--- a/devops-service/db/mongo/models/deploy_env/deploy_env_multi.rb
+++ b/devops-service/db/mongo/models/deploy_env/deploy_env_multi.rb
@@ -1,5 +1,4 @@
 require "db/mongo/models/mongo_model"
-require "db/exceptions/invalid_record"
 require "commands/deploy_env"
 
 module Devops
diff --git a/devops-service/db/mongo/models/deploy_env/deploy_env_openstack.rb b/devops-service/db/mongo/models/deploy_env/deploy_env_openstack.rb
index 99c5bb2..263f7c8 100644
--- a/devops-service/db/mongo/models/deploy_env/deploy_env_openstack.rb
+++ b/devops-service/db/mongo/models/deploy_env/deploy_env_openstack.rb
@@ -1,5 +1,13 @@
 require "db/mongo/models/deploy_env/deploy_env_base"
 require "providers/provider_factory"
+require "db/validators/deploy_env/run_list"
+require "db/validators/deploy_env/expiration"
+require "db/validators/deploy_env/users"
+require "db/validators/deploy_env/flavor"
+require "db/validators/deploy_env/image"
+require "db/validators/deploy_env/subnet_not_empty"
+require "db/validators/deploy_env/subnet_belongs_to_provider"
+require "db/validators/deploy_env/groups"
 
 module Devops
   module Model
diff --git a/devops-service/db/mongo/models/deploy_env/deploy_env_static.rb b/devops-service/db/mongo/models/deploy_env/deploy_env_static.rb
index bab2ad3..5df72e2 100644
--- a/devops-service/db/mongo/models/deploy_env/deploy_env_static.rb
+++ b/devops-service/db/mongo/models/deploy_env/deploy_env_static.rb
@@ -1,4 +1,7 @@
 require "db/mongo/models/deploy_env/deploy_env_base"
+require "db/validators/deploy_env/run_list"
+require "db/validators/deploy_env/expiration"
+require "db/validators/deploy_env/users"
 
 module Devops
   module Model
diff --git a/devops-service/db/mongo/models/project.rb b/devops-service/db/mongo/models/project.rb
index 98a010a..fe68524 100644
--- a/devops-service/db/mongo/models/project.rb
+++ b/devops-service/db/mongo/models/project.rb
@@ -1,10 +1,9 @@
-require "db/exceptions/invalid_record"
-require "db/exceptions/record_not_found"
 require "db/mongo/models/deploy_env/deploy_env_factory"
 require "db/mongo/models/user"
 require "db/mongo/models/deploy_env/deploy_env_multi"
 require "db/mongo/models/mongo_model"
 require "json"
+require "hooks"
 require "lib/project/handler/types_factory"
 
 module Devops
diff --git a/devops-service/db/validators/deploy_env/run_list.rb b/devops-service/db/validators/deploy_env/run_list.rb
index c37eec1..d124a27 100644
--- a/devops-service/db/validators/deploy_env/run_list.rb
+++ b/devops-service/db/validators/deploy_env/run_list.rb
@@ -2,8 +2,10 @@
 # not only in deploy env model
 
 module Validators
-  class DeployEnv::RunList < Base
+  module DeployEnv
+    class RunList < Base
 
-    delegate_to_helper_validator { Helpers::RunList.new(@model.run_list) }
+      delegate_to_helper_validator { Helpers::RunList.new(@model.run_list) }
+    end
   end
 end