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

fix some bugs

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-07-06 18:00:45 +04:00
parent ecbb40ce07
commit 13edacc58c
6 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devops-service/config.rb
View File

@ -40,3 +40,4 @@ config[:static_ssh_key] = "ssh_key" # or nil
config[:static_certificate] = "/path/to/.ssh/static.pem"
config[:debug] = true
config[:stub_classes] = true

2
devops-service/db/mongo/connectors/key.rb
View File

@ -15,7 +15,7 @@ module Connectors
end
def key_delete id
delete(id, 'scope' => ::Key::USER)
delete(id, 'scope' => Devops::Model::Key::USER)
end
private

2
devops-service/lib/stubber.rb
View File

@ -4,6 +4,6 @@ module Stubber
end
def self.stub_models!
Dir["tests/stubs/models/*.rb"].each {|file| require file }
Dir["tests/stubs/models/stack/*.rb"].each {|file| require file }
end
end

4
devops-service/routes/v2.0/handlers/script.rb
View File

@ -103,7 +103,7 @@ module Devops
lambda {
check_privileges("script", "w")
file_name = params[:script_name]
file = File.join(DevopsService.config[:scripts_dir], check_filename(file_name, "Parameter 'script_name' must be a not empty string"))
file = File.join(settings.scripts_dir, check_filename(file_name, "Parameter 'script_name' must be a not empty string"))
halt_response("File '#{file_name}' already exist") if File.exists?(file)
File.open(file, "w") {|f| f.write(request.body.read)}
create_response("File '#{params[:script_name]}' created", nil, 201)
@ -114,7 +114,7 @@ module Devops
lambda {
check_privileges("script", "w")
file_name = params[:script_name]
file = File.join(DevopsService.config[:scripts_dir], check_filename(file_name, "Parameter 'script_name' must be a not empty string"))
file = File.join(settings.scripts_dir, check_filename(file_name, "Parameter 'script_name' must be a not empty string"))
halt_response("File '#{file_name}' does not exist", 404) unless File.exists?(file)
FileUtils.rm(file)
create_response("File '#{params[:script_name]}' deleted")

24
devops-service/tests/stubs/models/stack/stack_openstack.rb
View File

@ -1,13 +1,17 @@
puts '!!! WARNING: Some StackOpenstack methods are stubbed'
class StackOpenstack < StackBase
def create_stack_in_cloud!
self.cloud_stack_id = '4c712026-dcd5-4664-90b8-0915494c1332'
module Devops
module Model
class StackOpenstack < StackBase
def create_stack_in_cloud!
self.cloud_stack_id = '4c712026-dcd5-4664-90b8-0915494c1332'
end
def delete_stack_in_cloud!
true
end
end
end
def delete_stack_in_cloud!
true
end
end
end

5
devops-service/tests/stubs/providers/openstack.rb
View File

@ -54,6 +54,11 @@ class Provider::Openstack
'cidr' => '192.0.2.32/27',
'name' => 'test_network',
'id' => 'test_network_id'
},
{
'cidr' => '192.0.2.32/27',
'name' => 'private',
'id' => 'private_id'
}
]
end