hammer_cli_foreman 0.19.6 → 0.19.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 044c402964ebc3448c879c6858be3d8726ad8be7bafcbd25cef6d8f1a3ca4e02
-  data.tar.gz: 672a8c5be95a59de4908dd982e87c454e9f84025a6aff7751934035857ad1508
+  metadata.gz: b06761047f5cbd13606444872d97853870f28cdc4117a54fc450b250f036a770
+  data.tar.gz: ffa9cb3168c98dce349a8ef32d1046db74887d7e03e65025bd4a8dec7717a46e
 SHA512:
-  metadata.gz: d033b74af20d792cd58ff42d631189cf36245f062e05c2180dc6529914e28c3ddbff0c70afaae43e168eba1adcb8e33a8e0a1b146b78cc201f06999d5266292c
-  data.tar.gz: 1d36643cfeb4f03a4a5a36a035156bd02655fff13b12145ec825e94ba45f3f8da071fa71aa6b6ca4c2c640d2e2fd38c084c0c16ef239bc72c126a8758a882447
+  metadata.gz: 364b646af39ecf1f87f73b570b8c6db56259abe6fafe1a9c991a03201dabfdb2a3764fd8bc8b91b64112b5e3dd2a876607cf85c10922bd8b3d1e740347619851
+  data.tar.gz: f73cd97db5ba463e2a6e54041bce9be796190da7fe9ea4198c7b210ae6604a163e172246bf099ed32987553c9192cb8d61e9dbff9792df95955ecf22bff51176

data/doc/release_notes.md

@@ -1,5 +1,8 @@
 Release notes
 =============
+### 0.19.7 (2020-01-16)
+* Fix host creation from image and hostgroup ([PR #471](https://github.com/theforeman/hammer-cli-foreman/pull/471)), [#28541](http://projects.theforeman.org/issues/28541)
+
 ### 0.19.6 (2020-01-10)
 * Add auth source external command ([PR #480](https://github.com/theforeman/hammer-cli-foreman/pull/480)), [#28704](http://projects.theforeman.org/issues/28704)
 * Fix undefined method  on wrong oidc token endpoint ([PR #479](https://github.com/theforeman/hammer-cli-foreman/pull/479)), [#28196](http://projects.theforeman.org/issues/28196)

data/lib/hammer_cli_foreman/compute_resource/utils.rb

@@ -8,6 +8,22 @@ module HammerCLIForeman
       )
     end
 
+    def self.get_hostgroup_compute_resource_id(hostgroup_id)
+      hostgroup = HammerCLIForeman.record_to_common_format(
+          HammerCLIForeman.foreman_resource(:hostgroups).call(:show, 'id' => hostgroup_id)
+      )
+      compute_resource_id = hostgroup['compute_resource_id']
+       if !hostgroup['compute_resource_name'].to_s.strip.empty? && compute_resource_id.nil?
+         compute_resource= HammerCLIForeman.record_to_common_format(
+            HammerCLIForeman.foreman_resource(:compute_resources).call(
+                :index, :search => "name = \"#{hostgroup['compute_resource_name']}\""
+            )
+         )
+         compute_resource_id = compute_resource['results'][0]['id'] if compute_resource['results'][0]
+      end
+      compute_resource_id
+    end
+
     def self.get_host_compute_resource_id(host_id)
       HammerCLIForeman.record_to_common_format(
         HammerCLIForeman.foreman_resource(:hosts).call(

data/lib/hammer_cli_foreman/hosts/common_update_options.rb

@@ -98,9 +98,14 @@ module HammerCLIForeman
           params['host']['compute_attributes']['volumes_attributes'] = nested_attributes(option_volume_list)
           params['host']['interfaces_attributes'] = interfaces_attributes
         end
-
-        if options["option_image_id"]
-          compute_resource_id = params['host']['compute_resource_id'] || ::HammerCLIForeman::ComputeResources.get_host_compute_resource_id(params['id'])
+        if options['option_image_id']
+          if params['host']['compute_resource_id']
+            compute_resource_id = params['host']['compute_resource_id']
+          elsif params['id']
+            compute_resource_id = ::HammerCLIForeman::ComputeResources.get_host_compute_resource_id(params['id'])
+          elsif params['host']['hostgroup_id']
+            compute_resource_id = ::HammerCLIForeman::ComputeResources.get_hostgroup_compute_resource_id(params['host']['hostgroup_id'])
+          end
           raise ArgumentError, "Missing argument for 'compute_resource'" if compute_resource_id.nil?
           image_uuid =  ::HammerCLIForeman::ComputeResources.get_image_uuid(compute_resource_id, options["option_image_id"])
           params['host']['compute_attributes']['image_id'] = image_uuid

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new "0.19.6"
+    @version ||= Gem::Version.new "0.19.7"
   end
 end

data/test/functional/host_test.rb

@@ -236,6 +236,67 @@ describe "host create" do
     result = run_cmd(cmd + minimal_params_without_hostgroup + params)
     assert_cmd(expected_result, result)
   end
+
+  it "Creates host in case the image is provided from the hostgroup and hostgroup is not nested" do
+    params = ['--name=test',
+              '--provision-method=image',
+              '--image-id=8' ,
+              '--managed=true',
+              '--hostgroup-id=1',
+              '--organization-id=1',
+              '--location-id=1'
+    ]
+
+    api_expects(:hostgroups, :show).with_params(
+      {}
+    ).returns({'compute_resource_name' => "cr", 'compute_resource_id' => 33 })
+
+    api_expects(:images, :show).with_params(
+      {"compute_resource_id" => 33, "id" => 8}
+    ).returns(results: {'uuid' => '111111'})
+
+    api_expects(:hosts, :create).with_params(
+      {"location_id" => 1, "organization_id" => 1, "host" => {"name" => "test", "location_id" => 1, "organization_id" => 1, "puppetclass_ids" => [], "hostgroup_id" => 1, "image_id" => 8, "provision_method" => "image", "managed" => true, "compute_attributes" => {"volumes_attributes" => {}, "image_id" => nil}, "build" => true, "enabled" => true, "overwrite" => true, "interfaces_attributes" => []}}
+    ).returns(results: {'uuid' => '111111'})
+
+    expected_result = success_result("Host created.\n")
+    result = run_cmd(cmd + params)
+    assert_cmd(expected_result, result)
+  end
+
+  it "Creates host in case the image is provided from the hostgroup and hostgroup is nested" do
+      params = ['--name=test',
+                '--provision-method=image',
+                '--image-id=8' ,
+                '--managed=true',
+                '--hostgroup-id=1',
+                '--organization-id=1',
+                '--location-id=1'
+      ]
+
+      # nested hostgroup will return nil in compute_resource_id
+      api_expects(:hostgroups, :show).with_params(
+        {}
+      ).returns({'compute_resource_name' => "cr", 'compute_resource_id' => nil})
+
+      api_expects(:compute_resources, :index).with_params(
+        {:search => "name = \"cr\""}
+      ).returns(results: {'results' => [{'id' => 33, 'name' => "cr"}]})
+
+      api_expects(:images, :show).with_params(
+        {"compute_resource_id" => 33, "id" => 8}
+      ).returns(results: {'uuid' => '111111'})
+
+      api_expects(:hosts, :create).with_params(
+        {"location_id" => 1, "organization_id" => 1, "host" => {"name" => "test", "location_id" => 1, "organization_id" => 1, "puppetclass_ids" => [], "hostgroup_id" => 1, "image_id" => 8, "provision_method" => "image", "managed" => true, "compute_attributes" => {"volumes_attributes" => {}, "image_id" => nil}, "build" => true, "enabled" => true, "overwrite" => true, "interfaces_attributes" => []}}
+      ).returns(results: {'uuid' => '111111'})
+
+
+      expected_result = success_result("Host created.\n")
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+  end
+
 end
 
 describe 'host update' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.19.6
+  version: 0.19.7
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -371,7 +371,6 @@ test_files:
 - test/functional/personal_access_token_test.rb
 - test/functional/proxy_test.rb
 - test/functional/settings_test.rb
-- test/functional/smart_variable_test.rb
 - test/functional/ssh_keys_test.rb
 - test/functional/subnet/create_test.rb
 - test/functional/subnet/update_test.rb
@@ -380,12 +379,13 @@ test_files:
 - test/functional/ping_test.rb
 - test/functional/status_test.rb
 - test/functional/compute_resource_test.rb
-- test/functional/host_test.rb
 - test/functional/http_proxy_test.rb
 - test/functional/report_template_test.rb
 - test/functional/role_test.rb
 - test/functional/smart_class_parameter_test.rb
+- test/functional/smart_variable_test.rb
 - test/functional/template_test.rb
+- test/functional/host_test.rb
 - test/unit/api/void_auth_test.rb
 - test/unit/api/interactive_basic_auth_test.rb
 - test/unit/api/oauth/oauth_authentication_code_grant_test.rb
@@ -407,11 +407,9 @@ test_files:
 - test/unit/exception_handler_test.rb
 - test/unit/external_usergroup_test.rb
 - test/unit/fact_test.rb
-- test/unit/filter_test.rb
 - test/unit/helpers/command.rb
 - test/unit/helpers/fake_searchables.rb
 - test/unit/helpers/resource_disabled.rb
-- test/unit/hostgroup_test.rb
 - test/unit/id_resolver_test.rb
 - test/unit/image_test.rb
 - test/unit/location_test.rb
@@ -426,22 +424,24 @@ test_files:
 - test/unit/output/formatters_test.rb
 - test/unit/param_filters_test.rb
 - test/unit/partition_table_test.rb
-- test/unit/puppet_class_test.rb
 - test/unit/puppet_environment_test.rb
 - test/unit/realm_test.rb
 - test/unit/role_test.rb
 - test/unit/settings_test.rb
 - test/unit/smart_proxy_test.rb
-- test/unit/smart_variable_test.rb
 - test/unit/subnet_test.rb
 - test/unit/test_helper.rb
 - test/unit/user_test.rb
 - test/unit/usergroup_test.rb
 - test/unit/sessions_test.rb
+- test/unit/apipie_resource_mock.rb
+- test/unit/auth_source_external.rb
+- test/unit/filter_test.rb
 - test/unit/host_test.rb
+- test/unit/hostgroup_test.rb
+- test/unit/puppet_class_test.rb
 - test/unit/smart_class_parameter_test.rb
+- test/unit/smart_variable_test.rb
 - test/unit/template_test.rb
 - test/unit/test_output_adapter.rb
-- test/unit/apipie_resource_mock.rb
-- test/unit/auth_source_external.rb
 - test/test_helper.rb