From e23f78caebec15965a16330e0a000622ab9fd4aa Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Wed, 25 Nov 2015 18:37:47 +0300 Subject: [PATCH] update field validators in stacks, stack_templates and cloud deploy envs --- .../models/deploy_env/cloud_deploy_env.rb | 3 +-- .../stack_template/stack_template_base.rb | 18 +++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb b/devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb index a19abcc..c8dbc39 100644 --- a/devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb +++ b/devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb @@ -11,13 +11,12 @@ module Devops module Model class CloudDeployEnv < DeployEnvBase -# attr_accessor :flavor, :image, :subnets, :groups, :stack_template + attr_accessor :flavor, :image, :subnets, :groups, :stack_template set_validators ::Validators::DeployEnv::Flavor, ::Validators::DeployEnv::Image, ::Validators::DeployEnv::Groups, ::Validators::DeployEnv::StackTemplate -# set_validators ::Validators::DeployEnv::CloudParameters set_field_validators :flavor, [::Validators::FieldValidator::Nil, ::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::Flavor], order: 2 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 2bdfb1e..58ebc2c 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 @@ -17,21 +17,21 @@ module Devops owner: {type: String, empty: false} set_field_validators :id, [::Validators::FieldValidator::NotNil, - ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty,] - ::Validators::FieldValidator::Name + ::Validators::FieldValidator::FieldType::String, + ::Validators::FieldValidator::NotEmpty, + ::Validators::FieldValidator::Name] set_field_validators :provider, [::Validators::FieldValidator::NotNil, - ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty] + ::Validators::FieldValidator::FieldType::String, + ::Validators::FieldValidator::NotEmpty] set_field_validators :template_body, [::Validators::FieldValidator::NotNil, - ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty] + ::Validators::FieldValidator::FieldType::String, + ::Validators::FieldValidator::NotEmpty] set_field_validators :owner, [::Validators::FieldValidator::NotNil, - ::Validators::FieldValidator::FieldType::String, - ::Validators::FieldValidator::NotEmpty] + ::Validators::FieldValidator::FieldType::String, + ::Validators::FieldValidator::NotEmpty] set_validators ::Validators::StackTemplate::TemplateContent