hammer_cli_foreman 0.10.2 → 0.11.0

data/test/functional/host_test.rb

@@ -6,6 +6,18 @@ describe "host create" do
   let(:minimal_params_without_hosgroup) { ['--location-id=1', '--organization-id=1', '--name=test'] }
   let(:minimal_params) { ['--hostgroup-id=1'] + minimal_params_without_hosgroup }
 
+  it "accepts hostgroup title" do
+    api_expects_search(:hostgroups, { :title => 'test/hg1' }).returns(index_response([{ 'id' => '83' }]))
+    api_expects(:hosts, :create, 'Create host with interfaces params') do |par|
+      par['host']['hostgroup_id'] == '83'
+    end.returns({})
+
+    expected_result = success_result("Host created\n")
+
+    result = run_cmd(cmd + minimal_params_without_hosgroup + ['--hostgroup-title=test/hg1'])
+    assert_cmd(expected_result, result)
+  end
+
   it "passes interface attributes to server" do
     params = ['--interface', 'identifier=eth0,ip=10.0.0.4,primary=true,provision=true']
 

data/test/functional/smart_variable_test.rb

@@ -3,13 +3,13 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 describe 'smart-variable update' do
   let(:cmd) { %w(smart-variable update) }
 
-  it 'allows to save new name' do
-    params = ['--id=1', '--new-variable=name2']
+  it 'allows to save new name and override value order' do
+    params = ['--id=1', '--new-variable=name2', '--override-value-order=\'fqdn\',\'hostgroup\',\'domain\',\'os\'']
 
     expected_result = success_result("Smart variable [name2] updated\n")
 
     api_expects(:smart_variables, :update, 'Update the variable') do |par|
-      par['smart_variable']['variable'] == 'name2'
+     (par['smart_variable']['variable'] == 'name2') && (par['smart_variable']['override_value_order'] == "fqdn\nhostgroup\ndomain\nos")
     end.returns(
       'description' => '',
       'parameter_type' => 'string',
@@ -18,7 +18,7 @@ describe 'smart-variable update' do
       'hidden_value' => '*****',
       'validator_type' => '',
       'validator_rule' => nil,
-      'override_value_order' => 'fqdn\nhostgroup\nos\ndomain',
+      'override_value_order' => 'fqdn\nhostgroup\ndomain\nos',
       'merge_overrides' => false,
       'merge_default' => false,
       'avoid_duplicates' => false,

data/test/functional/template_test.rb

@@ -77,4 +77,24 @@ describe 'template' do
       assert_cmd(success_result("Provisioning template cloned\n"), result)
     end
   end
+
+  describe 'update' do
+    before do
+      @cmd = %w(template update)
+    end
+
+    it "doesn't send snippet flag when --type is undefined" do
+      params = ['--id=1', '--locked=true']
+
+      api_expects(:template_kinds, :index, 'Get list of template kinds').returns(index_response([]))
+      api_expects(:config_templates, :update, 'Update the template') do |par|
+        par['config_template']['locked'] == true &&
+        par['config_template']['snippet'].nil?
+      end.returns(:name => 'A', :value => '1')
+
+      result = run_cmd(@cmd + params)
+
+      assert_cmd(success_result("Provisioning template updated\n"), result)
+    end
+  end
 end

data/test/functional/user_test.rb

@@ -2,17 +2,17 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 describe "user" do
   let(:minimal_params) { ['--login', 'jane', '--mail', 'jane@test.org', '--password', 'secret', '--auth-source-id', '1'] }
+  let(:update_params) { ['--login', 'jane'] }
   let(:user) { { 'id' => '32', 'login' => 'jane' } }
 
   def expect_with_minimal_params(action, message, &block)
-    api_expects(:users, action, message) do |par|
-      user = par['user']
-      user['login'] == 'jane' &&
-      user['mail'] == 'jane@test.org' &&
-      user['password'] == 'secret' &&
-      user['auth_source_id'] == '1' &&
-      yield(par)
-    end
+    api_expects(:users, action, message).with_params({
+      'user' => {'login' => 'jane', 'mail' => 'jane@test.org', 'password' => 'secret', 'auth_source_id' => '1'}})
+  end
+
+  def expect_with_update_params(action, message, &block)
+    api_expects(:users, action, message).with_params({
+      'user' => {'login' => 'jane'}})
   end
 
   describe "create" do
@@ -55,14 +55,14 @@ describe "user" do
 
       api_expects_search(:users, { :login => 'jane' }).returns(index_response([user]))
       api_expects_search(:organizations, { :name => 'Org1' }).returns(index_response([{ 'id' => '3' }]))
-      expect_with_minimal_params(:update, 'Update user with default org') do |par|
+      expect_with_update_params(:update, 'Update user with default org') do |par|
         par['id'] == '32' &&
         par['user']['default_organization_id'] == '3'
       end.returns(user)
-
       expected_result = success_result("User [jane] updated\n")
 
-      result = run_cmd(cmd + minimal_params + params)
+      result = run_cmd(cmd + update_params + params)
+
       assert_cmd(expected_result, result)
     end
 
@@ -71,14 +71,14 @@ describe "user" do
 
       api_expects_search(:users, { :login => 'jane' }).returns(index_response([user]))
       api_expects_search(:locations, { :name => 'Loc1' }).returns(index_response([{ 'id' => '4' }]))
-      expect_with_minimal_params(:update, 'Update user with default loc') do |par|
+      expect_with_update_params(:update, 'Update user with default loc') do |par|
         par['id'] == '32' &&
         par['user']['default_location_id'] == '4'
       end.returns(user)
 
       expected_result = success_result("User [jane] updated\n")
 
-      result = run_cmd(cmd + minimal_params + params)
+      result = run_cmd(cmd + update_params + params)
       assert_cmd(expected_result, result)
     end
   end

data/test/unit/api/interactive_basic_auth_test.rb

@@ -83,4 +83,22 @@ describe HammerCLIForeman::Api::InteractiveBasicAuth do
       assert_nil new_ex
     end
   end
+
+  describe '#set_credentials' do
+    let(:auth) { HammerCLIForeman::Api::InteractiveBasicAuth.new(nil, nil) }
+
+    it 'sets username and password' do
+      auth.set_credentials('admin', 'password')
+      assert_equal 'admin', auth.user
+    end
+  end
+
+  describe '#clear' do
+    let(:auth) { HammerCLIForeman::Api::InteractiveBasicAuth.new('user', 'password') }
+
+    it 'clears username and password' do
+      auth.clear
+      assert_nil auth.user
+    end
+  end
 end

data/test/unit/api/session_authenticator_wrapper_test.rb

@@ -96,13 +96,14 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
         end
       end
 
-      it "drops the session when usernames don't match" do
+      it "keeps the session and sets cuser_changed flag when usernames don't match and " do
         prepare_session_storage :session_id => 'SOME_SESSION_ID' do |auth, dir|
           wrapped_auth.expects(:authenticate).with(request, args)
           wrapped_auth.expects(:user).returns('other_user')
           auth.authenticate(request, args)
 
-          refute File.exist?(session_file(dir))
+          assert File.exist?(session_file(dir))
+          assert auth.user_changed?
         end
       end
 
@@ -194,6 +195,28 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
           assert File.exist?(session_file(dir))
         end
       end
+
+      context 'when user has changed' do
+        it 'sets a special error message' do
+          prepare_session_storage :session_id => 'SOME_SESSION_ID' do |auth, dir|
+            auth.force_user_change
+            ex = RestClient::Unauthorized.new
+            new_ex = auth.error(ex)
+
+            assert_equal "Invalid username or password, continuing with session for 'admin'", new_ex.message
+          end
+        end
+
+        it 'keeps the previous session' do
+          prepare_session_storage :session_id => 'SOME_SESSION_ID' do |auth, dir|
+            auth.force_user_change
+            ex = RestClient::Unauthorized.new
+            auth.error(ex)
+
+            assert File.exist?(session_file(dir))
+          end
+        end
+      end
     end
 
     context 'when there is no existing session' do
@@ -284,4 +307,51 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
       end
     end
   end
+
+  describe '#user_changed?' do
+    it 'is false by default' do
+      prepare_session_storage do |auth, dir|
+        refute auth.user_changed?
+      end
+    end
+  end
+
+  describe '#force_user_change' do
+    it 'sets force user change flag' do
+      prepare_session_storage do |auth, dir|
+        auth.force_user_change
+        assert auth.user_changed?
+      end
+    end
+  end
+
+  describe '#set_credentials' do
+    it 'passes credentials to a wrapped authenticator' do
+      prepare_session_storage do |auth, dir|
+        wrapped_auth.expects(:set_credentials).with('admin', 'password')
+        auth.set_credentials('admin', 'password')
+      end
+    end
+
+    it "doesn't pass the credentials when a wrapped autneticator doesn't support it" do
+      prepare_session_storage do |auth, dir|
+        auth.set_credentials('admin', 'password')
+      end
+    end
+  end
+
+  describe '#clear' do
+    it 'passes clear to a wrapped authenticator' do
+      prepare_session_storage do |auth, dir|
+        wrapped_auth.expects(:clear)
+        auth.clear
+      end
+    end
+
+    it "doesn't pass clear when a wrapped autneticator doesn't support it" do
+      prepare_session_storage do |auth, dir|
+        auth.clear
+      end
+    end
+  end
 end

data/test/unit/apipie_resource_mock.rb

@@ -41,6 +41,9 @@ module ResourceMocks
     ResourceMocks.mock_action_call(:compute_resources, :available_images, [])
   end
 
+  def self.compute_resources_available_networks
+    ResourceMocks.mock_action_call(:compute_resources, :available_networks, [])
+  end
 
   def self.organizations_index
     ResourceMocks.mock_action_call(:organizations, :index, {

data/test/unit/auth_source_ldap_test.rb

@@ -28,7 +28,7 @@ describe HammerCLIForeman::AuthSourceLdap do
       it_should_print_column "Id"
       it_should_print_column "LDAPS\\?"
       it_should_print_column "Port"
-      it_should_print_column "Server Type"
+      it_should_print_column "Server"
     end
 
   end
@@ -47,8 +47,7 @@ describe HammerCLIForeman::AuthSourceLdap do
     context "output" do
       with_params ["--id=1"] do
         it_should_print_n_records 1
-        it_should_print_column "Name"
-        it_should_print_column "Id"
+	it_should_print_columns ["Server", "Account", "Attribute mappings", "Locations", "Organizations"]
       end
     end
 

data/test/unit/commands_test.rb

@@ -160,7 +160,7 @@ describe HammerCLIForeman::Command do
     out, err = capture_io do
       com.run(['--location', 'loc']).wont_equal HammerCLI::EX_OK
     end
-    err.must_equal "Error: Could not find location, please set one of options --location, --location-id.\n"
+    err.must_equal "Error: Could not find location, please set one of options --location, --location-title, --location-id.\n"
 
   end
 

data/test/unit/compute_resource_test.rb

@@ -94,5 +94,29 @@ describe HammerCLIForeman::ComputeResource do
 
   end
 
+  context "AvailableNetworksCommand" do
+    before do
+      ResourceMocks.compute_resources_available_networks
+    end
+
+    let(:cmd) { HammerCLIForeman::ComputeResource::AvailableNetworksCommand.new("", ctx) }
+
+    context "parameters" do
+      it_should_accept "id", ["--id=1"]
+      it_should_accept "name", ["--name=arch"]
+      # it_should_fail_with "no params", [] # TODO: temporarily disabled, parameters are checked in the id resolver
+      # it_should_fail_with "name or id missing", ["--new-name=arch2"] # TODO: temporarily disabled, parameters are checked in the id resolver
+    end
+
+    context "output" do
+      let(:expected_record_count) { count_records(cmd.resource.call(:available_networks)) }
+
+      with_params ["--name=testcr"] do
+        it_should_print_n_records
+        it_should_print_columns ["Name", "Id"]
+      end
+    end
+
+  end
 
 end

data/test/unit/host_test.rb

@@ -48,7 +48,7 @@ describe HammerCLIForeman::Host do
         it_should_print_columns ["Host Group", "Compute Resource", "Compute Profile", "Environment"]
         it_should_print_columns ["Puppet CA Id", "Puppet Master Id", "Cert name"]
         it_should_print_columns ["Managed", "Installed at", "Last report"]
-        it_should_print_columns ["Network", "Network interfaces", "Operating system", "Parameters", "Additional info"]
+        it_should_print_columns ["Network", "Network interfaces", "Operating system", "Parameters", "All parameters", "Additional info"]
       end
     end
 

data/test/unit/hostgroup_test.rb

@@ -43,7 +43,7 @@ describe HammerCLIForeman::Hostgroup do
         it_should_print_n_records 1
         it_should_print_columns ["Id", "Name", "Title", "Operating System", "Subnet"]
         it_should_print_columns ["Domain", "Environment", "Puppetclasses", "Parent Id"]
-        it_should_print_columns ["Parameters"]
+        it_should_print_columns ["Parameters", "Description"]
       end
     end
 

data/test/unit/id_resolver_test.rb

@@ -62,6 +62,10 @@ describe HammerCLIForeman::IdResolver do
 
 
   describe "resolving ids" do
+    let(:john_id) { 11 }
+    let(:john) { {"id" => john_id, "name" => "John Doe"} }
+    let(:jane_id) { 22 }
+    let(:jane) { {"id" => jane_id, "name" => "Jane Doe"} }
 
     it "must define methods for all resources" do
       expected_method_names = api.resources.map(&:singular_name).collect{|r| "#{r}_id"}
@@ -93,10 +97,7 @@ describe HammerCLIForeman::IdResolver do
       end
 
       it "raises exception when multiple resources are found" do
-        ResourceMocks.mock_action_call(:users, :index, [
-          {"id" => 11, "name" => "user11"},
-          {"id" => 22, "name" => "user22"}
-        ])
+        ResourceMocks.mock_action_call(:users, :index, [john, jane])
 
         err = resolver_run.must_raise HammerCLIForeman::ResolverError
         err.message.must_equal "found more than one user"
@@ -107,7 +108,7 @@ describe HammerCLIForeman::IdResolver do
           ( resource == :users &&
             action == :index &&
             params[:search] == "name = \"John Doe\"")
-        end.returns({"id" => 1, "name" => "John Doe"})
+        end.returns(john)
 
         resolver_run.call
       end
@@ -119,17 +120,15 @@ describe HammerCLIForeman::IdResolver do
       end
 
       it "returns id of the resource" do
-        ResourceMocks.mock_action_call(:users, :index, [
-          {"id" => 11, "name" => "John Doe"}
-        ])
+        ResourceMocks.mock_action_call(:users, :index, [john])
 
-        resolver_run.call.must_equal 11
+        resolver_run.call.must_equal john_id
       end
 
     end
 
     describe "searching dependent resources" do
-      let(:resolver_run) { proc { resolver.post_id({"option_name" => "Post 11", "option_user_name" => "User 22"}) } }
+      let(:resolver_run) { proc { resolver.post_id({"option_name" => "Post 11", "option_user_name" => "John Doe"}) } }
 
       it "raises exception when no resource is found" do
         ResourceMocks.mock_action_call(:posts, :index, [])
@@ -141,10 +140,7 @@ describe HammerCLIForeman::IdResolver do
 
       it "raises exception when multiple resources are found" do
         ResourceMocks.mock_action_call(:posts, :index, [])
-        ResourceMocks.mock_action_call(:users, :index, [
-          {"id" => 11, "name" => "user1"},
-          {"id" => 22, "name" => "user2"}
-        ])
+        ResourceMocks.mock_action_call(:users, :index, [john, jane])
 
         err = resolver_run.must_raise HammerCLIForeman::ResolverError
         err.message.must_equal "found more than one user"
@@ -154,8 +150,8 @@ describe HammerCLIForeman::IdResolver do
         ApipieBindings::API.any_instance.expects(:call).with() do |resource, action, params, headers, opts|
           ( resource == :users &&
             action == :index &&
-            params[:search] == "name = \"User 22\"")
-        end.returns({"id" => 22, "name" => "User 22"})
+            params[:search] == "name = \"John Doe\"")
+        end.returns(john)
 
         ApipieBindings::API.any_instance.expects(:call).with() do |resource, action, params, headers, opts|
           ( resource == :posts &&
@@ -178,9 +174,7 @@ describe HammerCLIForeman::IdResolver do
     end
 
     describe 'searching for puppetclasses' do
-      let(:resolver_run) { proc { resolver.puppetclass_ids('option_names' => ['apache::mod::authnz_ldap', 'git::params', 'apache::dev']) } }
-
-      it "returns ids of the classes" do
+      before do
         ResourceMocks.mock_action_call(:puppetclasses, :index, {
           'apache' => [
             { 'id' => 70, 'name' => 'apache::dev', 'created_at' => '2015-01-27T07:24:57.134Z', 'updated_at' => '2015-03-05T17:27:54.282Z' },
@@ -188,9 +182,53 @@ describe HammerCLIForeman::IdResolver do
           ],
           'git' => [
             { 'id' => 85, 'name' => 'git::params', 'created_at' => '2015-01-27T07:24:57.306Z', 'updated_at' => '2015-01-27T07:24:57.306Z' }
-          ] })
+          ]
+        })
+      end
+
+      it "returns ids from options" do
+        result = resolver.user_ids({"option_ids" => [4, 5], "option_names" => ['apache::dev']})
+        assert_equal [4, 5], result
+      end
+
+      it "returns ids of the classes" do
+        class_names = ['apache::mod::authnz_ldap', 'git::params', 'apache::dev']
+        assert_equal [70, 27, 85], resolver.puppetclass_ids('option_names' => class_names)
+      end
+
+      it 'returns empty array for empty class array' do
+        assert_equal [], resolver.puppetclass_ids('option_names' => [])
+      end
+    end
+
+    describe "searching for multiple resources" do
+      it "returns ids from options" do
+        result = resolver.user_ids({"option_ids" => [4, 5], "option_names" => ["some", "names"]})
+        assert_equal [4, 5], result
+      end
+
+      it "finds multiple ids" do
+        ApipieBindings::API.any_instance.expects(:call).with() do |resource, action, params, headers, opts|
+          ( resource == :users &&
+            action == :index &&
+            params[:search] == "name = \"John Doe\" or name = \"Jane Doe\"")
+        end.returns([john, jane])
+
+        assert_equal [john_id, jane_id], resolver.user_ids({"option_names" => ["John Doe", "Jane Doe"]})
+      end
+
+      it "raises exception when wrong number of resources is found" do
+        ResourceMocks.mock_action_call(:users, :index, [john])
+
+        assert_raises HammerCLIForeman::ResolverError do
+          resolver.user_ids({"option_names" => ["John Doe", "Jane Doe"]})
+        end
+      end
+
+      it "returns empty array for empty input" do
+        ResourceMocks.mock_action_call(:users, :index, [john, jane])
 
-        resolver_run.call.must_equal [70, 27, 85]
+        assert_equal [], resolver.user_ids({"option_names" => []})
       end
     end
   end