brpm_module_bladelogic 0.1.12 → 0.1.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWY4MmQ4ZWIyODdmMzQzYjgzNTMxYzQ2YjAwZDk0NzdkMDEwYmU5ZQ==
+    YTc1NzE2YWQ0ZTU4ZDI4MDc4ODI0NmUyMDBiY2I2NmZkMTg1MmJjZA==
   data.tar.gz: !binary |-
-    ZjI1YWY3YzY2YjkwNzgxN2Y5MDY4OWIzMmQ4N2M2OWEzMWI5MzdiZg==
+    NWJiNWQ2M2JhYjEyNTBkOGEzMDAyZjVlZGNiYzE2NDYzNTQwZWJmNw==
 SHA512:
   metadata.gz: !binary |-
-    MzRhN2ZlNDAzZWQzNDJjYWNiZDI0N2U1NTc2ZTYwN2IzZjg5MWIyNzNhNTAz
-    YzczZDI0MTYzZDEwM2E5YjQzOGY5NjBiMjIzMGMzNTg0OTU2NGZlNDQyMjMz
-    ODM5NWYwOTZkOGU4NDNmYTY3NjRjZTAwZWM0YTg3ZDI0ZTY4MGE=
+    Mjc5ODNkYjJjNGIxMmZkN2JlMDEwMGJhY2U5NTM1MzhjNTdjMmQ4YzBlYmRh
+    MzgwY2Y4ZjJhYzNjMjVjODI4NzliZTU4NTY5YWJkMDQyZTM3NGNjZDNjZTI3
+    MDMxYmZkODYyYjRhNjRjMzRhY2Q2ZGI0NWZhZjRiNjczOTliZWI=
   data.tar.gz: !binary |-
-    NzUwYTg5YjA4MjZkZGFkMTgxNjhjMDBjYjhlY2FmZjZmZjZkMmM2MTdjOWJj
-    MjJiYTBiODg5NmVjMjJlZjEzYjVkOGUxNjA2Y2U4OWZmZGYyZjRjMDZkM2Ey
-    OWVkOTc5MTlkNDJiNTVkMmRjMWVmOWM0MTI1ZjdkOWJiMTMzNTk=
+    YzlkY2Q1NTMwODMwYTBlYTgyZDA0N2I4Mjc2NGYxNWE3ZDdhMzFiMDdhYjI3
+    OWJjOTBjNDc5N2NkNGExZDY2MjJhYWMwMWMyZTc1YjRlYjJmMDBjYmYxY2Ni
+    NWVkZTYzMDI5MGI3ZGFmYjYxNzdhM2QxY2Q0MzhkNzE2MmQ3ZjI=

data/automations/deploy_package.meta

@@ -14,10 +14,10 @@ params:
   target_type:
     name: Target type
     type: in-list-single
-    list_pairs: 0,Server group|1,Component group
+    list_pairs: 0,Server group|1,Component group|2,Servers
     position: A5:C5
-  target_path:
-    name: Target path
+  target_path_or_servers:
+    name: Target path or servers (comma separated)
     position: A6:F6
   job_status:
     name: Job Status

data/automations/deploy_package.rb

@@ -2,14 +2,20 @@ params = BrpmAuto.params
 brpm_rest_client = BrpmRestClient.new
 
 environment = params.request_environment
-unless params["server_group"] # can already be populated by the automated tests
-  BrpmAuto.log("Getting the server group from the step...")
-  params["server_group"] = brpm_rest_client.get_server_group_from_step_id(params["step_id"])
-end
-server_group = params["server_group"]
 
 target_type = BrpmAuto.first_defined(BrpmAuto.substitute_tokens(params["target_type"]), "Server group")
-target_path = BrpmAuto.first_defined(BrpmAuto.substitute_tokens(params["target_path"]), "/Applications/#{params["application"]}/#{params["request_environment"]}/#{server_group}")
+
+if target_type == "Servers"
+  target_servers = BrpmAuto.params.servers.keys.join(",")
+else
+  unless params["server_group"] # can already be populated by the automated tests
+    BrpmAuto.log("Getting the server group from the step...")
+    params["server_group"] = brpm_rest_client.get_server_group_from_step_id(params["step_id"])
+  end
+  server_group = params["server_group"]
+
+  target_path = BrpmAuto.first_defined(BrpmAuto.substitute_tokens(params["target_path_or_servers"]), "/Applications/#{params["application"]}/#{params["request_environment"]}/#{server_group}")
+end
 
 deploy_job_name = BrpmAuto.first_defined(BrpmAuto.substitute_tokens(params["deploy_job_name"]), "Deploy #{params["component"]} #{params["component_version"]} in #{environment} - #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}")
 deploy_job_group_path = BrpmAuto.first_defined(BrpmAuto.substitute_tokens(params["deploy_job_group_path"]), "/Applications/#{params["application"]}")
@@ -27,10 +33,7 @@ BrpmAuto.log("Retrieving the id of job group #{deploy_job_group_path}...")
 deploy_job_group_id = bsa_soap_client.job_group.group_name_to_id({:group_name => deploy_job_group_path })
 
 BrpmAuto.log("Creating Deploy job #{deploy_job_group_path}/#{deploy_job_name}...")
-job_db_key = bsa_soap_client.deploy_job.create_deploy_job({:job_name => deploy_job_name, :group_id => deploy_job_group_id, :package_db_key => package_db_key, :server_name => "localhost" })
-
-BrpmAuto.log("Cleaning the servers from the Deploy job...")
-job_db_key = bsa_soap_client.job.clear_target_servers({:job_key => job_db_key})
+job_db_key = bsa_soap_client.deploy_job.create_deploy_job_without_target({:job_name => deploy_job_name, :group_id => deploy_job_group_id, :package_db_key => package_db_key})
 
 if target_type == "Server group"
   BrpmAuto.log("Adding server group #{target_path} to the Deploy job...")
@@ -38,6 +41,11 @@ if target_type == "Server group"
 elsif target_type == "Component group"
   BrpmAuto.log("Adding component group #{target_path} to the Deploy job...")
   job_db_key = bsa_soap_client.job.add_target_component_group({:job_key => job_db_key, :group_name => target_path})
+elsif target_type == "Servers"
+  unless target_servers.empty?
+    BrpmAuto.log("Adding servers #{target_servers} to the Deploy job...")
+    job_db_key = bsa_soap_client.job.add_target_servers({:job_key => job_db_key, :server_names => target_servers})
+  end
 end
 
 BrpmAuto.log("Executing the Deploy job...")

data/config.yml

@@ -1,7 +1,7 @@
 dependencies:
  - brpm_module_brpm
 
-version: 0.1.12
+version: 0.1.13
 
 author: Niek Bartholomeus
 email: niek.bartholomeus@gmail.com

data/lib/bl_soap/deploy_job.rb

@@ -17,6 +17,22 @@ class DeployJob < BsaSoapBase
     raise "Exception executing #{self.class} function: #{exception.to_s}"
   end
 
+  def create_deploy_job_without_target(options = {})
+    validate_cli_options_hash([:job_name, :group_id, :package_db_key], options)
+    db_key_result = execute_cli_with_param_list(self.class, "createDeployJobWithoutTarget",
+                                                [
+                                                    options[:job_name],
+                                                    options[:group_id],
+                                                    options[:package_db_key],
+                                                    true, #isSimulateEnabled
+                                                    true, #isCommitEnabled
+                                                    false, #isStagedIndirect
+                                                ])
+    db_key = get_cli_return_value(db_key_result)
+  rescue => exception
+    raise "Exception executing #{self.class} function: #{exception.to_s}"
+  end
+
   def get_dbkey_by_group_and_name(options = {})
     validate_cli_options_hash([:group_name, :job_name], options)
     db_key_result = execute_cli_with_param_list(self.class, "getDBKeyByGroupAndName",

data/tests/deploy_package_spec.rb

@@ -5,19 +5,31 @@ describe 'deploy package' do
     setup_brpm_auto
   end
 
-  describe '' do
-    it 'should deploy a package in BladeLogic' do
-      params = get_default_params
-      params = params.merge(get_integration_params_for_bladelogic)
-
-      params["application"] = 'E-Finance'
-      params["component"] = 'EF - Java calculation engine'
-      params["component_version"] = '2.0.0'
-      params["request_environment"] = "development"
-      params["server_group"] = "EF - java app servers - development"
-
-      BrpmScriptExecutor.execute_automation_script_from_gem("brpm_module_bladelogic", "deploy_package", params)
-    end
+  it 'should deploy a package to a server group in BladeLogic' do
+    params = get_default_params
+    params = params.merge(get_integration_params_for_bladelogic)
+
+    params["application"] = 'E-Finance'
+    params["component"] = 'EF - Java calculation engine'
+    params["component_version"] = '2.0.0'
+    params["request_environment"] = "development"
+    params["server_group"] = "EF - java app servers - development"
+
+    BrpmScriptExecutor.execute_automation_script_from_gem("brpm_module_bladelogic", "deploy_package", params)
+  end
+
+  it 'should deploy a package 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["component"] = 'EF - Java calculation engine'
+    params["component_version"] = '2.0.0'
+    params["request_environment"] = "test"
+    params["server1000_name"] = "localhost"
+    params["target_type"] = "Servers"
+
+    BrpmScriptExecutor.execute_automation_script_from_gem("brpm_module_bladelogic", "deploy_package", params)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brpm_module_bladelogic
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Niek Bartholomeus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brpm_content