brpm_module_bladelogic 0.1.39 → 0.1.41

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTlhYjkyZjQ0YTIxZmQ1NjVlNmU5NGE1NjlkN2RhYmYzYmE5MDcxNw==
+    OWVkYjE0NzE2YjA1YTBmMDE3ZDAwMzQwODUzYWRhNDM2MGJlODllMw==
   data.tar.gz: !binary |-
-    MzQ0MjJhYjMwYmNkZjc5N2Q1ZWE0MTc0ZDk4MzBjNjUyN2JiODYyNQ==
+    M2QxZTJiNGI0YWYwZjM2OTllYjFjODg3OTljZWRkZmJlNzIzOWJiYg==
 SHA512:
   metadata.gz: !binary |-
-    M2Y0ZGVkODFhMGM1NmFlNzRmN2RhZDYzNTFlNmUwN2MzYzljMDcwMTg3Y2Fh
-    NzAxZDZkYzlmNGMzZjA4NzUxMTdiZmJjOTM1YmU1NmZkYTZmY2E3YzlmZTMy
-    MzcyNWViNmNlYTA1NmYzNjg5OGJlNGMzYWRjZjA5YzA2Y2JmYWQ=
+    NDg1OGFmYzJjNzQ3ZWI2MjI2ZTUwOTY1ZGI4NTkwMGE1Y2RmNmQyNjQ0MzRl
+    NmZmMzQwNGE3MGJlNGJmNGM5ZjgzODA0Y2RmZTI3MDA4YWRmZGY0MzhmY2Rj
+    ZGQ1NzAyNTU4ZjllZmJmYWRlNDZjNmM3ZTlkYTJlY2VlMDAzYzU=
   data.tar.gz: !binary |-
-    NTU2MzIwMjk2YmZmNDBlMWUxMDRiN2Y2ODBhM2JmZTBjOTc2OTkyODU2YzUw
-    NWY5MDQ0NGNmZTQ3MWI1YjEyOTExMDE2YjcyNDFkY2YxZTAxNjk4OWI4Zjdl
-    NjczNzcxMjRmYjNlNTM1ZWFjOWY3OTUxYTdkYjM1Y2NkYjg2YzQ=
+    NTBhYTIxNjllZTQ0YTFiYzhhOTg2ZGUxNjYwMzE5MDc0NGUyNTcxZDE0NzYy
+    YTU3OGYzZjgxZDNlZmQ3OWU0YjRkM2U2MWFhOTUwN2RhNGFkMzNmNmQ3MjVk
+    YTI0ZTYwYTZjNWQ5OGM4NDU0YTcxMWRkNmNmOTQ1NzJlZjIwNjA=

data/automations/execute_job.meta

@@ -21,7 +21,7 @@ params:
     type: out-text
     position: A2:E2
   results:
-    name: Installs
+    name: Results
     type: out-table
     position: A3:E3
   results_link:

data/automations/execute_job.rb

@@ -75,70 +75,106 @@ File.open(results_full_path, "w") do |f|
 end
 
 BrpmAuto.log("Parsing the results...")
-# As this export contains "embedded" double quotes it is not possible to parse it with the CSV library
-log_lines = results_content.split("\n")[6..-1]
-log_lines.select! { |log| !log.start_with?("run level log,") }
-
-logs = log_lines.map do |log_line|
-  log_items = log_line.split(",",7)
-
-  # 0: server
-  # 1: phase
-  # 2: attempt
-  # 3: date part 1
-  # 4: date part 2
-  # 5: Info - Warning - Error
-  # 6: message
-
-  if log_items.count < 7 # Some lines are broken in two because of end-of-lines appearing in the message field...
-    nil
-  else
-    log_items[6] = log_items[6].tr(",,","")
-    log_items[3] = DateTime.parse("#{log_items[3]},#{log_items[4]}")
-
-    log_items
+if job_type == "DeployJob"
+  # As this export contains "embedded" double quotes it is not possible to parse it with the CSV library
+  log_lines = results_content.split("\n")[6..-1]
+  log_lines.select! { |log| !log.start_with?("run level log,") }
+
+  logs = log_lines.map do |log_line|
+    log_items = log_line.split(",",7)
+
+    # 0: server
+    # 1: phase
+    # 2: attempt
+    # 3: date part 1
+    # 4: date part 2
+    # 5: Info - Warning - Error
+    # 6: message
+
+    if log_items.count < 7 # Some lines are broken in two because of end-of-lines appearing in the message field...
+      nil
+    else
+      log_items[6] = log_items[6].tr(",,","")
+      log_items[3] = DateTime.parse("#{log_items[3]},#{log_items[4]}")
+
+      log_items
+    end
   end
-end
 
-logs = logs.compact # removing the possible nils from the array
+  logs = logs.compact # removing the possible nils from the array
 
-logs = logs.sort_by { |log| [log[0], log[1], log[3]] }
+  logs = logs.sort_by { |log| [log[0], log[1], log[3]] }
 
-servers_with_logs = logs.group_by { |log| log[0] }
+  servers_with_logs = logs.group_by { |log| log[0] }
 
-failed_servers_with_logs = servers_with_logs.select { |key, value| value.select{|log| log[5] == "Error" }.count > 0}
+  failed_servers_with_logs = servers_with_logs.select { |key, value| value.select{|log| log[5] == "Error" }.count > 0}
 
-BrpmAuto.pack_response "results_summary", "#{servers_with_logs.count - failed_servers_with_logs.count}/#{servers_with_logs.count} servers were successful"
+  BrpmAuto.pack_response "results_summary", "#{servers_with_logs.count - failed_servers_with_logs.count}/#{servers_with_logs.count} servers were successful"
 
-table_data = [[' ', 'Server', 'Simulate', 'Stage', 'Commit']]
-counter = 0
-servers_with_logs.each do |key, logs|
-  server = key
+  table_data = [[' ', 'Server', 'Simulate', 'Stage', 'Commit']]
+  counter = 0
+  servers_with_logs.each do |key, logs|
+    server = key
 
-  phase_with_logs = logs.group_by { |log| log[1] }
+    phase_with_logs = logs.group_by { |log| log[1] }
 
-  if phase_with_logs.has_key?("Simulate")
-    simulate = phase_with_logs["Simulate"].any? { |log| log[5] == "Error" } ? "Error" : "Succeeded"
-  else
-    simulate = ""
-  end
-  if phase_with_logs.has_key?("Stage")
-    stage = phase_with_logs["Stage"].any? { |log| log[5] == "Error" } ? "Error" : "Succeeded"
-  else
-    stage = ""
+    if phase_with_logs.has_key?("Simulate")
+      simulate = phase_with_logs["Simulate"].any? { |log| log[5] == "Error" } ? "Error" : "Succeeded"
+    else
+      simulate = ""
+    end
+    if phase_with_logs.has_key?("Stage")
+      stage = phase_with_logs["Stage"].any? { |log| log[5] == "Error" } ? "Error" : "Succeeded"
+    else
+      stage = ""
+    end
+    if phase_with_logs.has_key?("Commit")
+      commit = phase_with_logs["Commit"].any? { |log| log[5] == "Error" } ? "Error" : "Succeeded"
+    else
+      commit = ""
+    end
+
+    counter += 1
+    table_data << [counter, server, simulate, stage, commit]
   end
-  if phase_with_logs.has_key?("Commit")
-    commit = phase_with_logs["Commit"].any? { |log| log[5] == "Error" } ? "Error" : "Succeeded"
-  else
-    commit = ""
+else
+  csv_content = CSV.parse(results_content)
+
+  logs = csv_content[6..-1] # remove the headers of the csv file
+
+  logs = logs.select { |log| !log[0].start_with?("Run at") }
+
+  logs.each do |log|
+    log[2] = DateTime.parse(log[2])
   end
 
-  counter += 1
-  table_data << [counter, server, simulate, stage, commit]
+  logs = logs.sort_by { |log| [log[0], log[2]] }
+
+  servers_with_logs = logs.group_by {|log| log[0] }
+  failed_servers_with_logs = servers_with_logs.select { |key, value| value.select{|log| log[1] == "Error" }.count > 0}
+
+  BrpmAuto.pack_response "results_summary", "#{servers_with_logs.count - failed_servers_with_logs.count}/#{servers_with_logs.count} servers were successful"
+
+  table_data = [[' ', 'Server', 'Result', 'Error message']]
+  counter = 0
+  server_cache = ""
+  logs.each do |log|
+    if log[0] == server_cache
+      server = ""
+    else
+      server = log[0]
+      server_cache = log[0]
+    end
+    result = log[1]
+    message = log[3]
+
+    counter += 1
+    table_data << [counter, server, result, message]
+  end
 end
 
 BrpmAuto.pack_response "results", { :perPage => 10, :totalItems => table_data.count - 1, :data => table_data }
 
 BrpmAuto.pack_response "results_link", results_full_path
 
-raise "The Deploy job had errors!" if had_errors
+raise "The job had errors!" if had_errors

data/config.yml

@@ -1,7 +1,7 @@
 dependencies:
  - brpm_module_brpm
 
-version: 0.1.39
+version: 0.1.41
 
 friendly_name: Blade
 author: Niek Bartholomeus

data/tests/execute_job_spec.rb

@@ -9,26 +9,38 @@ describe 'execute job' do
     cleanup_request_params
   end
 
-  it 'should execute a job to a list of servers in BladeLogic' do
+  it 'should execute an NSHScriptJob to a list of servers in BladeLogic' do
     params = get_default_params
     params = params.merge(get_integration_params_for_bladelogic)
 
     params["application"] = 'E-Finance'
     params["job_type_and_name"] = 'NSHScriptJob|echo'
     params["target_type"] = "Servers"
-    params["server1000_name"] = "localhost"
+    params["server1000_name"] = "targetserver.pulsar-it.be"
 
     BrpmScriptExecutor.execute_automation_script("brpm_module_bladelogic", "execute_job", params)
   end
 
-  it 'should execute a job to a list of custom servers in BladeLogic' do
+  it 'should execute an NSHScriptJob to a list of custom servers in BladeLogic' do
     params = get_default_params
     params = params.merge(get_integration_params_for_bladelogic)
 
     params["application"] = 'E-Finance'
     params["job_type_and_name"] = 'NSHScriptJob|echo'
     params["target_type"] = "Servers"
-    params["target_path_or_servers"] = "localhost"
+    params["target_path_or_servers"] = "targetserver.pulsar-it.be"
+
+    BrpmScriptExecutor.execute_automation_script("brpm_module_bladelogic", "execute_job", params)
+  end
+
+  it 'should execute a DeployJob to a list of servers in BladeLogic' do
+    params = get_default_params
+    params = params.merge(get_integration_params_for_bladelogic)
+
+    params["application"] = 'E-Finance'
+    params["job_type_and_name"] = "DeployJob|Deploy EF - .NET web front end 1.0.0 in development"
+    params["target_type"] = "Servers"
+    params["server1000_name"] = "targetserver.pulsar-it.be"
 
     BrpmScriptExecutor.execute_automation_script("brpm_module_bladelogic", "execute_job", params)
   end

data/tests/select_job_spec.rb

@@ -16,7 +16,7 @@ describe 'execute job' do
     params["application"] = 'E-Finance'
 
     result = BrpmScriptExecutor.execute_resource_automation_script("brpm_module_bladelogic", "select_job", params, nil, 0, 10)
-    expect(result.count).to eql(1)
+    expect(result.count).to eql(2)
 
     result = BrpmScriptExecutor.execute_resource_automation_script("brpm_module_bladelogic", "select_job", params, "NSHScriptJob", 0, 10)
     expect(result.count).to eql(1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_module_bladelogic
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.41
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpm_content_framework