From d1a555d97e099b6132e1a42ae8f6497932a28ba2 Mon Sep 17 00:00:00 2001 From: Anton Martynov Date: Wed, 18 Feb 2015 11:00:24 +0300 Subject: [PATCH] merged with dev --- devops-service/db/mongo/connectors/image.rb | 2 +- devops-service/db/mongo/connectors/key.rb | 2 +- devops-service/db/mongo/connectors/project.rb | 2 +- devops-service/db/mongo/connectors/server.rb | 2 +- devops-service/db/mongo/connectors/stack.rb | 2 +- devops-service/db/mongo/connectors/stack_template.rb | 2 +- devops-service/db/mongo/connectors/user.rb | 2 +- devops-service/db/mongo/models/deploy_env/deploy_env_multi.rb | 4 ++-- devops-service/db/mongo/models/image.rb | 2 +- devops-service/db/mongo/models/key.rb | 2 +- devops-service/db/mongo/models/project.rb | 2 +- devops-service/db/mongo/models/server.rb | 2 +- devops-service/db/mongo/models/stack/stack_base.rb | 2 +- devops-service/db/mongo/models/stack/stack_factory.rb | 4 ++-- .../db/mongo/models/stack_template/stack_template_base.rb | 2 +- .../db/mongo/models/stack_template/stack_template_factory.rb | 4 ++-- devops-service/db/mongo/models/user.rb | 2 +- devops-service/db/validators/deploy_env/image.rb | 4 ++-- devops-service/db/validators/deploy_env/users.rb | 4 ++-- devops-service/db/validators/image/image_in_filter.rb | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/devops-service/db/mongo/connectors/image.rb b/devops-service/db/mongo/connectors/image.rb index e023be8..135b4e5 100644 --- a/devops-service/db/mongo/connectors/image.rb +++ b/devops-service/db/mongo/connectors/image.rb @@ -18,7 +18,7 @@ module Connectors private def model_from_bson(bson) - ::Image.create_from_bson(bson) + ::Image.build_from_bson(bson) end end diff --git a/devops-service/db/mongo/connectors/key.rb b/devops-service/db/mongo/connectors/key.rb index ea725a6..672c7e0 100644 --- a/devops-service/db/mongo/connectors/key.rb +++ b/devops-service/db/mongo/connectors/key.rb @@ -21,7 +21,7 @@ module Connectors private def model_from_bson(bson) - ::Key.create_from_bson(bson) + ::Key.build_from_bson(bson) end end diff --git a/devops-service/db/mongo/connectors/project.rb b/devops-service/db/mongo/connectors/project.rb index f7c07e8..c6cfcd6 100644 --- a/devops-service/db/mongo/connectors/project.rb +++ b/devops-service/db/mongo/connectors/project.rb @@ -83,7 +83,7 @@ module Connectors private def model_from_bson(bson) - ::Project.create_from_bson(bson) + ::Project.build_from_bson(bson) end end diff --git a/devops-service/db/mongo/connectors/server.rb b/devops-service/db/mongo/connectors/server.rb index 7a59b1b..f754aeb 100644 --- a/devops-service/db/mongo/connectors/server.rb +++ b/devops-service/db/mongo/connectors/server.rb @@ -66,7 +66,7 @@ module Connectors private def model_from_bson(bson) - ::Server.create_from_bson(bson) + ::Server.build_from_bson(bson) end # couldn't be replaced with ShowCommand (_id doesn't neccesary appear in params) diff --git a/devops-service/db/mongo/connectors/stack.rb b/devops-service/db/mongo/connectors/stack.rb index 7d63db5..eb0c2ee 100644 --- a/devops-service/db/mongo/connectors/stack.rb +++ b/devops-service/db/mongo/connectors/stack.rb @@ -18,7 +18,7 @@ module Connectors def model_from_bson(bson) provider = bson['provider'] - ::StackFactory.get_class(provider).create_from_bson(bson) + ::StackFactory.get_class(provider).build_from_bson(bson) end end end diff --git a/devops-service/db/mongo/connectors/stack_template.rb b/devops-service/db/mongo/connectors/stack_template.rb index a51764f..0160e6c 100644 --- a/devops-service/db/mongo/connectors/stack_template.rb +++ b/devops-service/db/mongo/connectors/stack_template.rb @@ -18,7 +18,7 @@ module Connectors def model_from_bson(bson) provider = bson['provider'] - ::StackTemplateFactory.get_class(provider).create_from_bson(bson) + ::StackTemplateFactory.get_class(provider).build_from_bson(bson) end end diff --git a/devops-service/db/mongo/connectors/user.rb b/devops-service/db/mongo/connectors/user.rb index 9155d5e..abbbc7a 100644 --- a/devops-service/db/mongo/connectors/user.rb +++ b/devops-service/db/mongo/connectors/user.rb @@ -50,7 +50,7 @@ module Connectors private def model_from_bson(bson) - ::User.create_from_bson(bson) + ::User.build_from_bson(bson) end end 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 4e17396..f55c85a 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 @@ -85,7 +85,7 @@ class DeployEnvMulti < MongoModel raise InvalidRecord.new("Subproject '#{spi}'. #{e.message}") end end - pdb = DevopsService.mongo.project_names_with_envs(server["subprojects"].map{|sp| sp["name"]}) + pdb = ::Devops::Db.connector.project_names_with_envs(server["subprojects"].map{|sp| sp["name"]}) server["subprojects"].each_with_index do |sp, spi| raise InvalidRecord.new("Subproject '#{spi}'. Project '#{sp["name"]}' with env '#{sp["env"]}' does not exist") if pdb[sp["name"]].nil? or !pdb[sp["name"]].include?(sp["env"]) end @@ -107,7 +107,7 @@ class DeployEnvMulti < MongoModel } end - def self.create_from_bson d + def self.build_from_bson d DeployEnvMulti.new(d) end diff --git a/devops-service/db/mongo/models/image.rb b/devops-service/db/mongo/models/image.rb index 212b22d..165a3b1 100644 --- a/devops-service/db/mongo/models/image.rb +++ b/devops-service/db/mongo/models/image.rb @@ -20,7 +20,7 @@ class Image < MongoModel self.bootstrap_template = p["bootstrap_template"] end - def self.create_from_bson args + def self.build_from_bson args image = Image.new(args) image.id = args["_id"] image diff --git a/devops-service/db/mongo/models/key.rb b/devops-service/db/mongo/models/key.rb index 296d6fc..29dd222 100644 --- a/devops-service/db/mongo/models/key.rb +++ b/devops-service/db/mongo/models/key.rb @@ -21,7 +21,7 @@ class Key < MongoModel self.scope = p["scope"] || USER end - def self.create_from_bson s + def self.build_from_bson s key = Key.new s key.id = s["_id"] key diff --git a/devops-service/db/mongo/models/project.rb b/devops-service/db/mongo/models/project.rb index 46d2a74..8890eb3 100644 --- a/devops-service/db/mongo/models/project.rb +++ b/devops-service/db/mongo/models/project.rb @@ -126,7 +126,7 @@ class Project < MongoModel self.type == MULTI_TYPE end - def self.create_from_bson p + def self.build_from_bson p p["name"] = p["_id"] Project.new p end diff --git a/devops-service/db/mongo/models/server.rb b/devops-service/db/mongo/models/server.rb index 242defb..db892cf 100644 --- a/devops-service/db/mongo/models/server.rb +++ b/devops-service/db/mongo/models/server.rb @@ -67,7 +67,7 @@ class Server < MongoModel } end - def self.create_from_bson s + def self.build_from_bson s Server.new(s) end diff --git a/devops-service/db/mongo/models/stack/stack_base.rb b/devops-service/db/mongo/models/stack/stack_base.rb index 470b0ca..5f54c10 100644 --- a/devops-service/db/mongo/models/stack/stack_base.rb +++ b/devops-service/db/mongo/models/stack/stack_base.rb @@ -40,7 +40,7 @@ class StackBase < MongoModel model end - def self.create_from_bson(attrs) + def self.build_from_bson(attrs) attrs['id'] = attrs["_id"] self.new(attrs) end diff --git a/devops-service/db/mongo/models/stack/stack_factory.rb b/devops-service/db/mongo/models/stack/stack_factory.rb index 3576d33..aec5c3c 100644 --- a/devops-service/db/mongo/models/stack/stack_factory.rb +++ b/devops-service/db/mongo/models/stack/stack_factory.rb @@ -8,8 +8,8 @@ class StackFactory get_class(provider).create(attrs) end - def self.create_from_bson(provider, attrs) - get_class(provider).create_from_bson(attrs) + def self.build_from_bson(provider, attrs) + get_class(provider).build_from_bson(attrs) end def self.get_class(provider) diff --git a/devops-service/db/mongo/models/stack_template/stack_template_base.rb b/devops-service/db/mongo/models/stack_template/stack_template_base.rb index 6453a93..cb07b59 100644 --- a/devops-service/db/mongo/models/stack_template/stack_template_base.rb +++ b/devops-service/db/mongo/models/stack_template/stack_template_base.rb @@ -47,7 +47,7 @@ class StackTemplateBase < MongoModel new(attrs) end - def self.create_from_bson(attrs) + def self.build_from_bson(attrs) attrs['id'] = attrs["_id"] self.new(attrs) end diff --git a/devops-service/db/mongo/models/stack_template/stack_template_factory.rb b/devops-service/db/mongo/models/stack_template/stack_template_factory.rb index 95b4a27..51bc702 100644 --- a/devops-service/db/mongo/models/stack_template/stack_template_factory.rb +++ b/devops-service/db/mongo/models/stack_template/stack_template_factory.rb @@ -8,8 +8,8 @@ class StackTemplateFactory get_class(provider).create(attrs) end - def self.create_from_bson(provider, attrs) - get_class(provider).create_from_bson(attrs) + def self.build_from_bson(provider, attrs) + get_class(provider).build_from_bson(attrs) end def self.get_class(provider) diff --git a/devops-service/db/mongo/models/user.rb b/devops-service/db/mongo/models/user.rb index abb5fa4..ffe204a 100644 --- a/devops-service/db/mongo/models/user.rb +++ b/devops-service/db/mongo/models/user.rb @@ -49,7 +49,7 @@ class User < MongoModel end end - def self.create_from_bson s + def self.build_from_bson s user = User.new s user.id = s["_id"] user diff --git a/devops-service/db/validators/deploy_env/image.rb b/devops-service/db/validators/deploy_env/image.rb index 45a2860..f8f0108 100644 --- a/devops-service/db/validators/deploy_env/image.rb +++ b/devops-service/db/validators/deploy_env/image.rb @@ -5,7 +5,7 @@ module Validators include ::ImageCommands def valid? - images = get_images(DevopsService.mongo, @model.provider) + images = get_images(::Devops::Db.connector, @model.provider) images.detect do |image| image["id"] == @model.image end @@ -15,4 +15,4 @@ module Validators "Invalid image '#{@model.image}'." end end -end \ No newline at end of file +end diff --git a/devops-service/db/validators/deploy_env/users.rb b/devops-service/db/validators/deploy_env/users.rb index 9629477..c8dca40 100644 --- a/devops-service/db/validators/deploy_env/users.rb +++ b/devops-service/db/validators/deploy_env/users.rb @@ -2,7 +2,7 @@ module Validators class DeployEnv::Users < Base def valid? - mongo_users = DevopsService.mongo.users_names(@model.users) + mongo_users = ::Devops::Db.connector.users_names(@model.users) @nonexistent_users = @model.users - mongo_users @nonexistent_users.empty? end @@ -11,4 +11,4 @@ module Validators "These users are missing in mongo: '#{@nonexistent_users.join("', '")}'." end end -end \ No newline at end of file +end diff --git a/devops-service/db/validators/image/image_in_filter.rb b/devops-service/db/validators/image/image_in_filter.rb index 19936bb..6bb5c1c 100644 --- a/devops-service/db/validators/image/image_in_filter.rb +++ b/devops-service/db/validators/image/image_in_filter.rb @@ -5,7 +5,7 @@ module Validators include ImageCommands def valid? - images = get_images(DevopsService.mongo, @model.provider) + images = get_images(::Devops::Db.connector, @model.provider) images.map{|i| i["id"]}.include?(@model.id) end