hammer_cli_foreman 2.5.1 → 3.2.0

data/test/functional/architecture_test.rb

@@ -7,9 +7,9 @@ describe 'architecture' do
     before do
       @cmd = %w[architecture list]
       @architectures = [{
-                      id: 1,
-                      name: 'i386',
-                    }]
+        id: 1,
+        name: 'i386'
+      }]
     end
 
     it 'should return a list of architectures' do
@@ -26,7 +26,7 @@ describe 'architecture' do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -39,6 +39,8 @@ describe 'architecture' do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:architectures, :index, 'List architectures').returns(@architectures)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

data/test/functional/bookmark_test.rb

@@ -29,7 +29,7 @@ describe 'bookmark' do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -42,6 +42,8 @@ describe 'bookmark' do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:bookmarks, :index, 'List bookmarks').returns(@bookmarks)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

data/test/functional/compute_attribute_test.rb

@@ -11,11 +11,11 @@ describe "parameters" do
           }
     end
 
-    it "should print error on missing --compute-profile-id or --compute-profile" do
+    it 'should print error on missing --compute-profile-id or --compute-profile' do
       expected_result = common_error_result(
         @cmd,
-        "Could not find compute_profile, please set one of options --compute-profile, --compute-profile-id.",
-        "Could not set the compute profile attributes"
+        'Could not find compute_profile, please set one of options --compute-profile-id, --compute-profile.',
+        'Could not set the compute profile attributes'
       )
 
       api_expects_no_call
@@ -23,12 +23,12 @@ describe "parameters" do
       assert_cmd(expected_result, result)
     end
 
-    it "should print error on missing --compute-resource-id or --compute-resource" do
+    it 'should print error on missing --compute-resource-id or --compute-resource' do
       params = ['--compute-profile-id=1']
       expected_result = common_error_result(
         @cmd,
-        "Could not find compute_resource, please set one of options --compute-resource, --compute-resource-id.",
-        "Could not set the compute profile attributes"
+        'Could not find compute_resource, please set one of options --compute-resource-id, --compute-resource.',
+        'Could not set the compute profile attributes'
       )
 
       api_expects_no_call
@@ -103,11 +103,11 @@ describe "parameters" do
       params = ['--compute-profile-id=1', '--compute-resource-id=1', '--compute-attributes', 'cores=1']
 
       api_expects(:compute_profiles, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_profile)
 
       api_expects(:compute_resources, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_resource)
 
       api_expects(:compute_attributes, :update) do |par|
@@ -177,7 +177,7 @@ describe "parameters" do
       expected_result.expected_exit_code = HammerCLI::EX_USAGE
 
       api_expects(:compute_profiles, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_profile)
 
       result = run_cmd(@cmd + params)
@@ -189,7 +189,7 @@ describe "parameters" do
       params = ['--compute-profile-id=1', '--compute-resource-id=1', '--volume', 'size_gb=1']
 
       api_expects(:compute_profiles, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_profile)
 
       api_expects(:compute_attributes, :update) do |par|
@@ -261,7 +261,7 @@ describe "parameters" do
         params = ['--compute-profile-id=1', '--compute-resource-id=1', '--volume-id=1', '--volume', 'size_gb=1']
 
         api_expects(:compute_profiles, :show) do |par|
-          par['id'] == 1
+          par['id'] == '1'
         end.returns(@compute_profile)
 
         api_expects(:compute_attributes, :update) do |par|
@@ -339,7 +339,7 @@ describe "parameters" do
       params = ['--compute-profile-id=1', '--compute-resource-id=1', '--volume-id=1']
 
       api_expects(:compute_profiles, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_profile)
 
       api_expects(:compute_attributes, :update) do |par|
@@ -438,7 +438,7 @@ describe "parameters" do
       expected_result.expected_exit_code = HammerCLI::EX_USAGE
 
       api_expects(:compute_profiles, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_profile)
       result = run_cmd(@cmd + params)
       assert_cmd(expected_result, result)
@@ -455,7 +455,7 @@ describe "parameters" do
       response = HammerCLIForeman.foreman_api.api.send(:create_fake_response, 404,
                                                        expected_message, "GET", "http://example.com/", {})
       api_expects(:compute_profiles, :show) do |par|
-        par['id'] == 200
+        par['id'] == '200'
       end.raises(RestClient::NotFound, response)
 
       result = run_cmd(@cmd + params)
@@ -465,11 +465,11 @@ describe "parameters" do
     it "should add interface" do
       params = [ '--interface', 'name=eth0', '--compute-profile-id=1', '--compute-resource-id=1']
       api_expects(:compute_profiles, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_profile)
 
       api_expects(:compute_resources, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_resource)
 
       api_expects(:compute_attributes, :update) do |par|
@@ -548,11 +548,11 @@ describe "parameters" do
       params = ['--compute-profile-id=1', '--compute-resource-id=1', '--interface-id=1', '--interface', 'compute_name=eth0']
 
       api_expects(:compute_profiles, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_profile)
 
       api_expects(:compute_resources, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_resource)
 
       api_expects(:compute_attributes, :update) do |par|
@@ -637,11 +637,11 @@ describe "parameters" do
       params = ['--compute-profile-id=1', '--compute-resource-id=1', '--interface-id=1']
 
       api_expects(:compute_profiles, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_profile)
 
       api_expects(:compute_resources, :show) do |par|
-        par['id'] == 1
+        par['id'] == '1'
       end.returns(@compute_resource)
 
       api_expects(:compute_attributes, :update) do |par|

data/test/functional/compute_profile_test.rb

@@ -132,7 +132,7 @@ describe "parameters" do
     end
 
     it 'should run list command with defaults' do
-      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.1')) }
+      providers = { 'foreman' => HammerCLIForeman::Defaults.new(api_connection({}, '2.5')) }
       defaults = HammerCLI::Defaults.new(
         {
           organization_id: {
@@ -145,6 +145,8 @@ describe "parameters" do
       )
       defaults.stubs(:write_to_file).returns(true)
       defaults.stubs(:providers).returns(providers)
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_organization' => { 'id' => 2 } }]))
+      api_expects(:users, :index, 'Find user').with_params(search: 'login=admin').returns(index_response([{ 'default_location' => { 'id' => 1 } }]))
       api_expects(:compute_profiles, :index, 'List compute profiles').returns(@compute_profiles)
 
       result = run_cmd(@cmd, { use_defaults: true, defaults: defaults })

data/test/functional/domain/create_test.rb

@@ -0,0 +1,91 @@
+require_relative '../test_helper'
+
+describe 'Domain' do
+  describe 'CreateCommand' do
+    let(:cmd) { %w[domain create] }
+    let(:minimal_params) { %w[--name=dom1.com] }
+
+    def domain_params(additional_params = {})
+      params = {
+        domain: {
+          name: 'dom1.com'
+        }
+      }
+      params[:domain].merge!(additional_params)
+      params
+    end
+
+    it 'should print error on missing --name' do
+      expected_result = missing_args_error_result(cmd, '--name')
+
+      api_expects_no_call
+
+      result = run_cmd(cmd)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'allows minimal options' do
+      api_expects(:domains, :create).with_params(domain_params)
+
+      run_cmd(cmd + minimal_params)
+    end
+
+    it 'allows description' do
+      params = %w[--description=shortdesc]
+      api_expects(:domains, :create).with_params(domain_params(fullname: 'shortdesc'))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows dns id' do
+      params = %w[--dns-id=1]
+      api_expects(:domains, :create).with_params(domain_params(dns_id: 1))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows dns name' do
+      params = %w[--dns=sp1]
+      api_expects_search(:smart_proxies, { name: 'sp1' }).returns(
+        index_response([{ 'id' => 1 }])
+      )
+      api_expects(:domains, :create).with_params(domain_params(dns_id: 1))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows location ids' do
+      params = %w[--location-ids=1,4]
+      api_expects(:domains, :create).with_params(domain_params(location_ids: %w[1 4]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows location names' do
+      params = %w[--locations=loc1,loc2]
+      api_expects(:locations, :index) do |p|
+        p[:search] == 'name = "loc1" or name = "loc2"'
+      end.returns(index_response([{ 'id' => 1 }, { 'id' => 2 }]))
+      api_expects(:domains, :create).with_params(domain_params(location_ids: [1, 2]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows organization ids' do
+      params = %w[--organization-ids=1,4]
+      api_expects(:domains, :create).with_params(domain_params(organization_ids: %w[1 4]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows organization names' do
+      params = %w[--organizations=org1,org2]
+      api_expects(:organizations, :index) do |p|
+        p[:search] == 'name = "org1" or name = "org2"'
+      end.returns(index_response([{ 'id' => 1 }, { 'id' => 2 }]))
+      api_expects(:domains, :create).with_params(domain_params(organization_ids: [1, 2]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+  end
+end

data/test/functional/domain/update_test.rb

@@ -0,0 +1,90 @@
+require_relative '../test_helper'
+
+describe 'Domain' do
+  describe 'UpdateCommand' do
+    let(:cmd) { %w[domain update] }
+    let(:minimal_params) { %w[--id=1] }
+
+    def domain_params(additional_params = {})
+      params = {
+        id: '1',
+        domain: {}
+      }
+      params[:domain].merge!(additional_params)
+      params
+    end
+
+    it 'should print error on missing --id' do
+      expected_result = missing_args_error_result(cmd, '--id')
+
+      api_expects_no_call
+
+      result = run_cmd(cmd)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'allows minimal options' do
+      api_expects(:domains, :update).with_params(domain_params)
+
+      run_cmd(cmd + minimal_params)
+    end
+
+    it 'allows description' do
+      params = %w[--description=shortdesc]
+      api_expects(:domains, :update).with_params(domain_params(fullname: 'shortdesc'))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows dns id' do
+      params = %w[--dns-id=1]
+      api_expects(:domains, :update).with_params(domain_params(dns_id: 1))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows dns name' do
+      params = %w[--dns=sp1]
+      api_expects_search(:smart_proxies, { name: 'sp1' }).returns(
+        index_response([{ 'id' => 1 }])
+      )
+      api_expects(:domains, :update).with_params(domain_params(dns_id: 1))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows location ids' do
+      params = %w[--location-ids=1,4]
+      api_expects(:domains, :update).with_params(domain_params(location_ids: %w[1 4]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows location names' do
+      params = %w[--locations=loc1,loc2]
+      api_expects(:locations, :index) do |p|
+        p[:search] == 'name = "loc1" or name = "loc2"'
+      end.returns(index_response([{ 'id' => 1 }, { 'id' => 2 }]))
+      api_expects(:domains, :update).with_params(domain_params(location_ids: [1, 2]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows organization ids' do
+      params = %w[--organization-ids=1,4]
+      api_expects(:domains, :update).with_params(domain_params(organization_ids: %w[1 4]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+
+    it 'allows organization names' do
+      params = %w[--organizations=org1,org2]
+      api_expects(:organizations, :index) do |p|
+        p[:search] == 'name = "org1" or name = "org2"'
+      end.returns(index_response([{ 'id' => 1 }, { 'id' => 2 }]))
+      api_expects(:domains, :update).with_params(domain_params(organization_ids: [1, 2]))
+
+      run_cmd(cmd + minimal_params + params)
+    end
+  end
+end

data/test/functional/host_test.rb

@@ -356,7 +356,6 @@ describe 'host update' do
       'organization_id' => '5',
       'location_id' => '5',
       'compute_attributes' => {},
-      'puppetclass_ids' => [],
       'owner_id' => '1',
       'owner_name' => 'adminGroup',
       'owner_type' => 'Usergroup'
@@ -569,7 +568,41 @@ describe 'disassociate host from vm' do
   end
 end
 
+describe 'defaults' do
+  let(:cmd) { %w[host list] }
+  let(:defaults) do
+    HammerCLI::Defaults.new(
+      {
+        organization_id: {
+          value: '1'
+        },
+        organization: {
+          value: 'Default Organization'
+        }
+      }
+    )
+  end
+
+  it 'works with default org name overridden via cli' do
+    params = %w[--organization=Org2]
 
+    api_expects_search(:organizations, name: 'Org2').returns(index_response([{ 'id' => '2' }]))
+    api_expects(:hosts, :index) do |p|
+      p['organization_id'] == '2'
+    end
+
+    run_cmd(cmd + params, { use_defaults: true, defaults: defaults })
+  end
+  it 'works with default org id overridden via cli' do
+    params = %w[--organization-id=2]
+
+    api_expects(:hosts, :index) do |p|
+      p['organization_id'] == '2'
+    end
+
+    run_cmd(cmd + params, { use_defaults: true, defaults: defaults })
+  end
+end
 
 describe 'list' do
   before do

data/test/functional/hostgroup/create_test.rb

@@ -68,25 +68,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup create --name hg1 --domain d1))
       end
 
-      it 'allows environment id' do
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --environment-id 1))
-      end
-
-      it 'allows environment name' do
-        api_expects(:environments, :index) do |p|
-          p[:search] = "name = \"env1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['environment_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --environment env1))
-      end
-
       it 'allows location ids' do
         api_expects(:hostgroups, :create) do |p|
           p['hostgroup']['location_ids'] == ['1','4'] &&
@@ -184,6 +165,17 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup create --name hg1 --parent parent_hg))
       end
 
+      it 'allows parent hostgroup title' do
+        api_expects(:hostgroups, :index) do |p|
+          p[:search] = 'title = "parent_hg"'
+        end.returns(index_response([{ 'id' => 1 }]))
+        api_expects(:hostgroups, :create) do |p|
+          p['hostgroup']['parent_id'] == 1 &&
+            p['hostgroup']['name'] == 'hg1'
+        end
+        run_cmd(%w[hostgroup create --name hg1 --parent parent_hg])
+      end
+
       it 'allows partition table id' do
         api_expects(:hostgroups, :create) do |p|
           p['hostgroup']['ptable_id'] == 1 &&
@@ -203,104 +195,6 @@ module HammerCLIForeman
         run_cmd(%w(hostgroup create --name hg1 --partition-table pt1))
       end
 
-      it 'allows puppet ca proxy id' do
-        api_expects(:hostgroups, :create).with_params({
-          :hostgroup => {
-            :name => 'hg1',
-            :puppet_ca_proxy_id => 1
-          }
-        })
-        run_cmd(%w(hostgroup create --name hg1 --puppet-ca-proxy-id 1))
-      end
-
-      it 'allows puppet ca proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppet_ca_proxy_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-ca-proxy sp1))
-      end
-
-      it 'allows puppet class ids' do
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppetclass_ids'] == ['1','2'] &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-class-ids 1,2))
-      end
-
-      it 'allows puppet class names' do
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] = "name = \"pc1\" or name = \"pc2\""
-        end.returns(index_response('puppetclasses' => [
-          {'id' => 1, 'name' => 'pc1'},
-          {'id' => 2, 'name' => 'pc2'}
-        ]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppetclass_ids'] == [1,2] &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-classes pc1,pc2))
-      end
-
-      it 'allows puppet class names that exceeds entries_per_page' do
-        search_objects = []
-        response_objects = []
-        ids = []
-        names = []
-        1100.times.with_object('pc').each do |id, name|
-          next_name = "\"#{name}#{id}\""
-          search_objects << "name = #{next_name}"
-          response_objects << { 'id' => id, 'name' => next_name }
-          ids << id
-          names << next_name
-        end
-
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] == search_objects.join(' or ') &&
-            p[:page].to_i == 1 &&
-            p[:per_page].to_i == HammerCLIForeman::IdResolver::ALL_PER_PAGE
-        end.returns(
-          index_response('puppetclasses' => response_objects[0...1000]))
-
-        api_expects(:puppetclasses, :index) do |p|
-          p[:search] == search_objects.join(' or ') &&
-            p[:page].to_i == 2 &&
-            p[:per_page].to_i == HammerCLIForeman::IdResolver::ALL_PER_PAGE
-        end.returns(index_response('puppetclasses' => response_objects[1000...1100]))
-
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['name'] == 'hg1' &&
-            p['hostgroup']['puppetclass_ids'] == ids
-        end
-
-        run_cmd(%w[hostgroup create --name hg1 --puppet-classes] << names.join(',').tr('"', ''))
-      end
-
-      it 'allows puppet proxy id' do
-        api_expects(:hostgroups, :create).with_params({
-          :hostgroup => {
-            :name => 'hg1',
-            :puppet_proxy_id => 1
-          }
-        })
-        run_cmd(%w(hostgroup create --name hg1 --puppet-proxy-id 1))
-      end
-
-      it 'allows puppet proxy name' do
-        api_expects(:smart_proxies, :index) do |p|
-          p[:search] = "name = \"sp1\""
-        end.returns(index_response([{'id' => 1}]))
-        api_expects(:hostgroups, :create) do |p|
-          p['hostgroup']['puppet_proxy_id'] == 1 &&
-            p['hostgroup']['name'] == 'hg1'
-        end
-        run_cmd(%w(hostgroup create --name hg1 --puppet-proxy sp1))
-      end
-
       it 'allows realm id' do
         api_expects(:hostgroups, :create) do |p|
           p['hostgroup']['realm_id'] == 1 &&