hammer_cli_foreman 2.4.0 → 3.1.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,11 +39,43 @@ 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 })
       _(result.exit_code).must_equal HammerCLI::EX_OK
     end
   end
-end
 
+  describe 'update' do
+    before do
+      @cmd = %w[architecture update]
+      @architecture = {
+        id: 1,
+        name: 'x86_64',
+      }
+    end
+
+    it 'should update an architecture with id' do
+      params = %w[--id=1 --new-name=x86_64]
+      api_expects(:architectures, :update, 'Update architecture').returns(@architecture)
+
+      expected_result = success_result("Architecture updated.\n")
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'updates nothing without architecture related parameters' do
+      params = %w[--id=1]
+      api_expects(:architectures, :update, 'Update architecture with no params').returns({})
+
+      expected_result = success_result("Nothing to update.\n")
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+  end
+end

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 })
@@ -158,7 +160,8 @@ describe 'bookmark' do
         api_expects(:bookmarks, :update) do |par|
           par['id'] == '1'
         end
-        run_cmd(%w[bookmark update --id 1])
+        result = run_cmd(%w[bookmark update --id 1])
+        assert_cmd(success_result("Nothing to update.\n"), result)
       end
 
       it 'update bookmark' do

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

@@ -40,6 +40,17 @@ describe "parameters" do
       result = run_cmd(@cmd + params)
       assert_cmd(success_result("Compute profile updated.\n"), result)
     end
+
+    it 'updates nothing without profile related parameters' do
+      params = %w[--id=1]
+      api_expects(:compute_profiles, :update, 'Update profile with no params').returns({})
+
+      expected_result = success_result("Nothing to update.\n")
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
   end
 
   describe "delete compute profile" do
@@ -121,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: {
@@ -134,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/compute_resource_test.rb

@@ -51,6 +51,18 @@ describe 'compute-resource' do
       assert_cmd(expected_result, result)
     end
 
+    describe 'associate VMs to hosts' do
+      it 'successful associate vms to hosts' do
+        expected_result = success_result("Virtual machines have been associated.\n")
+        api_expects(:compute_resources, :associate, 'Associate VMs') do |p|
+          p['id'] == '1'
+        end
+        result = run_cmd(%w(compute-resource associate-vms --id 1))
+        assert_cmd(expected_result, result)
+      end
+    end
+   
+
     it 'should print error for blank --provider option' do
       params = %w(--provider= --name=new'')
       expected_result = CommandExpectation.new
@@ -198,6 +210,31 @@ end
     end
   end
 
+  describe 'vnic profiles' do
+    let(:cmd) { base_cmd << 'vnic-profiles' }
+    let(:vnic_profile_1) { { id: 1, name: 'network1', network: 2 } }
+    let(:vnic_profile_2) { { id: 2, name: 'network2', network: 2 } }
+    let(:vnic_profiles) { [vnic_profile_1, vnic_profile_2] }
+
+    it 'lists available vnic profiles for a compute resource' do
+      api_expects(:compute_resources, :available_vnic_profiles, 'vnic-profiles').with_params(
+          'id' => '1'
+      ).returns(index_response(vnic_profiles))
+
+      output = IndexMatcher.new(
+          [
+              ['VNIC PROFILE ID', 'NAME', 'NETWORK ID'],
+              ['1', 'network1','2'],
+              ['2', 'network2','2']
+          ]
+      )
+      expected_result = success_result(output)
+
+      result = run_cmd(cmd + base_params)
+      assert_cmd(expected_result, result)
+    end
+  end
+
   describe 'images' do
     let(:cmd) { base_cmd << 'images' }
     let(:image1) { { uuid: 1, name: 'image1' } }

data/test/functional/filter_test.rb

@@ -45,7 +45,7 @@ describe 'filter' do
       end
 
       result = run_cmd(@cmd + params)
-      assert_cmd(success_result("Permission filter for [%<resource_type>s] created.\n"), result)
+      assert_cmd(success_result("Permission filter for [%<resource_type_label>s] created.\n"), result)
     end
   end
 
@@ -106,6 +106,7 @@ describe 'filter' do
       @cmd = %w[filter update]
       @filter = {
         'search' => nil,
+        'resource_type_label' => 'User',
         'resource_type' => 'User',
         'unlimited?' => false,
         'created_at' => '2017-07-18 14:34:09 UTC',

data/test/functional/host_test.rb

@@ -312,6 +312,39 @@ describe "host create" do
 
     assert_cmd(expected_result, result)
   end
+
+  it 'should create a host and set owner-type' do
+    params = ['--owner=admin']
+
+    api_expects_search(:users, {login: 'admin'}).returns(index_response([{ 'id' => 1 }]))
+
+    api_expects(:hosts, :create, 'Create a host with an owner').with_params(
+      'location_id' => 1, 'organization_id' => 1, 'host' => {
+        'owner_id' => 1, 'name' => 'test'
+      }
+    ).returns(results: { 'owner' => 'admin', 'name' => 'test' })
+
+    expected_result = success_result("Host created.\n")
+
+    result = run_cmd(cmd + minimal_params_without_hostgroup + params)
+
+    assert_cmd(expected_result, result)
+  end
+
+  it 'should create a host with default owner-type User' do
+
+    api_expects(:hosts, :create, 'Create a host with an owner').with_params(
+      'location_id' => 1, 'organization_id' => 1, 'host' => {
+         'name' => 'test'
+      }
+    ).returns(results: { 'owner_type' => 'User', 'name' => 'test' })
+
+    expected_result = success_result("Host created.\n")
+
+    result = run_cmd(cmd + minimal_params_without_hostgroup)
+
+    assert_cmd(expected_result, result)
+  end
 end
 
 describe 'host update' do
@@ -323,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'
@@ -371,7 +403,7 @@ describe 'host update' do
   it 'updates nothing without host related parameters' do
     api_expects(:hosts, :update, 'Update host with no host params').returns({})
 
-    expected_result = success_result("Host updated.\n")
+    expected_result = success_result("Nothing to update.\n")
 
     result = run_cmd(cmd + minimal_params)
     assert_cmd(expected_result, result)
@@ -536,17 +568,39 @@ describe 'disassociate host from vm' do
   end
 end
 
-describe 'run puppetrun for host' do
-  let(:cmd) { ['host', 'puppetrun'] }
-  let(:params) { ['--id=1'] }
+describe 'defaults' do
+  let(:cmd) { %w[host list] }
+  let(:defaults) do
+    HammerCLI::Defaults.new(
+      {
+        organization_id: {
+          value: '1'
+        },
+        organization: {
+          value: 'Default Organization'
+        }
+      }
+    )
+  end
 
-  it "does nothing for puppetrun" do
-    expected_result = CommandExpectation.new
-    expected_result.expected_err = "The puppetrun feature has been removed, however you can use the Remote Execution Plugin to run Puppet commands\n"
-    expected_result.expected_exit_code = HammerCLI::EX_SOFTWARE
+  it 'works with default org name overridden via cli' do
+    params = %w[--organization=Org2]
 
-    result = run_cmd(cmd)
-    assert_cmd(expected_result, result)
+    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
 

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 &&