Merge branch 'devops_3_achuchkalov' into devops_3

This commit is contained in:
Anton Chuchkalov 2015-07-29 19:37:52 +02:00
commit e0c456c571
3 changed files with 37 additions and 2 deletions

View File

@ -49,6 +49,7 @@ module Output
def create_servers_list def create_servers_list
headers = ['Logical id', 'Physical id'] headers = ['Logical id', 'Physical id']
byebug
rows = @data.map do |resource| rows = @data.map do |resource|
[resource['resource_name'], resource['physical_resource_id']] [resource['resource_name'], resource['physical_resource_id']]
end end

View File

@ -1,5 +1,7 @@
require 'json' require 'json'
require 'lib/stack_presets/factory' require 'lib/stack_presets/factory'
require 'workers/stack_sync_worker'
require 'workers/job_starter'
require_relative "request_handler" require_relative "request_handler"
module Devops module Devops
@ -17,10 +19,42 @@ module Devops
def apply id, body def apply id, body
preset = Devops::StackPresetsFactory.get(id) preset = Devops::StackPresetsFactory.get(id)
preset.create_stack_from_preset(body) stack = preset.create_stack_from_preset(body)
Devops::Db.connector.stack_insert(stack) Devops::Db.connector.stack_insert(stack)
file = JobStarter.start_job(:worker, :sync_stack_till_not_in_progress,
provider: stack.provider,
stack_id: stack.id,
request: @request
)
puts "Syncing report is located here: #{file}"
stack
end end
# def self.apply
# lambda {
# # check_privileges("stack_presets", "r")
# check_privileges('stack_template', 'w')
# attrs = create_object_from_json_body
# preset = Devops::StackPresetsFactory.get(attrs.fetch('id'))
# stack = preset.create_stack_from_preset(attrs)
# settings.mongo.stack_insert(stack)
# file = JobStarter.start_job(:worker, :sync_stack_till_not_in_progress,
# provider: stack.provider,
# stack_id: stack.id,
# request: request
# )
# puts "Syncing report is located here: #{file}"
# create_response 'Created', stack.to_hash, 201
# }
# end
end end
end end
end end

View File

@ -44,7 +44,7 @@ module Devops
app.get_with_headers "/stack/:stack_id/resources", :headers => [:accept] do |stack_id| app.get_with_headers "/stack/:stack_id/resources", :headers => [:accept] do |stack_id|
check_privileges("stack", "r") check_privileges("stack", "r")
json Devops::API2_0::Handler::Stack.new(request, params).resources(stack_id) json Devops::API2_0::Handler::Stack.new(request, params).resources(stack_id, nil)
end end
app.get_with_headers "/stack/:stack_id/resources/:resource_id", :headers => [:accept] do |stack_id, resource_id| app.get_with_headers "/stack/:stack_id/resources/:resource_id", :headers => [:accept] do |stack_id, resource_id|