tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errors occured after cherry-picking squashed specs

Browse Source 
This reverts commit ee3b49bbea80db0a66eb3c8f116dcf100ff4a402.
This commit is contained in:
Anton Chuchkalov 2015-11-20 15:15:06 +03:00
parent 65b2e02fe9
commit 39a8ff0eae
7 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb
View File

@ -32,8 +32,7 @@ module Devops
# ::Validators::FieldValidator::Groups.new # ::Validators::FieldValidator::Groups.new
set_field_validators :stack_template, ::Validators::FieldValidator::Nil, set_field_validators :stack_template, ::Validators::FieldValidator::Nil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty, ::Validators::FieldValidator::NotEmpty
# ::Validators::FieldValidator::StackTemplate.new
def initialize d={} def initialize d={}
super(d) super(d)

5
devops-service/db/mongo/models/deploy_env/deploy_env_ec2.rb
View File

@ -44,7 +44,10 @@ module Devops
networks = provider_instance.networks networks = provider_instance.networks
unless self.subnets.empty? unless self.subnets.empty?
{"vpc-id" => networks.detect{|n| n["name"] == self.subnets[0]}["vpcId"] } network = networks.detect {|n| n["name"] == self.subnets[0]}
if network
{"vpc-id" => network["vpcId"] }
end
end end
end end

19
devops-service/db/mongo/models/server.rb
View File

@ -10,12 +10,18 @@ module Devops
include ModelWithProvider include ModelWithProvider
module OperationType module OperationType
CREATION = :creation # we store strings in mongo, so it's better not to use symbols
DEPLOY = :deploy CREATION = 'creation'
RESERVE = :reserve DEPLOY = 'deploy'
UNRESERVE = :unreserve RESERVE = 'reserve'
PAUSE = :pause UNRESERVE = 'unreserve'
UNPAUSE = :unpause PAUSE = 'pause'
UNPAUSE = 'unpause'
def self.supported_type?(value)
return false unless value.is_a?(String)
[CREATION, DEPLOY, RESERVE, UNRESERVE, PAUSE, UNPAUSE].include?(value)
end
end end
attr_accessor :chef_node_name, :id, :remote_user, :project, :deploy_env, :private_ip, :public_ip, :created_at, :without_bootstrap, :created_by, :reserved_by, :stack, :run_list attr_accessor :chef_node_name, :id, :remote_user, :project, :deploy_env, :private_ip, :public_ip, :created_at, :without_bootstrap, :created_by, :reserved_by, :stack, :run_list
@ -108,6 +114,7 @@ module Devops
end end
def set_last_operation(operation_type) def set_last_operation(operation_type)
raise ArgumentError unless OperationType.supported_type?(operation_type)
self.last_operation_type = operation_type self.last_operation_type = operation_type
self.last_operation_at = Time.now self.last_operation_at = Time.now
end end

32
devops-service/db/mongo/models/stack/stack_base.rb
View File

@ -19,37 +19,37 @@ module Devops
run_list: {type: Array, value_type: String, empty: true, nil: true} run_list: {type: Array, value_type: String, empty: true, nil: true}
# details: {type: Hash, nil: true} # Hash type isn't supported yet # details: {type: Hash, nil: true} # Hash type isn't supported yet
set_field_validators :id, [::Validators::FieldValidator::NotNil, set_field_validators :id, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_field_validators :provider, [::Validators::FieldValidator::NotNil, set_field_validators :provider, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_field_validators :project, [::Validators::FieldValidator::NotNil, set_field_validators :project, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_field_validators :deploy_env, [::Validators::FieldValidator::NotNil, set_field_validators :deploy_env, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_field_validators :stack_template, [::Validators::FieldValidator::NotNil, set_field_validators :stack_template, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_field_validators :name, [::Validators::FieldValidator::Nil, set_field_validators :name, ::Validators::FieldValidator::Nil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_field_validators :owner, [::Validators::FieldValidator::NotNil, set_field_validators :owner, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_field_validators :run_list, [::Validators::FieldValidator::NotNil, set_field_validators :run_list, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::Array, ::Validators::FieldValidator::FieldType::Array,
::Validators::FieldValidator::RunList] ::Validators::FieldValidator::RunList
def initialize attrs={} def initialize attrs={}
# self.provider = self.class.provider # self.provider = self.class.provider

16
devops-service/db/mongo/models/stack_template/stack_template_base.rb
View File

@ -16,22 +16,22 @@ module Devops
template_body: {type: String, empty: false}, template_body: {type: String, empty: false},
owner: {type: String, empty: false} owner: {type: String, empty: false}
set_field_validators :id, [::Validators::FieldValidator::NotNil, set_field_validators :id, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty, ::Validators::FieldValidator::NotEmpty,
::Validators::FieldValidator::Name] ::Validators::FieldValidator::Name
set_field_validators :provider, [::Validators::FieldValidator::NotNil, set_field_validators :provider, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_field_validators :template_body, [::Validators::FieldValidator::NotNil, set_field_validators :template_body, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_field_validators :owner, [::Validators::FieldValidator::NotNil, set_field_validators :owner, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::NotEmpty] ::Validators::FieldValidator::NotEmpty
set_validators ::Validators::StackTemplate::TemplateContent set_validators ::Validators::StackTemplate::TemplateContent

2
devops-service/db/mongo/models/user.rb
View File

@ -15,6 +15,8 @@ module Devops
KNOWN_ENTITIES = %w(flavor group image project server key user filter network provider script templates stack_template stack) KNOWN_ENTITIES = %w(flavor group image project server key user filter network provider script templates stack_template stack)
attr_accessor :id, :password, :privileges, :email
set_field_validators :id, ::Validators::FieldValidator::NotNil, set_field_validators :id, ::Validators::FieldValidator::NotNil,
::Validators::FieldValidator::FieldType::String, ::Validators::FieldValidator::FieldType::String,
::Validators::FieldValidator::Name ::Validators::FieldValidator::Name

6
devops-service/spec/models/deploy_env/deploy_env_ec2_spec.rb
View File

@ -25,12 +25,6 @@ RSpec.describe Devops::Model::DeployEnvEc2, type: :model do
end end
end end
describe '#to_hash' do
it 'includes vpc_id' do
expect(env.to_hash).to include('vpc_id')
end
end
describe '.create' do describe '.create' do
it 'returns instance of DeployEnvEc2' do it 'returns instance of DeployEnvEc2' do
expect(described_class.create({})).to be_an_instance_of(described_class) expect(described_class.create({})).to be_an_instance_of(described_class)